Optimize code based on review

halo-dev · Oct 30, 2024 · 34f10c5 · 34f10c5
1 parent d747913
commit 34f10c5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 46 deletions.
diff --git a/ui/console-src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue b/ui/console-src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue
@@ -11,11 +11,9 @@ import { useI18n } from "vue-i18n";
 const props = withDefaults(
   defineProps<{
     group?: Group;
-    isNew?: boolean;
   }>(),
   {
     group: undefined,
-    isNew: false,
   }
 );
 
@@ -46,7 +44,12 @@ const modalTitle = props.group
 const handleSave = async () => {
   try {
     isSubmitting.value = true;
-    if (props.isNew) {
+    if (props.group) {
+      await coreApiClient.storage.group.updateGroup({
+        name: formState.value.metadata.name,
+        group: formState.value,
+      });
+    } else {
       const { data: groups } = await coreApiClient.storage.group.listGroup();
       const hasDisplayNameDuplicate = groups.items.some(
         (group) => group.spec.displayName === formState.value.spec.displayName
@@ -57,14 +60,6 @@ const handleSave = async () => {
         );
         return;
       }
-    }
-
-    if (props.group) {
-      await coreApiClient.storage.group.updateGroup({
-        name: formState.value.metadata.name,
-        group: formState.value,
-      });
-    } else {
       await coreApiClient.storage.group.createGroup({
         group: formState.value,
       });

diff --git a/ui/console-src/modules/contents/attachments/components/AttachmentGroupList.vue b/ui/console-src/modules/contents/attachments/components/AttachmentGroupList.vue
@@ -26,7 +26,6 @@ const emit = defineEmits<{
 }>();
 
 const queryClient = useQueryClient();
-const isNewGroup = ref(false);
 const defaultGroups: Group[] = [
   {
     spec: {
@@ -68,16 +67,10 @@ const onCreationModalClose = () => {
   queryClient.invalidateQueries({ queryKey: ["attachment-groups"] });
   creationModalVisible.value = false;
 };
-
-const handleBadgeClick = () => {
-  creationModalVisible.value = true;
-  isNewGroup.value = true;
-};
 </script>
 <template>
   <AttachmentGroupEditingModal
     v-if="!readonly && creationModalVisible"
-    :is-new="isNewGroup"
     @close="onCreationModalClose"
   />
   <div
@@ -107,7 +100,7 @@ const handleBadgeClick = () => {
     >
       <AttachmentGroupBadge
         :features="{ actions: false }"
-        @click="handleBadgeClick"
+        @click="creationModalVisible = true"
       >
         <template #text>
           <span>{{ $t("core.common.buttons.new") }}</span>

diff --git a/ui/console-src/modules/contents/attachments/components/AttachmentPoliciesModal.vue b/ui/console-src/modules/contents/attachments/components/AttachmentPoliciesModal.vue
@@ -40,17 +40,14 @@ const selectedPolicy = ref<Policy>();
 const selectedTemplateName = ref();
 
 const policyEditingModal = ref(false);
-const isNewPolicy = ref(false);
 
 const handleOpenEditingModal = (policy: Policy) => {
   selectedPolicy.value = policy;
-  isNewPolicy.value = false;
   policyEditingModal.value = true;
 };
 
 const handleOpenCreateNewPolicyModal = (policyTemplate: PolicyTemplate) => {
   selectedTemplateName.value = policyTemplate.metadata.name;
-  isNewPolicy.value = true;
   policyEditingModal.value = true;
 };
 
@@ -234,7 +231,6 @@ function getPolicyTemplateDisplayName(templateName: string) {
     v-if="policyEditingModal"
     :policy="selectedPolicy"
     :template-name="selectedTemplateName"
-    :is-new="isNewPolicy"
     @close="onEditingModalClose"
   />
 </template>
diff --git a/ui/console-src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue b/ui/console-src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue
@@ -14,12 +14,10 @@ const props = withDefaults(
   defineProps<{
     policy?: Policy;
     templateName?: string;
-    isNew?: boolean;
   }>(),
   {
     policy: undefined,
     templateName: undefined,
-    isNew: false,
   }
 );
 
@@ -137,22 +135,7 @@ const submitting = ref(false);
 const handleSave = async () => {
   try {
     submitting.value = true;
-    if (props.isNew) {
-      const { data: policies } =
-        await coreApiClient.storage.policy.listPolicy();
-      const hasDisplayNameDuplicate = policies.items.some(
-        (policy) => policy.spec.displayName === formState.value.spec.displayName
-      );
-
-      if (hasDisplayNameDuplicate) {
-        Toast.error(
-          t("core.attachment.policy_editing_modal.toast.policy_name_exists")
-        );
-        return;
-      }
-    }
     const configMapToUpdate = convertToSave();
-
     if (isUpdateMode) {
       await coreApiClient.configMap.updateConfigMap({
         name: configMap.value.metadata.name,
@@ -164,6 +147,18 @@ const handleSave = async () => {
         policy: formState.value,
       });
     } else {
+      const { data: policies } =
+        await coreApiClient.storage.policy.listPolicy();
+      const hasDisplayNameDuplicate = policies.items.some(
+        (policy) => policy.spec.displayName === formState.value.spec.displayName
+      );
+
+      if (hasDisplayNameDuplicate) {
+        Toast.error(
+          t("core.attachment.policy_editing_modal.toast.policy_name_exists")
+        );
+        return;
+      }
       const { data: newConfigMap } =
         await coreApiClient.configMap.createConfigMap({
           configMap: configMapToUpdate,

diff --git a/ui/console-src/modules/contents/attachments/components/AttachmentUploadModal.vue b/ui/console-src/modules/contents/attachments/components/AttachmentUploadModal.vue
@@ -33,8 +33,6 @@ const selectedGroupName = useLocalStorage("attachment-upload-group", "");
 const selectedPolicyName = useLocalStorage("attachment-upload-policy", "");
 const policyEditingModal = ref(false);
 const groupEditingModal = ref(false);
-const isNewPolicy = ref(false);
-const isNewGroup = ref(false);
 const policyTemplateNameToCreate = ref();
 
 onMounted(() => {
@@ -47,12 +45,10 @@ const handleOpenCreateNewPolicyModal = async (
   policyTemplate: PolicyTemplate
 ) => {
   policyTemplateNameToCreate.value = policyTemplate.metadata.name;
-  isNewPolicy.value = true;
   policyEditingModal.value = true;
 };
 
 const handleOpenCreateNewGroupModal = () => {
-  isNewGroup.value = true;
   groupEditingModal.value = true;
 };
 
@@ -183,13 +179,11 @@ const onGroupEditingModalClose = async () => {
   <AttachmentPolicyEditingModal
     v-if="policyEditingModal"
     :template-name="policyTemplateNameToCreate"
-    :is-new="isNewPolicy"
     @close="onEditingModalClose"
   />
 
   <AttachmentGroupEditingModal
     v-if="groupEditingModal"
-    :is-new="isNewGroup"
     @close="onGroupEditingModalClose"
   />
 </template>