fix(collector): update to v2 api params (related to secret) (#2597)

* fix(collector): update to v2 api params

Signed-off-by: sulmo <sulmo@megazone.com>

* fix: fix structure of pinia store

Signed-off-by: sulmo <sulmo@megazone.com>

---------

Signed-off-by: sulmo <sulmo@megazone.com>

Author: sulmoJ

apps/web/src/services/asset-inventory/components/CollectorDetailAttachedServiceAccounts.vue

@@ -15,6 +15,8 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper';
 import { iso8601Formatter } from '@cloudforet/utils';
 
+import type { ListResponse } from '@/schema/_common/api-verbs/list';
+import type { SecretListParameters } from '@/schema/secret/secret/api-verbs/list';
 import type { SecretModel } from '@/schema/secret/secret/model';
 import { store } from '@/store';
 import { i18n } from '@/translations';
@@ -115,7 +117,7 @@ const { queryTags } = queryTagHelper;
 
 /* api fetchers */
 const apiQueryHelper = new ApiQueryHelper();
-const fetchSecrets = async (provider: string, serviceAccounts?: string[]): Promise<{ results: SecretModel[]; total_count: number }> => {
+const fetchSecrets = async (provider: string, serviceAccounts?: string[]): Promise<ListResponse<SecretModel>> => {
     try {
         apiQueryHelper.setPage(state.pageStart, state.pageLimit)
             .setSort(state.sortBy, state.sortDesc)
@@ -127,10 +129,10 @@ const fetchSecrets = async (provider: string, serviceAccounts?: string[]): Promi
             else apiQueryHelper.addFilter({ k: 'service_account_id', v: serviceAccounts, o: '=' });
         }
 
-        const results = await SpaceConnector.client.secret.secret.list({
+        const results = await SpaceConnector.clientV2.secret.secret.list<SecretListParameters, ListResponse<SecretModel>>({
             query: apiQueryHelper.data,
         });
-        return results;
+        return results ?? { results: [], total_count: 0 };
     } catch (e) {
         ErrorHandler.handleError(e);
         return { results: [], total_count: 0 };
@@ -144,7 +146,7 @@ const getSecrets = async (provider: string, serviceAccounts?: string[]) => {
     const { results, total_count } = await fetchSecrets(provider, serviceAccounts);
     state.secrets = results;
     state.totalCount = total_count;
-    emit('update:totalCount', total_count);
+    emit('update:totalCount', total_count ?? 0);
 
     state.loading = false;
 };

apps/web/src/services/asset-inventory/components/CollectorDetailScheduleSection.vue

@@ -3,7 +3,6 @@
         <collector-detail-section-header :title="$t('INVENTORY.COLLECTOR.DETAIL.SCHEDULE')"
                                          :edit-mode="state.isEditMode"
                                          :hide-edit-button="!collectorFormState.schedulePower"
-                                         :total-count="state.totalCount"
                                          @click-edit="handleClickEdit"
         />
 
@@ -81,7 +80,7 @@ const fetchCollectorUpdate = async (): Promise<CollectorModel> => {
             hours: collectorFormState.scheduleHours,
         },
     };
-    return SpaceConnector.clientV2.inventory.collector.update(params);
+    return SpaceConnector.clientV2.inventory.collector.update<CollectorUpdateParameters, CollectorModel>(params);
 };
 
 const handleClickEdit = () => {

apps/web/src/services/asset-inventory/components/CollectorDetailServiceAccountsSection.vue

@@ -104,7 +104,7 @@ const fetchCollectorUpdate = async (): Promise<CollectorModel> => {
         service_accounts: [],
     };
     Object.assign(params.secret_filter ?? {}, serviceAccountParams);
-    return SpaceConnector.clientV2.inventory.collector.update(params);
+    return SpaceConnector.clientV2.inventory.collector.update<CollectorUpdateParameters, CollectorModel>(params);
 };
 
 

apps/web/src/services/asset-inventory/components/CollectorFormAttachedServiceAccount.vue

@@ -11,7 +11,6 @@ import type { AutocompleteHandler } from '@spaceone/design-system/types/inputs/d
 import { QueryHelper } from '@cloudforet/core-lib/query';
 import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 
-import { ACCOUNT_TYPE } from '@/schema/identity/service-account/constant';
 import { i18n } from '@/translations';
 
 import SelectBox from '@/common/components/select/SelectBox.vue';
@@ -62,11 +61,10 @@ const state = reactive({
         return !invalidState.selectedAttachedServiceAccount;
     }),
     handlerParams: computed(() => {
-        queryHelper.setFilters([{ k: 'service_account_type', v: ACCOUNT_TYPE.TRUSTED, o: '!=' }]); // init filters
         if (collectorFormStore.collectorProvider) {
             queryHelper.addFilter({ k: 'provider', v: collectorFormStore.collectorProvider, o: '=' });
         } else if (collectorFormState.provider) {
-            queryHelper.addFilter({ k: 'provider', v: collectorFormStore.provider, o: '=' });
+            queryHelper.addFilter({ k: 'provider', v: collectorFormState.provider, o: '=' });
         } else if (collectorFormState.repositoryPlugin?.provider) {
             queryHelper.addFilter({ k: 'provider', v: collectorFormState.repositoryPlugin.provider, o: '=' });
         }

apps/web/src/services/asset-inventory/pages/CollectorDetailPage.vue

@@ -282,17 +282,15 @@ onMounted(async () => {
     collectorJobStore.$reset();
     collectorFormStore.$reset();
     collectorDataModalStore.$reset();
-    collectorDetailPageStore.$reset();
+    collectorDetailPageStore.reset();
     const collector = await getCollector();
     collectorJobStore.$patch((_state) => {
         _state.collector = collector;
     });
     if (collector) {
         collectorJobStore.getAllJobsCount();
-        collectorFormStore.setOriginCollector(collector);
-        collectorDetailPageStore.$patch((_state) => {
-            _state.collector = collector;
-        });
+        await collectorFormStore.setOriginCollector(collector);
+        collectorDetailPageStore.state.collector = collector;
         resume();
     }
 });
@@ -301,7 +299,7 @@ onUnmounted(() => {
     collectorJobStore.$reset();
     collectorFormStore.$reset();
     collectorDataModalStore.$reset();
-    collectorDetailPageStore.$reset();
+    collectorDetailPageStore.reset();
 });
 
 

apps/web/src/services/asset-inventory/stores/collector-detail-page-store.ts

@@ -1,4 +1,4 @@
-import { computed, reactive, ref } from 'vue';
+import { computed, reactive } from 'vue';
 
 import { defineStore } from 'pinia';
 
@@ -16,10 +16,12 @@ import ErrorHandler from '@/common/composables/error/errorHandler';
 export const useCollectorDetailPageStore = defineStore('collector-detail-page', () => {
     const appContextStore = useAppContextStore();
 
-    const collector = ref<Partial<CollectorModel>>({});
+    const state = reactive({
+        collector: {} as Partial<CollectorModel>,
+    });
 
     const getters = reactive({
-        isManagedCollector: computed(() => collector.value?.workspace_id === '*' ?? false),
+        isManagedCollector: computed(() => state.collector?.workspace_id === '*' ?? false),
         isEditableCollector: computed(() => {
             if (appContextStore.getters.isAdminMode) {
                 return true;
@@ -38,15 +40,18 @@ export const useCollectorDetailPageStore = defineStore('collector-detail-page',
                 const res = await SpaceConnector.clientV2.inventory.collector.get<CollectorGetParameters, CollectorModel>({
                     collector_id: collectorId,
                 });
-                collector.value = res;
+                state.collector = res;
             } catch (e) {
                 ErrorHandler.handleError(e);
             }
         },
+        reset: () => {
+            state.collector = {};
+        },
     };
 
     return {
-        collector,
+        state,
         getters,
         ...action,
     };