Merge pull request #584 from jschoiRR/mold-diplo-2024-main

[Mold UI] cloudstack 버전 조회 메소드 실행 문제 주석처리(폐쇄망인 경우 버전 정보 조회 불가한 이슈), 목록 조회 필터 조건값 조회부분 api명 오류 수정

Author: jschoiRR

packaging/centos8/cloud.spec

@@ -414,8 +414,8 @@ if [ ! -z $python_dir ];then
 fi
 
 %preun management
-/usr/bin/systemctl stop cloudstack-management || true
-/usr/bin/systemctl disable cloudstack-management || true
+/usr/bin/systemctl stop mold || true
+/usr/bin/systemctl disable mold || true
 
 %pre management
 id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \

ui/public/locales/ko_KR.json

@@ -191,9 +191,9 @@
 "label.action.patch.systemvm.processing": "\uc2dc\uc2a4\ud15c VM \ud328\uce58....",
 "label.action.project.add.account": "\ud504\ub85c\uc81d\ud2b8\uc5d0 \uacc4\uc815 \ucd94\uac00",
 "label.action.project.add.user": "\ud504\ub85c\uc81d\ud2b8\uc5d0 \uc0ac\uc6a9\uc790 \ucd94\uac00",
-"label.action.quota.tariff.create": "\ud560\ub2f9 \uc694\uae08\uc81c \uc0dd\uc131",
-"label.action.quota.tariff.edit": "\ud560\ub2f9 \uc694\uae08\uc81c \uc218\uc815",
-"label.action.quota.tariff.remove": "\ud560\ub2f9 \uc694\uae08\uc81c \uc0ad\uc81c",
+"label.action.quota.tariff.create": "\ud560\ub2f9 \uc694\uae08 \uc0dd\uc131",
+"label.action.quota.tariff.edit": "\ud560\ub2f9 \uc694\uae08 \uc218\uc815",
+"label.action.quota.tariff.remove": "\ud560\ub2f9 \uc694\uae08 \uc0ad\uc81c",
 "label.action.reboot.instance": "\uac00\uc0c1\uba38\uc2e0 \uc7ac\uc2dc\uc791",
 "label.action.reboot.router": "\ub77c\uc6b0\ud130 \uc7ac\uc2dc\uc791",
 "label.action.reboot.systemvm": "\uc2dc\uc2a4\ud15c VM \uc7ac\uc2dc\uc791",
@@ -1852,13 +1852,13 @@
 "label.quota.statement": "\uae30\uc7ac",
 "label.quota.statement.balance": "\ud560\ub2f9 \uc794\uc561",
 "label.quota.statement.quota": "\ud560\ub2f9 \uc0ac\uc6a9\ub7c9",
-"label.quota.statement.tariff": "\ud560\ub2f9 \uc694\uae08\uc81c",
+"label.quota.statement.tariff": "\ud560\ub2f9 \uc694\uae08",
 "label.quota.summary": "\uc694\uc57d",
-"label.quota.tariff": "\uc694\uae08\uc81c",
+"label.quota.tariff": "\uc694\uae08",
 "label.quota.tariff.activationrule": "\ud65c\uc131\ud654 \uaddc\uce59",
 "label.quota.tariff.effectivedate": "\uc720\ud6a8 \uc77c\uc790",
 "label.quota.tariff.position": "\uc704\uce58",
-"label.quota.tariff.value": "\uc694\uae08\uc81c \uac12",
+"label.quota.tariff.value": "\uc694\uae08 \uac00\uaca9",
 "label.quota.total": "\uc804\uccb4",
 "label.quota.type.name": "\uc0ac\uc6a9 \uc720\ud615",
 "label.quota.type.unit": "\uc0ac\uc6a9\ub7c9 \ub2e8\uc704",
@@ -2311,7 +2311,7 @@
 "label.taken": "Taken",
 "label.target.iqn": "\ud0c0\uac9f IQN",
 "label.tariffactions": "\uc791\uc5c5",
-"label.tariffvalue": "\uc694\uae08\uc81c \uac12",
+"label.tariffvalue": "\uc694\uae08 \uac00\uaca9",
 "label.tcp": "TCP",
 "label.tcp.proxy": "TCP \ud504\ub85d\uc2dc",
 "label.template": "\ud15c\ud50c\ub9bf",
