diff --git a/apps/settings/src/app-types.ts b/apps/settings/src/app-types.ts index 77a1b6797f3cd..3ce2aa1648c9b 100644 --- a/apps/settings/src/app-types.ts +++ b/apps/settings/src/app-types.ts @@ -53,13 +53,6 @@ export interface IAppstoreApp { releases?: IAppstoreAppRelease[] } -export interface IAppstoreExApp extends IAppstoreApp { - daemon: IDeployDaemon, - status: IExAppStatus, - error: string, - app_api: boolean, -} - export interface IComputeDevice { id: string, label: string, @@ -90,3 +83,10 @@ export interface IExAppStatus { init_start_time: number, type: string, } + +export interface IAppstoreExApp extends IAppstoreApp { + daemon: IDeployDaemon, + status: IExAppStatus, + error: string, + app_api: boolean, +} diff --git a/apps/settings/src/components/AppList.vue b/apps/settings/src/components/AppList.vue index 9f53cba25e314..b9199553a9484 100644 --- a/apps/settings/src/components/AppList.vue +++ b/apps/settings/src/components/AppList.vue @@ -168,10 +168,10 @@ export default { return this.apps.filter(app => app.update).length }, loading() { - if (!this.$store.getters['app_api_apps/isAppApiEnabled']) { + if (!this.$store.getters['appApiApps/isAppApiEnabled']) { return this.$store.getters.loading('list') } - return this.$store.getters.loading('list') || this.$store.getters['app_api_apps/loading']('list') + return this.$store.getters.loading('list') || this.$store.getters['appApiApps/loading']('list') }, hasPendingUpdate() { return this.apps.filter(app => app.update).length > 0 @@ -181,7 +181,7 @@ export default { }, apps() { // Exclude ExApps from the list if AppAPI is disabled - const exApps = this.$store.getters.isAppApiEnabled ? this.$store.getters['app_api_apps/getAllApps'] : [] + const exApps = this.$store.getters.isAppApiEnabled ? this.$store.getters['appApiApps/getAllApps'] : [] const apps = [...this.$store.getters.getAllApps, ...exApps] .filter(app => app.name.toLowerCase().search(this.search.toLowerCase()) !== -1) .sort(function(a, b) { @@ -310,13 +310,12 @@ export default { this.apps .filter(app => app.update) .map(app => limit(() => { - let type = 'updateApp' - if (app?.app_api) { - type = 'app_api_apps/updateApp' - } - this.$store.dispatch(type, { appId: app.id }) - }), - ) + let type = 'updateApp' + if (app?.app_api) { + type = 'appApiApps/updateApp' + } + this.$store.dispatch(type, { appId: app.id }) + })) }, }, } diff --git a/apps/settings/src/components/AppList/AppDaemonBadge.vue b/apps/settings/src/components/AppList/AppDaemonBadge.vue index 1a46d3c7ebb70..1a5cd5bbea3c1 100644 --- a/apps/settings/src/components/AppList/AppDaemonBadge.vue +++ b/apps/settings/src/components/AppList/AppDaemonBadge.vue @@ -16,7 +16,7 @@ import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js import { mdiFileChart } from '@mdi/js' import type { IDeployDaemon } from '../../app-types.ts' -const props = defineProps<{ +defineProps<{ daemon?: IDeployDaemon }>() diff --git a/apps/settings/src/components/AppList/AppItem.vue b/apps/settings/src/components/AppList/AppItem.vue index 96f8160534f7a..4ff51e938d271 100644 --- a/apps/settings/src/components/AppList/AppItem.vue +++ b/apps/settings/src/components/AppList/AppItem.vue @@ -16,9 +16,9 @@ :headers="getDataItemHeaders(`app-table-col-icon`)">