Next sso

components.d.ts

@@ -25,7 +25,6 @@ declare module 'vue' {
     AGrid: typeof import('@arco-design/web-vue')['Grid'];
     AGridItem: typeof import('@arco-design/web-vue')['GridItem'];
     AInput: typeof import('@arco-design/web-vue')['Input'];
-    AInputGroup: typeof import('@arco-design/web-vue')['InputGroup'];
     AInputNumber: typeof import('@arco-design/web-vue')['InputNumber'];
     AInputPassword: typeof import('@arco-design/web-vue')['InputPassword'];
     AInputSearch: typeof import('@arco-design/web-vue')['InputSearch'];

src/views/application-management/environments/config/interface.ts

@@ -1,6 +1,6 @@
 import { ServiceRowData } from '@/views/application-management/services/config/interface';
 import { ConnectorRowData } from '@/views/operation-hub/connectors/config/interface';
-import { DataListItem } from '@/types/global';
+import { DataListItem, AxiosRequestPayload } from '@/types/global';
 
 export interface EnvironmentRow extends DataListItem {
   id: string;
@@ -19,18 +19,22 @@ export interface EnvironmentRow extends DataListItem {
   connectorIDs: string[];
 }
 
-export interface EnvironFormData {
-  draft?: boolean;
-  preview?: boolean;
-  projectID?: string;
-  id?: string;
-  name: string;
-  type: string;
-  description: string;
-  connectorIDs: string[];
-  connectors: any[];
-  edges?: any[];
-  labels?: Record<string, any>;
-  resources?: any[];
-  variables?: any[];
+export interface EnvironFormData extends AxiosRequestPayload {
+  metadata: {
+    name: string;
+    namespace: string;
+    labels: object;
+  };
+  spec: {
+    type: string;
+    description: string;
+    draft?: boolean;
+    preview?: boolean;
+    connectorIDs: string[];
+    connectors: any[];
+    edges?: any[];
+    labels?: Record<string, any>;
+    resources?: any[];
+    variables?: any[];
+  };
 }

src/views/application-management/environments/pages/edit.vue

@@ -40,7 +40,7 @@
       >
         <a-form-item
           :label="$t('operation.environments.table.name')"
-          field="name"
+          field="metadata.name"
           :validate-trigger="['change', 'input']"
           :hide-label="true"
           :rules="[
@@ -56,7 +56,7 @@
           ]"
         >
           <seal-input
-            v-model.trim="formData.name"
+            v-model.trim="formData.metadata.name"
             :view-status="pageAction === PageAction.VIEW"
             :disabled="!!name && !isCloneAction"
             :label="$t('operation.environments.table.name')"
@@ -70,7 +70,7 @@
           :label="$t('applications.environment.type')"
           :hide-label="true"
           hide-asterisk
-          field="type"
+          field="spec.type"
           :rules="[
             {
               required: true,
@@ -79,7 +79,7 @@
           ]"
         >
           <seal-select
-            v-model="formData.type"
+            v-model="formData.spec.type"
             :view-status="pageAction === PageAction.VIEW"
             :label="$t('applications.environment.type')"
             :required="true"
@@ -92,12 +92,12 @@
         </a-form-item>
         <a-form-item
           :label="$t('operation.environments.table.description')"
-          field="description"
+          field="spec.description"
           :hide-label="true"
           validate-trigger="change"
         >
           <seal-textarea
-            v-model="formData.description"
+            v-model="formData.spec.description"
             :view-status="pageAction === PageAction.VIEW"
             :label="$t('operation.environments.table.description')"
             :style="{ width: `${InputWidth.LARGE}px` }"
@@ -110,7 +110,7 @@
         <a-form-item
           :label="$t(`applications.projects.form.label`)"
           :hide-label="true"
-          field="labels"
+          field="metadata.labels"
           validate-trigger="change"
           :rules="[
             {
@@ -138,7 +138,7 @@
             :style="{ width: `${InputWidth.LARGE}px` }"
           >
             <keyValueLabels
-              v-model:value="formData.labels"
+              v-model:value="formData.metadata.labels"
               v-model:labelList="labelsData.list"
               :validate-trigger="validateTrigger"
               :labels="labelsData.labels"
@@ -286,7 +286,6 @@
     validateInputLength,
     InputWidth,
     EnvironmentTypeMap,
-    EnvironmentTypeList,
     EnvironmentTypeOrder,
     SaveActions,
     HintKeyMaps
@@ -325,7 +324,10 @@
     createEnvironment,
     cloneEnvironment,
     updateEnvironment,
-    queryItemEnvironments
+    queryItemEnvironments,
+    apiVersion,
+    ResourceKinds,
+    GlobalNamespace
   } from '../api';
 
   const {
@@ -343,7 +345,7 @@
   const tabBarStore = useTabBarStore();
   const { router, route, t } = useCallCommon();
   const { pageAction, handleEdit } = usePageAction();
-  const name = route.query.name as string;
+  const envName = route.query.name as string;
   const isCloneAction = route.params.clone as string; // only in clone
   const environmentName = route.params.environmentName as string;
   const projectName = route.params.projectName as string;
@@ -374,10 +376,23 @@
   const projectVariables = ref<any[]>([]);
 
   const formData = ref<EnvironFormData>({
-    projectID: route.params.projectId as string,
-    name: '',
-    type: '',
-    description: '',
+    apiVersion,
+    kind: ResourceKinds.Environment,
+    metadata: {
+      namespace: projectName,
+      name: '',
+      labels: {}
+    },
+    spec: {
+      type: '',
+      description: '',
+      connectorIDs: [],
+      connectors: [],
+      variables: [],
+      edges: [],
+      labels: {},
+      resources: []
+    },
     connectorIDs: [],
     connectors: [],
     variables: [],
@@ -401,15 +416,16 @@
       [HintKeyMaps.var]: [...projectVariables.value, ...variables]
     };
   });
-  // const EnvironmentTypeList = computed(() => {
-  //   return _.map(userStore.applicableEnvironmentTypes, (item) => {
-  //     return {
-  //       label: t(EnvironmentTypeMap[item] || ''),
-  //       value: item,
-  //       order: EnvironmentTypeOrder[item]
-  //     };
-  //   }).sort((a, b) => a.order - b.order);
-  // });
+  const EnvironmentTypeList = computed(() => {
+    // userStore.applicableEnvironmentTypes
+    return _.map(_.keys(EnvironmentTypeMap), (item) => {
+      return {
+        label: t(EnvironmentTypeMap[item] || ''),
+        value: item,
+        order: EnvironmentTypeOrder[item]
+      };
+    }).sort((a, b) => a.order - b.order);
+  });
   const selectableConnectors = computed(() => {
     return _.filter(connectorList.value, (item) => {
       return item.applicableEnvironmentType === formData.value.type;
@@ -420,10 +436,10 @@
     if (isCloneAction) {
       return t('applications.environment.clone');
     }
-    if (!name) {
+    if (!envName) {
       return t('operation.environments.create');
     }
-    if (name && pageAction.value === PageAction.EDIT) {
+    if (envName && pageAction.value === PageAction.EDIT) {
       return t('operation.environments.edit');
     }
     return t('operation.environments.view');
@@ -439,8 +455,8 @@
     if (route.name === PROJECT.EnvDetail) {
       pageAction.value = userStore.hasProjectResourceActions({
         resource: Resources.Environments,
-        environmentID: name,
-        projectID: route.params.projectId,
+        environmentID: envName,
+        projectID: route.params.projectName,
         actions: ['POST']
       })
         ? PageAction.EDIT
@@ -453,8 +469,8 @@
     }
     const hasPermission = userStore.hasProjectResourceActions({
       resource: Resources.Environments,
-      environmentID: name,
-      projectID: route.params.projectId,
+      environmentID: envName,
+      projectID: route.params.projectName,
       actions: ['POST']
     });
     return pageAction.value === PageAction.VIEW && hasPermission;
@@ -504,10 +520,10 @@
   };
   const getItemEnvironmentInfo = async () => {
     copyFormData = cloneDeep(formData.value);
-    if (!name) return;
+    if (!envName) return;
     try {
       const { data } = await queryItemEnvironments({
-        environmentName: name,
+        environmentName: envName,
         namespace: projectName
       });
       formData.value = data;
@@ -525,7 +541,7 @@
       copyFormData = cloneDeep(formData.value);
     } catch (error) {
       formData.value = {
-        projectID: route.params.projectId as string,
+        projectID: route.params.projectName as string,
         name: '',
         type: '',
         description: '',
@@ -596,11 +612,11 @@
         if (isCloneAction) {
           handleCloneEnvironment(data);
         }
-        if (name && !isCloneAction) {
+        if (envName && !isCloneAction) {
           await updateEnvironment(data);
         } else if (isCloneAction) {
           await cloneEnvironment(data, environmentName);
-        } else if (!name && !environmentName) {
+        } else if (!envName && !environmentName) {
           await createEnvironment({
             data,
             namespace: projectName
@@ -720,7 +736,7 @@
     }
   };
   const setLabels = () => {
-    labelsData.value.labels = _.cloneDeep(formData.value.labels);
+    labelsData.value.labels = _.cloneDeep(formData.value.metadata.labels);
   };
   const init = async () => {
     setBreadCrumbList();

src/views/config/resource-kinds.ts

@@ -8,7 +8,8 @@ export default {
   Settings: 'Settings',
   Project: 'Project',
   Variable: 'Variable',
-  Connector: 'Connector'
+  Connector: 'Connector',
+  Environment: 'Environment'
 };
 
 export const apiVersion = 'walrus.seal.io/v1';

src/views/operation-hub/catalogs/api/index.ts

@@ -72,7 +72,7 @@ export function refreshCatalog(data: {
   name: string;
   item: object;
 }) {
-  const url = `/${NAMESPACES}/${data.namespace}/${CatalogAPI}/${data.name}`;
+  const url = `/${NAMESPACES}/${data.namespace}/${CatalogAPI}/${data.name}/status`;
   return axios.put(`${url}`, data.item);
 }
 

src/views/operation-hub/catalogs/components/catalog-basic.vue

@@ -61,8 +61,7 @@
           spec: {
             ...props.formData.spec,
             vcsSource: {
-              ...props.formData.spec.vcsSource,
-              token: ''
+              ...props.formData.spec.vcsSource
             }
           }
         });
@@ -161,14 +160,8 @@
               show-word-limit
             ></seal-textarea>
           </a-form-item>
-          <GroupTitle
-            style={{ marginBottom: 0 }}
-            title="Storage"
-            bordered={false}
-            flexStart
-          ></GroupTitle>
+
           <a-form-item
-            label={t('operation.templates.form.StorageType')}
             field="spec.vcsSource.platform"
             hide-asterisk
             hide-label={true}
@@ -188,7 +181,7 @@
                   }
                 });
               }}
-              label={t('operation.templates.form.StorageType')}
+              label={t('common.table.type')}
               required={true}
               style={{ width: `${InputWidth.LARGE}px` }}
               v-slots={{
@@ -247,7 +240,7 @@
               style={{ width: `${InputWidth.LARGE}px` }}
             ></seal-input>
           </a-form-item>
-          <a-form-item
+          {/* <a-form-item
             label={t('operation.templates.form.authentication')}
             field="spec.vcsSource.secretRef"
             hide-asterisk
@@ -264,8 +257,8 @@
               style={{ width: `${InputWidth.LARGE}px` }}
               options={AuthenticationOptions}
             ></seal-select>
-          </a-form-item>
-          {authentication.value === 'bearer' && (
+          </a-form-item> */}
+          {/* {authentication.value === 'bearer' && (
             <a-form-item
               label="Token"
               field="spec.vcsSource.token"
@@ -293,7 +286,7 @@
                 style={{ width: `${InputWidth.LARGE}px` }}
               ></seal-input>
             </a-form-item>
-          )}
+          )} */}
         </>
       );
     }

src/views/operation-hub/catalogs/components/catalog-modal.vue

@@ -110,8 +110,7 @@
       description: '',
       vcsSource: {
         platform: 'Github',
-        url: '',
-        token: ''
+        url: ''
       },
       filtering: {
         excludeFilter: '',
@@ -157,8 +156,7 @@
         description: '',
         vcsSource: {
           platform: 'Github',
-          url: '',
-          token: ''
+          url: ''
         },
         filtering: {
           excludeFilter: '',