@@ -2754,10 +2754,10 @@
 "message.action.primary.storage.scope.cluster": "\uc601\uc5ed\uc5d0\uc11c \uc9c0\uc815\ub41c \ud074\ub7ec\uc2a4\ud130\ub85c \ubc94\uc704\ub97c \ubcc0\uacbd\ud560 \uac83\uc778\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.<br>\uc774 \uc791\uc5c5\uc740 \ub370\uc774\ud130\ubca0\uc774\uc2a4\ub97c \uc5c5\ub370\uc774\ud2b8\ud558\uace0 \ubaa8\ub4e0 \ud638\uc2a4\ud2b8\uc5d0\uc11c \uc2a4\ud1a0\ub9ac\uc9c0 \ud480\uc758 \uc5f0\uacb0\uc744 \ub04a\uc2b5\ub2c8\ub2e4. \uc774\uc804\uc5d0 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \uc5f0\uacb0\ub418\uc5b4 \uc788\uc5c8\uace0 \uc9c0\uc815\ub41c \ud074\ub7ec\uc2a4\ud130\uc758 \uc77c\ubd80\uac00 \uc544\ub2d9\ub2c8\ub2e4.",
 "message.action.primary.storage.scope.zone": "\ud074\ub7ec\uc2a4\ud130\uc5d0\uc11c \uc601\uc5ed\uc73c\ub85c \ubc94\uc704\ub97c \ubcc0\uacbd\ud560\uc9c0 \ud655\uc778\ud558\uc138\uc694.<br>\uc774 \uc791\uc5c5\uc740 \ub370\uc774\ud130\ubca0\uc774\uc2a4\ub97c \uc5c5\ub370\uc774\ud2b8\ud558\uace0 \uc2a4\ud1a0\ub9ac\uc9c0 \ud480\uc744 \uc2e4\ud589 \uc911\uc778 \uc601\uc5ed\uc758 \ubaa8\ub4e0 \ud638\uc2a4\ud2b8\uc5d0 \uc5f0\uacb0\ud569\ub2c8\ub2e4. \uc2a4\ud1a0\ub9ac\uc9c0 \ud480\uc5d0 \uc124\uc815\ub41c \uac83\uacfc \ub3d9\uc77c\ud55c \ud558\uc774\ud37c\ubc14\uc774\uc800\uc785\ub2c8\ub2e4.",
 "message.action.primarystorage.enable.maintenance.mode": "\uacbd\uace0: \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \uc720\uc9c0 \ubcf4\uc218 \ubaa8\ub4dc\ub85c \ud558\uba74 \uadf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc0c1 \ubcfc\ub968\uc744 \uc0ac\uc6a9\ud558\ub294 \ubaa8\ub4e0 VM\uac00 \uc815\uc9c0\ud569\ub2c8\ub2e4. \uc2e4\ud589\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
-"message.action.quota.tariff.create.error.namerequired": "\ud560\ub2f9 \uc694\uae08\uc81c\uc758 \uc774\ub984\uc744 \uc54c\ub824\uc8fc\uc138\uc694.",
-"message.action.quota.tariff.create.error.usagetyperequired": "\ud560\ub2f9 \uc694\uae08\uc81c\uc758 \uc0ac\uc6a9 \uc720\ud615\uc744 \uc120\ud0dd\ud558\uc138\uc694.",
-"message.action.quota.tariff.create.error.valuerequired": "\ud560\ub2f9 \uc694\uae08\uc81c\uc758 \uac12\uc744 \uc54c\ub824\uc8fc\uc138\uc694.",
-"message.action.quota.tariff.remove": "\uc774 \ud560\ub2f9 \uc694\uae08\uc81c\ub97c \uc81c\uac70\ud560\uc9c0 \ud655\uc778\ud558\uc138\uc694.",
+"message.action.quota.tariff.create.error.namerequired": "\ud560\ub2f9 \uc694\uae08\uc758 \uc774\ub984\uc744 \uc54c\ub824\uc8fc\uc138\uc694.",
+"message.action.quota.tariff.create.error.usagetyperequired": "\ud560\ub2f9 \uc694\uae08\uc758 \uc0ac\uc6a9 \uc720\ud615\uc744 \uc120\ud0dd\ud558\uc138\uc694.",
+"message.action.quota.tariff.create.error.valuerequired": "\ud560\ub2f9 \uc694\uae08\uc758 \uac12\uc744 \uc54c\ub824\uc8fc\uc138\uc694.",
+"message.action.quota.tariff.remove": "\uc774 \ud560\ub2f9 \uc694\uae08\ub97c \uc81c\uac70\ud560\uc9c0 \ud655\uc778\ud558\uc138\uc694.",
 "message.action.reboot.instance": "\ud604\uc7ac \uac00\uc0c1\uba38\uc2e0\uc744 \uc7ac\uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
 "message.action.clone.instance": "\uc774 \uac00\uc0c1\uba38\uc2e0\uc744 \ubcf5\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
 "message.action.reboot.router": "\ud604\uc7ac \uac00\uc0c1 \ub77c\uc6b0\ud130\ub85c \uc81c\uacf5\ud558\ub294 \ubaa8\ub4e0 \uc11c\ube44\uc2a4\uac00 \uc911\ub2e8\ub429\ub2c8\ub2e4. \uc774 \ub77c\uc6b0\ud130\ub97c \uc7ac\uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
