fix: variable ref not work in clone resource

seal-io · Mar 15, 2024 · 66f05b2 · 66f05b2
1 parent b2155e3
commit 66f05b2
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 11 deletions.
diff --git a/src/views/application-management/environments/components/clone-service.vue b/src/views/application-management/environments/components/clone-service.vue
@@ -451,6 +451,7 @@
  watch(
  () => props.hintData,
  () => {
+ console.log('props.hintData', props.hintData);
  completeData.value = props.hintData;
  },
  {

diff --git a/src/views/application-management/environments/pages/edit.vue b/src/views/application-management/environments/pages/edit.vue
@@ -232,7 +232,7 @@
  <CloneService
  key="resourceRef"
  ref="resourceRef"
- v-model:hint-data="completeData"
+ :hint-data="cloneCompleteData"
  :data-list="resourceList"
  :title="$t('menu.applicationManagement.resource')"
  clone-type="environment"
@@ -286,7 +286,8 @@
  InputWidth,
  EnvironmentTypeMap,
  EnvironmentTypeOrder,
- SaveActions
+ SaveActions,
+ HintKeyMaps
  } from '@/views/config';
  import { ref, computed, provide, onMounted, nextTick } from 'vue';
  import _, {
@@ -315,6 +316,7 @@
  import useProjectBreadcrumbData from '@/views/application-management/projects/hooks/use-project-breadcrumb-data';
  import useCompleteData from '@/views/application-management/services/hooks/use-complete-data';
  import { BreadcrumbOptions } from '@/views/config/interface';
+ import { queryProjectVairables } from '@/views/application-management/variables/api';
  import CloneService from '../components/clone-service.vue';
  import { EnvironFormData } from '../config/interface';
  import connectorsTable from '../components/connectors.vue';
@@ -329,7 +331,6 @@
 
  const {
  setCompleteData,
- getProjectVariables,
  getServiceList,
  serviceDataList,
  completeData,
@@ -370,6 +371,7 @@
  labels: {},
  list: []
  });
+ const projectVariables = ref<any[]>([]);
 
  const formData = ref<EnvironFormData>({
  projectID: route.params.projectId as string,
@@ -384,6 +386,21 @@
  resources: []
  });
 
+ const cloneCompleteData = computed(() => {
+ const variables = _.map(formData.value.variables, (item) => {
+ return {
+ value: item.name,
+ label: item.name,
+ tips: item.value,
+ showTips: false,
+ sensitive: item.sensitive
+ };
+ });
+ return {
+ ...completeData.value,
+ [HintKeyMaps.var]: [...projectVariables.value, ...variables]
+ };
+ });
  const EnvironmentTypeList = computed(() => {
  return _.map(userStore.applicableEnvironmentTypes, (item) => {
  return {
@@ -617,6 +634,26 @@
  }
  handleSubmit();
  };
+ const getProjectVariables = async () => {
+ try {
+ const params = {
+ page: -1,
+ includeInherited: true
+ };
+ const { data } = await queryProjectVairables(params);
+ projectVariables.value = _.map(data?.items || [], (item) => {
+ return {
+ label: item.name,
+ value: item.name,
+ tips: item.value,
+ showTips: false,
+ sensitive: item.sensitive
+ };
+ });
+ } catch (error) {
+ projectVariables.value = [];
+ }
+ };
  const cancelCallback = () => {
  if (route.name === PROJECT.EnvDetail) {
  getItemEnvironmentInfo();

diff --git a/src/views/application-management/services/hooks/use-complete-data.ts b/src/views/application-management/services/hooks/use-complete-data.ts
@@ -123,7 +123,6 @@ export default function useCompleteData(props?) {
  } else {
  await getTemplates();
  }
- console.log('dataType.value==========', dataType.value);
  };
  // get item template version, isOnSelect is a flag for select event
  const getTemplateVersions = async (
@@ -136,7 +135,6 @@ export default function useCompleteData(props?) {
  ) {
  return;
  }
- console.log('formTemplateData==========', formTemplateData);
  const templateID = formTemplateData.template?.id;
  const isVisited = _.find(
  allTemplateVersions.value,
@@ -172,20 +170,19 @@ export default function useCompleteData(props?) {
  }
  };
 
+ // optional args includeInherited, default is true
  const getProjectVariables = async () => {
  try {
  const params = {
  page: -1,
  includeInherited: true
  };
- const workflowParams = {
- projectID: props.value?.flow?.projectId,
- environmentID: props.value?.flow?.environmentId
- };
- if (props.value?.flow?.projectId) {
+
+ if (props?.value?.flow?.projectId) {
  const { data } = await queryEnvironmentVariables({
  ...params,
- ...workflowParams
+ projectID: props.value?.flow?.projectId,
+ environmentID: props.value?.flow?.environmentId
  });
  variableList.value = data.items || [];
  } else {

diff --git a/src/views/application-management/variables/api/index.ts b/src/views/application-management/variables/api/index.ts
@@ -35,6 +35,16 @@ export interface ResultType {
  pagination: Pagination;
 }
 
+export const queryProjectVairables = (params: QueryType) => {
+ let url = VARIABLE_API;
+ url = `${PROJECT_API_PREFIX()}${VARIABLE_API}`;
+ return axios.get<ResultType>(`${url}`, {
+ params,
+ paramsSerializer: (obj) => {
+ return qs.stringify(obj);
+ }
+ });
+};
 export const queryVariables = (params: QueryType) => {
  let url = VARIABLE_API;
  if (isProjectContext()) {