호스트 상세 라이센스 정보 표시 수정

Author: jschoiRR

ui/public/locales/ko_KR.json

@@ -4751,7 +4751,7 @@
 "message.dr.mirrored.cluster.disable": "\uc120\ud0dd\ud55c \uc7ac\ud574\ubcf5\uad6c \ud074\ub7ec\uc2a4\ud130\ub97c \ube44\ud65c\uc131\ud654\ud558\ub294 \uacbd\uc6b0 Secondary \ud074\ub7ec\uc2a4\ud130\uc758 \ubbf8\ub7ec\ub9c1 \uac00\uc0c1\uba38\uc2e0\uc774 \uc804\ubd80 \uc0ad\uc81c\ub429\ub2c8\ub2e4. \ube44\ud65c\uc131\ud654\ub97c \uc6d0\ud558\uc2dc\uba74 '\ube44\ud65c\uc131\ud654\ud558\uaca0\uc2b5\ub2c8\ub2e4' \ubb38\uad6c\ub97c \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
 "message.success.disable.disaster.recovery.cluster": "\uc7ac\ud574\ubcf5\uad6c \ud074\ub7ec\uc2a4\ud130\ub97c \uc131\uacf5\uc801\uc73c\ub85c \ube44\ud65c\uc131\ud654\ud588\uc2b5\ub2c8\ub2e4.",
 "message.error.confirm.create.dr.mirroring.vm": "\uc555\ucd95/\uc911\ubcf5\uc81c\uac70 \uae30\ub2a5\uc774 \ud65c\uc131\ud654\ub418\uc5b4\uc788\ub294 \uacbd\uc6b0 \ubbf8\ub7ec\ub9c1 \uac00\uc0c1\uba38\uc2e0\uc744 \uc0dd\uc131\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
-"message.alert.licenseexpired": "\ub77c\uc774\uc13c\uc2a4 \uc720\ud6a8 \uc77c\uc790",
+"message.alert.licenseexpired": "\ub77c\uc774\uc13c\uc2a4 \uc720\ud6a8\uae30\uac04",
 "message.license.renewal.required": "\ub77c\uc774\uc13c\uc2a4 \uc720\ud6a8\uae30\uac04\uc774 \uc9c0\ub0ac\uc2b5\ub2c8\ub2e4. \uc2e0\uaddc \ub77c\uc774\uc120\uc2a4\ub97c \ub4f1\ub85d \ud6c4 \uc0ac\uc6a9\ud574 \uc8fc\uc138\uc694.",
 "message.license.not.found": "\ub77c\uc774\uc120\uc2a4 \uc815\ubcf4\ub97c \ud655\uc778\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc2e0\uaddc \ub77c\uc774\uc120\uc2a4 \ub4f1\ub85d \ud6c4 \uc0ac\uc6a9\ud574 \uc8fc\uc138\uc694.",
 "message.license.days.left": "\uc77c \ud6c4 \ub9cc\ub8cc"

ui/src/components/view/DetailsTab.vue

@@ -24,10 +24,10 @@
     </template>
   </a-alert>
   <div v-if="['host'].includes($route.meta.name)">
-    <a-alert type="error" :showIcon="true" v-if="!dataResource.licenseExpiryDate" :message="$t('message.license.not.found')" />
-    <a-alert type="error" :showIcon="true" v-else-if="isLicenseNotStarted(dataResource.licenseStartDate)" :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseStartDate + ' ~ ' + dataResource.licenseExpiryDate+ '(' + calculateDday(dataResource.licenseExpiryDate) + $t('message.license.days.left') + ')'" />
-    <a-alert type="error" :showIcon="true" v-else-if="isLicenseExpired(dataResource.licenseExpiryDate)" :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseStartDate + ' ~ ' + dataResource.licenseExpiryDate + '(' + $t('message.license.renewal.required') + ')'" />
-    <a-alert type="success" :showIcon="true" v-else :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseStartDate + ' ~ ' + dataResource.licenseExpiryDate + '(' + calculateDday(dataResource.licenseExpiryDate) + $t('message.license.days.left') + ')'" />
+    <a-alert type="success" :showIcon="true" v-if="licenseCode == 'OK'" :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseStartDate + '~' + dataResource.licenseExpiryDate + '(' + calculateDday(dataResource.licenseExpiryDate) + $t('message.license.days.left') + ')'" />
+    <a-alert type="error" :showIcon="true" v-else-if="licenseCode == 'PASSED'" :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseStartDate + '~' + dataResource.licenseExpiryDate + '(' + $t('message.license.renewal.required') + ')'" />
+    <a-alert type="error" :showIcon="true" v-else-if="licenseCode == 'NOSTART'" :message="$t('message.alert.licenseexpired') + ' : ' + dataResource.licenseStartDate + '~' + dataResource.licenseExpiryDate + '(' + calculateDday(dataResource.licenseExpiryDate) + $t('message.license.days.left') + ')'" />
+    <a-alert type="error" :showIcon="true" v-else-if="licenseCode == 'NONE'" :message="$t('message.license.not.found')" />
   </div>
   <a-alert v-if="ip4routes" type="info" :showIcon="true" :message="$t('label.add.upstream.ipv4.routes')">
     <template #description>
@@ -242,7 +242,7 @@ export default {
         expired: false,
         expiryDate: ''
       },
-      licenseStateType: 'error'
+      licenseCode: 'NONE'
     }
   },
   mounted () {
@@ -473,6 +473,7 @@ export default {
       return `label.${source}`
     },
     fetchLicenseInfo () {
+      const today = new Date()
       api('licenseCheck', { hostid: this.resource.id }).then(response => {
         const licenseData = response?.null?.licensecheck
         if (licenseData) {
@@ -483,25 +484,25 @@ export default {
           this.dataResource.hostId = licenseData.hostid
           this.dataResource.hasLicense = licenseData.haslicense === 'true'
           this.dataResource.licenseValid = licenseData.success === 'true'
-          if (this.isLicenseExpired(this.dataResource.licenseExpiryDate)) {
-            this.licenseStateType = 'error'
+
+          if (today <= expiryDate && today >= issuedDate) {
+            this.licenseCode = 'OK'
+          } else if (today > expiryDate) {
+            this.licenseCode = 'PASSED'
+          } else if (today < issuedDate) {
+            this.licenseCode = 'NOSTART'
           } else {
-            this.licenseStateType = 'success'
+            this.licenseCode = 'NONE'
           }
         } else {
           this.dataResource.licenseStartDate = ''
           this.dataResource.licenseExpiryDate = ''
           this.dataResource.hasLicense = false
           this.dataResource.licenseValid = false
-          this.licenseStateType = 'error'
+          this.licenseCode = 'NONE'
         }
       })
     },
-    isLicenseExpired (expiryDate) {
-      const today = new Date()
-      const expiry = new Date(expiryDate)
-      return today > expiry
-    },
     calculateDday (expiryDate) {
       const today = new Date()
       const expiry = new Date(expiryDate)
@@ -514,11 +515,6 @@ export default {
         return value
       }
       return `0${value}`
-    },
-    isLicenseNotStarted (startDate) {
-      const today = new Date()
-      const start = new Date(startDate)
-      return today < start
     }
   }
 }