feat(vue2): scan apps button

vuejs · Feb 11, 2022 · 824f54d · 824f54d
1 parent 9022113
commit 824f54d
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 11 deletions.
diff --git a/packages/app-backend-core/src/app.ts b/packages/app-backend-core/src/app.ts
@@ -226,20 +226,25 @@ export async function removeApp (app: App, ctx: BackendContext) {
   }
 }
 
+let scanTimeout: any
+
 // eslint-disable-next-line camelcase
-export function _legacy_getAndRegisterApps (ctx: BackendContext) {
+export function _legacy_getAndRegisterApps (ctx: BackendContext, clear = false) {
   setTimeout(() => {
-    // Remove apps that are legacy
-    ctx.appRecords.forEach(appRecord => {
-      if (appRecord.meta.Vue) {
-        removeAppRecord(appRecord, ctx)
-      }
-    })
+    if (clear) {
+      // Remove apps that are legacy
+      ctx.appRecords.forEach(appRecord => {
+        if (appRecord.meta.Vue) {
+          removeAppRecord(appRecord, ctx)
+        }
+      })
+    }
 
     const apps = scan()
 
+    clearTimeout(scanTimeout)
     if (!apps.length) {
-      setTimeout(() => _legacy_getAndRegisterApps(ctx), 1000)
+      scanTimeout = setTimeout(() => _legacy_getAndRegisterApps(ctx), 1000)
     }
 
     apps.forEach(app => {

diff --git a/packages/app-backend-core/src/index.ts b/packages/app-backend-core/src/index.ts
@@ -59,12 +59,15 @@ export async function initBackend (bridge: Bridge) {
       hook,
     })
 
+    SharedData.legacyApps = false
     if (hook.Vue) {
       connect()
-      _legacy_getAndRegisterApps(ctx)
+      _legacy_getAndRegisterApps(ctx, true)
+      SharedData.legacyApps = true
     }
     hook.on(HookEvents.INIT, () => {
-      _legacy_getAndRegisterApps(ctx)
+      _legacy_getAndRegisterApps(ctx, true)
+      SharedData.legacyApps = true
     })
 
     hook.on(HookEvents.APP_ADD, async app => {
@@ -356,6 +359,12 @@ function connectBridge () {
     }
   })
 
+  ctx.bridge.on(BridgeEvents.TO_BACK_SCAN_LEGACY_APPS, () => {
+    if (hook.Vue) {
+      _legacy_getAndRegisterApps(ctx)
+    }
+  })
+
   // Components
 
   ctx.bridge.on(BridgeEvents.TO_BACK_COMPONENT_TREE, ({ instanceId, filter }) => {

diff --git a/packages/app-frontend/src/features/apps/index.ts b/packages/app-frontend/src/features/apps/index.ts
@@ -85,6 +85,10 @@ export function waitForAppSelect (): Promise<void> {
   }
 }
 
+export function scanLegacyApps () {
+  getBridge().send(BridgeEvents.TO_BACK_SCAN_LEGACY_APPS, {})
+}
+
 export function setupAppsBridgeEvents (bridge: Bridge) {
   bridge.on(BridgeEvents.TO_FRONT_APP_ADD, ({ appRecord }) => {
     addApp(appRecord)

diff --git a/packages/app-frontend/src/features/header/AppHeaderSelect.vue b/packages/app-frontend/src/features/header/AppHeaderSelect.vue
@@ -197,6 +197,8 @@ export default defineComponent({
         @mouseleave="queueClose()"
         @wheel="onMouseWheel"
       >
+        <slot name="before" />
+
         <VueDropdownButton
           v-for="(item, index) of items"
           :key="index"

diff --git a/packages/app-frontend/src/features/header/AppSelect.vue b/packages/app-frontend/src/features/header/AppSelect.vue
@@ -4,7 +4,7 @@ import AppSelectItem from './AppSelectItem.vue'
 
 import { watch, defineComponent, computed } from '@vue/composition-api'
 import { BridgeEvents, SharedData } from '@vue-devtools/shared-utils'
-import { useApps, pendingSelectAppId } from '@front/features/apps'
+import { useApps, pendingSelectAppId, scanLegacyApps } from '@front/features/apps'
 import { useOrientation } from '@front/features/layout/orientation'
 import { useRouter } from '@front/util/router'
 import { useBridge } from '../bridge'
@@ -72,6 +72,7 @@ export default defineComponent({
       selectApp,
       orientation,
       hasNewVueVersion,
+      scanLegacyApps,
     }
   },
 })
@@ -119,6 +120,17 @@ export default defineComponent({
         :app="item"
       />
     </template>
+
+    <template #before>
+      <VueButton
+        v-if="$shared.legacyApps"
+        class="flat m-1"
+        icon-left="cached"
+        @click="scanLegacyApps()"
+      >
+        Scan apps
+      </VueButton>
+    </template>
   </AppHeaderSelect>
 </template>
 

diff --git a/packages/shared-utils/src/consts.ts b/packages/shared-utils/src/consts.ts
@@ -28,6 +28,7 @@ export enum BridgeEvents {
   TO_FRONT_APP_REMOVE = 'f:app:remove',
   TO_BACK_APP_SELECT = 'b:app:select',
   TO_FRONT_APP_SELECTED = 'f:app:selected',
+  TO_BACK_SCAN_LEGACY_APPS = 'b:app:scan-legacy',
 
   // Components
   TO_BACK_COMPONENT_TREE = 'b:component:tree',

diff --git a/packages/shared-utils/src/shared-data.ts b/packages/shared-utils/src/shared-data.ts
@@ -27,6 +27,7 @@ const internalSharedData = {
   pluginPermissions: {} as any,
   pluginSettings: {} as any,
   pageConfig: {} as any,
+  legacyApps: false,
   debugInfo: false,
 }