feat(appstore): use shared resolver

ts_web/appstate.ts

@@ -58,8 +58,8 @@ export interface ISettingsState {
 }
 
 export interface IAppStoreState {
-  apps: interfaces.requests.ICatalogApp[];
-  upgradeableServices: interfaces.requests.IUpgradeableService[];
+  apps: interfaces.requests.IAppStoreApp[];
+  upgradeableServices: interfaces.requests.IUpgradeableAppStoreService[];
 }
 
 export interface IUiState {
@@ -1226,13 +1226,13 @@ async function disconnectSocket() {
 // App Store Actions
 // ============================================================================
 
-export const fetchAppTemplatesAction = appStoreStatePart.createAction(
+export const fetchAppStoreTemplatesAction = appStoreStatePart.createAction(
   async (statePartArg) => {
     const context = getActionContext();
     try {
       const typedRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
-        interfaces.requests.IReq_GetAppTemplates
-      >('/typedrequest', 'getAppTemplates');
+        interfaces.requests.IReq_GetAppStoreTemplates
+      >('/typedrequest', 'getAppStoreTemplates');
       const response = await typedRequest.fire({ identity: context.identity! });
       return { ...statePartArg.getState(), apps: response.apps };
     } catch (err) {
@@ -1242,13 +1242,13 @@ export const fetchAppTemplatesAction = appStoreStatePart.createAction(
   },
 );
 
-export const fetchUpgradeableServicesAction = appStoreStatePart.createAction(
+export const fetchUpgradeableAppStoreServicesAction = appStoreStatePart.createAction(
   async (statePartArg) => {
     const context = getActionContext();
     try {
       const typedRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
-        interfaces.requests.IReq_GetUpgradeableServices
-      >('/typedrequest', 'getUpgradeableServices');
+        interfaces.requests.IReq_GetUpgradeableAppStoreServices
+      >('/typedrequest', 'getUpgradeableAppStoreServices');
       const response = await typedRequest.fire({ identity: context.identity! });
       return { ...statePartArg.getState(), upgradeableServices: response.services };
     } catch (err) {
@@ -1258,15 +1258,15 @@ export const fetchUpgradeableServicesAction = appStoreStatePart.createAction(
   },
 );
 
-export const upgradeServiceAction = appStoreStatePart.createAction<{
+export const upgradeAppStoreServiceAction = appStoreStatePart.createAction<{
   serviceName: string;
   targetVersion: string;
 }>(async (statePartArg, dataArg) => {
   const context = getActionContext();
   try {
     const typedRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
-      interfaces.requests.IReq_UpgradeService
-    >('/typedrequest', 'upgradeService');
+      interfaces.requests.IReq_UpgradeAppStoreService
+    >('/typedrequest', 'upgradeAppStoreService');
     await typedRequest.fire({
       identity: context.identity!,
       serviceName: dataArg.serviceName,
@@ -1274,8 +1274,8 @@ export const upgradeServiceAction = appStoreStatePart.createAction<{
     });
     // Re-fetch upgradeable services and services list
     const upgradeReq = new plugins.domtools.plugins.typedrequest.TypedRequest<
-      interfaces.requests.IReq_GetUpgradeableServices
-    >('/typedrequest', 'getUpgradeableServices');
+      interfaces.requests.IReq_GetUpgradeableAppStoreServices
+    >('/typedrequest', 'getUpgradeableAppStoreServices');
     const upgradeResp = await upgradeReq.fire({ identity: context.identity! });
     return { ...statePartArg.getState(), upgradeableServices: upgradeResp.services };
   } catch (err) {

ts_web/elements/ob-view-appstore.ts

@@ -25,13 +25,13 @@ export class ObViewAppStore extends DeesElement {
   accessor currentView: 'grid' | 'detail' = 'grid';
 
   @state()
-  accessor selectedApp: interfaces.requests.ICatalogApp | null = null;
+  accessor selectedApp: interfaces.requests.IAppStoreApp | null = null;
 
   @state()
-  accessor selectedAppMeta: interfaces.requests.IAppMeta | null = null;
+  accessor selectedAppMeta: interfaces.requests.IAppStoreAppMeta | null = null;
 
   @state()
-  accessor selectedAppConfig: interfaces.requests.IAppVersionConfig | null = null;
+  accessor selectedAppConfig: interfaces.requests.IAppStoreVersionConfig | null = null;
 
   @state()
   accessor selectedVersion: string = '';
@@ -331,7 +331,7 @@ export class ObViewAppStore extends DeesElement {
 
   async connectedCallback() {
     super.connectedCallback();
-    await appstate.appStoreStatePart.dispatchAction(appstate.fetchAppTemplatesAction, null);
+    await appstate.appStoreStatePart.dispatchAction(appstate.fetchAppStoreTemplatesAction, null);
   }
 
   public render(): TemplateResult {
@@ -541,7 +541,7 @@ export class ObViewAppStore extends DeesElement {
     `;
   }
 
-  private renderDeploymentFootprint(config: interfaces.requests.IAppVersionConfig): TemplateResult | '' {
+  private renderDeploymentFootprint(config: interfaces.requests.IAppStoreVersionConfig): TemplateResult | '' {
     const volumes = this.getConfigVolumes(config);
     const publishedPorts = config.publishedPorts || [];
 
@@ -577,7 +577,7 @@ export class ObViewAppStore extends DeesElement {
     `;
   }
 
-  private renderDeployConfirmation(config: interfaces.requests.IAppVersionConfig): TemplateResult | '' {
+  private renderDeployConfirmation(config: interfaces.requests.IAppStoreVersionConfig): TemplateResult | '' {
     const volumes = this.getConfigVolumes(config);
     const publishedPorts = config.publishedPorts || [];
     if (volumes.length === 0 && publishedPorts.length === 0) return '';
@@ -590,7 +590,7 @@ export class ObViewAppStore extends DeesElement {
     `;
   }
 
-  private getConfigVolumes(config: interfaces.requests.IAppVersionConfig): interfaces.data.IServiceVolume[] {
+  private getConfigVolumes(config: interfaces.requests.IAppStoreVersionConfig): interfaces.data.IServiceVolume[] {
     return (config.volumes || []).map((volume) => {
       if (typeof volume === 'string') {
         return { mountPath: volume };
@@ -658,8 +658,8 @@ export class ObViewAppStore extends DeesElement {
       if (!identity) return;
 
       const typedRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
-        interfaces.requests.IReq_GetAppConfig
-      >('/typedrequest', 'getAppConfig');
+        interfaces.requests.IReq_GetAppStoreConfig
+      >('/typedrequest', 'getAppStoreConfig');
 
       const response = await typedRequest.fire({ identity, appId, version });
 
@@ -728,8 +728,8 @@ export class ObViewAppStore extends DeesElement {
       const identity = appstate.loginStatePart.getState().identity;
       if (!identity) return;
       const typedRequest = new plugins.domtools.plugins.typedrequest.TypedRequest<
-        interfaces.requests.IReq_InstallAppTemplate
-      >('/typedrequest', 'installAppTemplate');
+        interfaces.requests.IReq_InstallAppStoreApp
+      >('/typedrequest', 'installAppStoreApp');
       await typedRequest.fire({
         identity,
         install: {

ts_web/elements/ob-view-services.ts

@@ -226,7 +226,7 @@ export class ObViewServices extends DeesElement {
     await Promise.all([
       appstate.servicesStatePart.dispatchAction(appstate.fetchServicesAction, null),
       appstate.servicesStatePart.dispatchAction(appstate.fetchPlatformServicesAction, null),
-      appstate.appStoreStatePart.dispatchAction(appstate.fetchUpgradeableServicesAction, null),
+      appstate.appStoreStatePart.dispatchAction(appstate.fetchUpgradeableAppStoreServicesAction, null),
     ]);
 
     // If a platform service was selected from the dashboard, navigate to its detail
@@ -497,7 +497,7 @@ export class ObViewServices extends DeesElement {
             class="deploy-button"
             style="padding: 8px 16px; font-size: 13px;"
             @click=${async () => {
-              await appstate.appStoreStatePart.dispatchAction(appstate.upgradeServiceAction, {
+              await appstate.appStoreStatePart.dispatchAction(appstate.upgradeAppStoreServiceAction, {
                 serviceName: upgradeInfo.serviceName,
                 targetVersion: upgradeInfo.latestVersion,
               });