@@ -3465,8 +3465,8 @@
 "message.publicip.state.free": "IP \uc8fc\uc18c\ub97c \ud560\ub2f9\ud560 \uc900\ube44\uac00 \ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
 "message.publicip.state.releasing": "\ub2e4\ub978 \ub124\ud2b8\uc6cc\ud06c \uc694\uc18c\uc5d0 \ub300\ud574 IP \uc8fc\uc18c\uac00 \ud574\uc81c\ub418\uace0 \ud560\ub2f9\ud560 \uc900\ube44\uac00 \ub418\uc9c0\uc54a\uc558\uc2b5\ub2c8\ub2e4.",
 "message.publicip.state.reserved": "IP \uc8fc\uc18c\uac00 \uc608\uc57d\ub418\uc5b4 \uc788\uc73c\uba70 \uc0ac\uc6a9\ud560 \uc900\ube44\uac00 \ub418\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4.",
-"message.quota.tariff.create.success": "\ud560\ub2f9 \uc694\uae08\uc81c \"{quotaTariff}\"\ub97c \uc131\uacf5\uc801\uc73c\ub85c \uc0dd\uc131\ud588\uc2b5\ub2c8\ub2e4",
-"message.quota.tariff.update.success": "\ud560\ub2f9 \uc694\uae08\uc81c \"{quotaTariff}\"\ub97c \uc131\uacf5\uc801\uc73c\ub85c \uc5c5\ub370\uc774\ud2b8\ud588\uc2b5\ub2c8\ub2e4",
+"message.quota.tariff.create.success": "\ud560\ub2f9 \uc694\uae08 \"{quotaTariff}\"\ub97c \uc131\uacf5\uc801\uc73c\ub85c \uc0dd\uc131\ud588\uc2b5\ub2c8\ub2e4",
+"message.quota.tariff.update.success": "\ud560\ub2f9 \uc694\uae08 \"{quotaTariff}\"\ub97c \uc131\uacf5\uc801\uc73c\ub85c \uc5c5\ub370\uc774\ud2b8\ud588\uc2b5\ub2c8\ub2e4",
 "message.question.are.you.sure.you.want.to.add": "\ucd94\uac00\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
 "message.read.accept.license.agreements": "\ub77c\uc774\uc13c\uc2a4 \uacc4\uc57d \uc870\uac74\uc744 \uc77d\uace0 \ub3d9\uc758\ud558\uc2ed\uc2dc\uc624.",
 "message.read.admin.guide.scaling.up": "\ud655\uc7a5\ud558\uae30 \uc804\uc5d0 \uad00\ub9ac\uc790 \uac00\uc774\ub4dc\uc758 \ub3d9\uc801 \ud655\uc7a5 \uc139\uc158\uc744 \uc77d\uc5b4\ubcf4\uc138\uc694.",
@@ -3849,14 +3849,14 @@
 "migrate.from": "Migrate From",
 "migrate.to": "Migrate To",
 "migrationPolicy": "\ub9c8\uc774\uadf8\ub808\uc774\uc158 \uc815\ucc45",
