chore: template chunk filter

seal-io · Aug 14, 2023 · b37a35c · b37a35c
1 parent e3125dc
commit b37a35c
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 215 deletions.
diff --git a/config/vite.config.dev.ts b/config/vite.config.dev.ts
@@ -19,7 +19,7 @@ export default mergeConfig(
       },
       https: true,
       port: 4000,
-      proxy: createProxyTable('https://192.168.50.92')
+      proxy: createProxyTable()
     },
     plugins: [
       basicSsl(),

diff --git a/src/components/form-create/config/test.ts b/src/components/form-create/config/test.ts
diff --git a/src/components/form-create/index.vue b/src/components/form-create/index.vue
@@ -206,7 +206,6 @@
   } from './config/interface';
   import { json2Yaml, yaml2Json } from './config/yaml-parse';
   import formComponents from './components';
-  import testData from './config/test';
   import {
     parseMapstring,
     parseOptions,

diff --git a/src/views/application-management/environments/components/clone-service.vue b/src/views/application-management/environments/components/clone-service.vue
@@ -187,8 +187,6 @@
                 :ref="(el: refItem) => setRefMap(el, `schemaForm${index}`)"
                 :form-id="`schemaForm${index}`"
                 layout="vertical"
-                action="post"
-                api=""
                 :show-footer="false"
                 :submit="() => {}"
                 :attributes="variableAttributes"
@@ -203,8 +201,6 @@
             ref="schemaForm"
             form-id="schemaForm"
             layout="vertical"
-            action="post"
-            api=""
             :show-footer="false"
             :submit="() => {}"
             :model="variablesGroupForm[defaultGroupKey]?.attributes"

diff --git a/src/views/application-management/environments/components/list-view.vue b/src/views/application-management/environments/components/list-view.vue
@@ -82,6 +82,7 @@
 </template>
 
 <script lang="ts" setup>
+  import { PageAction } from '@/views/config';
   import { Resources } from '@/permissions/config';
   import { useUserStore } from '@/store';
   import { PropType, watchEffect } from 'vue';
@@ -139,23 +140,16 @@
     router.push({
       name: 'EnvironmentDetail',
       params: {
-        action: 'edit'
+        action: PageAction.EDIT
       },
       query: { id: row.id }
     });
   };
   const handleView = (row) => {
-    // router.push({
-    //   name: 'EnvironmentDetail',
-    //   params: {
-    //     action: 'view'
-    //   },
-    //   query: { id: row.id }
-    // });
     router.push({
       name: 'ProjectEnvDetail',
       params: {
-        action: 'view',
+        action: PageAction.VIEW,
         ...route.params,
         environmentId: row.id
       }

diff --git a/src/views/application-management/environments/pages/edit.vue b/src/views/application-management/environments/pages/edit.vue
@@ -259,8 +259,7 @@
   import {
     createEnvironment,
     updateEnvironment,
-    queryItemEnvironments,
-    cloneEnvironment
+    queryItemEnvironments
   } from '../api';
 
   const { getProjectList, setProjectList, initBreadValues, handleBreadChange } =

diff --git a/src/views/application-management/environments/pages/list.vue b/src/views/application-management/environments/pages/list.vue
@@ -237,7 +237,7 @@
   const total = ref(0);
   const showModal = ref(false);
   const currentInfo = ref({});
-  const action = ref('edit');
+  const action = ref(PageAction.EDIT);
   const queryParams = reactive({
     query: '',
     page: 1,
@@ -246,13 +246,11 @@
   });
 
   const handleCreate = () => {
-    // action.value = 'create';
-    // showModal.value = true;
     router.push({
       name: PROJECT.EnvEdit,
       params: {
         projectId: route.params.projectId,
-        action: 'edit'
+        action: PageAction.EDIT
       }
     });
   };
@@ -313,11 +311,6 @@
     });
   };
   const handleEdit = (row) => {
-    // currentInfo.value = row;
-    // action.value = 'edit';
-    // setTimeout(() => {
-    //   showModal.value = true;
-    // }, 100);
     router.push({
       name: PROJECT.EnvEdit,
       params: {

diff --git a/src/views/application-management/services/api/index.ts b/src/views/application-management/services/api/index.ts
@@ -209,7 +209,7 @@ interface ApplicationRevisionParams extends Pagination {
   sort?: string[];
 }
 
-export const queryApplicationRevisions = (
+export const queryServiceRevisions = (
   params: ApplicationRevisionParams,
   token?
 ) => {
@@ -281,7 +281,7 @@ export const queryRevisionChange = (params: {
   );
 };
 
-export const rollbackInstance = (data: {
+export const rollbackService = (data: {
   revisionID: string;
   serviceID: string;
 }) => {
@@ -295,13 +295,6 @@ export const rollbackInstance = (data: {
   );
 };
 
-export const rollbackApplication = (data: { id: string }) => {
-  return axios.post(
-    `${SERVICE_RESOURCE_API_PREFIX()}/revisions/${
-      data.id
-    }/rollback-applications?${qs.stringify(getPermissionRouteParams())}`
-  );
-};
 // ===========resource==========
 export const queryServiceResource = (
   params: ApplicationRevisionParams,

diff --git a/src/views/application-management/services/components/hooks/use-fetch-chunk-data.ts b/src/views/application-management/services/components/hooks/use-fetch-chunk-data.ts
@@ -220,7 +220,7 @@ export default function useFetchResource() {
         const { data } = await queryServiceResource(params, fetchToken.token);
         let list: any = _.filter(
           data?.items || [],
-          (item) => item?.instance?.id === serviceId.value
+          (item) => item?.service?.id === serviceId.value
         );
         list = setDataList(list);
         dataList.value = [].concat(list);

diff --git a/src/views/application-management/services/components/instance/index.vue b/src/views/application-management/services/components/instance/index.vue
@@ -334,9 +334,6 @@
   const handleOk = () => {
     router.back();
   };
-  const handleCancel = () => {
-    router.back();
-  };
 
   onMounted(() => {
     setInstanceTabList();

diff --git a/src/views/application-management/services/components/instance/service-history.vue b/src/views/application-management/services/components/instance/service-history.vue
@@ -178,16 +178,15 @@
   import serviceSpecDiff from '../service-spec-diff.vue';
   import { setDurationValue, RevisionStatus } from '../../config';
   import {
-    queryApplicationRevisions,
+    queryServiceRevisions,
     deleteApplicationRevisions,
     diffRevisionSpec,
-    rollbackInstance,
+    rollbackService,
     queryRevisionChange,
     SERVICE_RESOURCE_API_PREFIX
   } from '../../api';
 
   let axiosListInstance = createAxiosToken();
-  const permissionParams = usePermissionParams();
   const userStore = useUserStore();
   const { t, route } = useCallCommon();
   const { setChunkRequest } = useSetChunkRequest();
@@ -205,7 +204,6 @@
   const showDetailModal = ref(false);
   const showDiffModal = ref(false);
   const initialStatus = ref('');
-  const rollbackType = ref('');
   const diffContent = ref({});
   const rollbackData = ref<any>({});
   const ids = ref<{ id: string }[]>([]);
@@ -234,9 +232,9 @@
     }
   };
 
-  const handleRollbackInstance = async () => {
+  const handleRollbackService = async () => {
     try {
-      await rollbackInstance({
+      await rollbackService({
         revisionID: rollbackData.value.id,
         serviceID: serviceId.value
       });
@@ -247,10 +245,9 @@
   };
 
   const handleConfirmDiff = async () => {
-    handleRollbackInstance();
+    handleRollbackService();
   };
   const handleViewHistoryChange = async (row) => {
-    rollbackType.value = 'instance';
     rollbackData.value = row;
     try {
       const params = {
@@ -274,7 +271,7 @@
     axiosListInstance = createAxiosToken();
     try {
       loading.value = true;
-      const { data } = await queryApplicationRevisions(
+      const { data } = await queryServiceRevisions(
         {
           ...queryParams,
           serviceID: serviceId.value,

diff --git a/src/views/application-management/services/components/rollback-modal.vue b/src/views/application-management/services/components/rollback-modal.vue
@@ -105,12 +105,10 @@
   import EditPageFooter from '@/components/edit-page-footer/index.vue';
   import { InstanceData, HistoryData } from '../config/interface';
   import {
-    queryApplicationRevisions,
+    queryServiceRevisions,
     diffRevisionSpec,
-    rollbackApplication,
-    rollbackInstance
+    rollbackService
   } from '../api';
-  import { updateApplicationEmitter } from '../hooks/update-application-listener';
 
   const props = defineProps({
     show: {
@@ -163,18 +161,9 @@
     id: ''
   });
 
-  const handleRollbackApplication = async () => {
+  const handleRollbackService = async () => {
     try {
-      await rollbackApplication({ id: formData.id });
-      execSucceed();
-      updateApplicationEmitter();
-    } catch (error) {
-      //
-    }
-  };
-  const handleRollbackInstance = async () => {
-    try {
-      await rollbackInstance({
+      await rollbackService({
         revisionID: formData.id,
         serviceID: formData.serviceID
       });
@@ -192,7 +181,7 @@
         serviceID: formData.serviceID,
         projectID: props.projectID
       };
-      const { data } = await queryApplicationRevisions(params);
+      const { data } = await queryServiceRevisions(params);
       revisionList.value = data?.items || [];
       loading.value = false;
     } catch (error) {
@@ -223,16 +212,9 @@
     clearDiffLines();
     getRevisionDiff();
   };
-  const handleInstanceChange = () => {
-    clearDiffLines();
-    getRevisionList();
-  };
+
   const handleExecRollback = async () => {
-    if (!props.serviceId) {
-      await handleRollbackApplication();
-    } else {
-      await handleRollbackInstance();
-    }
+    await handleRollbackService();
     emit('update:show', false);
   };
   const handleOk = async () => {

diff --git a/src/views/application-management/services/config/index.ts b/src/views/application-management/services/config/index.ts
@@ -13,33 +13,12 @@ export const instanceTabs = [
     requiredAuth: true,
     permission: ['GET']
   },
-  // {
-  //   label: 'applications.instance.tab.log',
-  //   value: 'logs',
-  //   com: 'tabLogs',
-  //   requiredAuth: true,
-  //   permission: ['GET']
-  // },
   {
     label: 'applications.instance.tab.output',
     value: 'outputs',
     requiredAuth: false,
     com: 'tabOutput'
   }
-  // {
-  //   label: 'applications.instance.tab.graph',
-  //   value: 'graph',
-  //   com: 'tabGraph',
-  //   requiredAuth: true,
-  //   permission: ['GET']
-  // },
-  // {
-  //   label: 'applications.instance.tab.term',
-  //   value: 'terminal',
-  //   com: 'tabTerminal',
-  //   requiredAuth: true,
-  //   permission: ['GET']
-  // }
 ];
 
 export const moduleActions = [