-"placeholder.quota.tariff.activationrule": "\ud560\ub2f9 \uc694\uae08\uc81c \ud65c\uc131\ud654 \uaddc\uce59",
-"placeholder.quota.tariff.description": "\ud560\ub2f9 \uc694\uae08\uc81c \uc124\uba85",
-"placeholder.quota.tariff.enddate": "\ud560\ub2f9 \uc694\uae08\uc81c \uc885\ub8cc\uc77c",
-"placeholder.quota.tariff.name": "\ud560\ub2f9 \uc694\uae08\uc81c \uc774\ub984",
-"placeholder.quota.tariff.position": "\uc2e4\ud589 \uc2dc\ud000\uc2a4\uc5d0\uc11c \ud560\ub2f9 \uc694\uae08\uc81c \uc704\uce58",
-"placeholder.quota.tariff.startdate": "\ud560\ub2f9 \uc694\uae08\uc81c \uc2dc\uc791\uc77c",
-"placeholder.quota.tariff.usagetype": "\ud560\ub2f9 \uc694\uae08\uc81c \uc0ac\uc6a9 \uc720\ud615",
-"placeholder.quota.tariff.value": "\ud560\ub2f9 \uc694\uae08\uc81c \uac12",
+"placeholder.quota.tariff.activationrule": "\ud560\ub2f9 \uc694\uae08 \ud65c\uc131\ud654 \uaddc\uce59",
+"placeholder.quota.tariff.description": "\ud560\ub2f9 \uc694\uae08 \uc124\uba85",
+"placeholder.quota.tariff.enddate": "\ud560\ub2f9 \uc694\uae08 \uc885\ub8cc\uc77c",
+"placeholder.quota.tariff.name": "\ud560\ub2f9 \uc694\uae08 \uc774\ub984",
+"placeholder.quota.tariff.position": "\uc2e4\ud589 \uc2dc\ud000\uc2a4\uc5d0\uc11c \ud560\ub2f9 \uc694\uae08 \uc704\uce58",
+"placeholder.quota.tariff.startdate": "\ud560\ub2f9 \uc694\uae08 \uc2dc\uc791\uc77c",
+"placeholder.quota.tariff.usagetype": "\ud560\ub2f9 \uc694\uae08 \uc0ac\uc6a9 \uc720\ud615",
+"placeholder.quota.tariff.value": "\ud560\ub2f9 \uc694\uae08 \uac00\uaca9",
 "router.health.checks": "Health Check",
 "side.by.side": "\ub098\ub780\ud788",
 "state.completed": "\uc644\ub8cc",

ui/src/components/view/SearchView.vue

@@ -71,8 +71,7 @@
                     <a-select-option
                       v-for="(opt, idx) in field.opts"
                       :key="idx"
-                      :value="['account'].includes(field.name) ? opt.name : opt.id"
-                      :label="$t((['storageid'].includes(field.name) || !opt.path) ? opt.name : opt.path)">
+                      :value="['account'].includes(field.name) ? opt.name : opt.id">
                       <div>
                         <span v-if="(field.name.startsWith('zone'))">
                           <span v-if="opt.icon">
@@ -969,7 +968,7 @@ export default {
     },
     fetchVolumes (searchKeyword) {
       return new Promise((resolve, reject) => {
-        api('listvolumes', { listAll: true, isencrypted: searchKeyword }).then(json => {
+        api('listVolumes', { listAll: true, isencrypted: searchKeyword }).then(json => {
           const volumes = json.listvolumesresponse.volume
           resolve({
             type: 'isencrypted',

ui/src/store/modules/user.js

@@ -323,7 +323,7 @@ const user = {
             const result = response.listusersresponse.user[0]
             commit('SET_INFO', result)
             commit('SET_NAME', result.firstname + ' ' + result.lastname)
-            store.dispatch('SetCsLatestVersion', result.rolename)
+            // store.dispatch('SetCsLatestVersion', result.rolename)
             resolve(cachedApis)
           }).catch(error => {
             reject(error)
@@ -396,7 +396,7 @@ const user = {
           const result = response.listusersresponse.user[0]
           commit('SET_INFO', result)
           commit('SET_NAME', result.firstname + ' ' + result.lastname)
-          store.dispatch('SetCsLatestVersion', result.rolename)
+          // store.dispatch('SetCsLatestVersion', result.rolename)
         }).catch(error => {
           reject(error)
         })
@@ -426,12 +426,12 @@ const user = {
           reject(error)
         })
 
-        api('listLdapConfigurations').then(response => {
-          const ldapEnable = (response.ldapconfigurationresponse.count > 0)
-          commit('SET_LDAP', ldapEnable)
-        }).catch(error => {
-          reject(error)
-        })
+        // api('listLdapConfigurations').then(response => {
+        //   const ldapEnable = (response.ldapconfigurationresponse.count > 0)
+        //   commit('SET_LDAP', ldapEnable)
+        // }).catch(error => {
+        //   reject(error)
+        // })
 
         api('cloudianIsEnabled').then(response => {
           const cloudian = response.cloudianisenabledresponse.cloudianisenabled || {}

ui/src/views/AutogenView.vue

@@ -1356,7 +1356,6 @@ export default {
         if (this.items.length > 0) {
           if (!this.showAction || this.dataView) {
             this.resource = this.items[0]
-            console.log('1111resource :>> ', this.resource)
             this.$emit('change-resource', this.resource)
           }
         } else {