feat: add expiration tag in cluster list (#167)

Signed-off-by: liuying <liu.ying@99cloud.net> Signed-off-by: liuying <liu.ying@99cloud.net>
kubeclipper · Sep 22, 2022 · 75fafb2 · 75fafb2
1 parent d7648f6
commit 75fafb2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/src/components/Tables/Base/index.jsx b/src/components/Tables/Base/index.jsx
@@ -431,6 +431,7 @@ const BaseTable = (props) => {
             isStatus = false,
             extraNameIndex,
             extraNameCopyable,
+            extraRender,
             ...rest
           } = column;
 
@@ -474,9 +475,12 @@ const BaseTable = (props) => {
               if (value && value !== '-') {
                 return (
                   <>
-                    <Paragraph {...nameProps}>
-                      {render ? render(value, record) : value}
-                    </Paragraph>
+                    <div style={{ display: 'flex' }}>
+                      <Paragraph {...nameProps}>
+                        {render ? render(value, record) : value}
+                      </Paragraph>
+                      {extraRender?.(value, record)}
+                    </div>
                     {extraNameIndex ? (
                       <Paragraph {...extraProps}>{extraVal}</Paragraph>
                     ) : (

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -547,6 +547,7 @@
   "Download": "Download",
   "Update Cluster License": "Update Cluster License",
   "License Expiration Time": "License Expiration Time",
+  "License Expiration": "License Expiration",
   "Please keep the CPU architecture consistent!": "Please keep the CPU architecture consistent!",
   "The selected node and schema are inconsistent": "The selected node and schema are inconsistent",
   "The backup path needs to be created on each node and mounted to a shared file path (such as NFS)": "The backup path needs to be created on each node and mounted to a shared file path (such as NFS)",

diff --git a/src/locales/zh.json b/src/locales/zh.json
@@ -548,6 +548,7 @@
   "Update Cluster License": "更新集群证书",
   "View KubeConfig File": "查看 Kubeconfig 文件",
   "License Expiration Time": "证书过期时间",
+  "License Expiration": "证书过期",
   "Please keep the CPU architecture consistent!": "请保持 CPU 架构的一致性！",
   "The selected node and schema are inconsistent": "选择的节点和架构不一致",
   "The backup path needs to be created on each node and mounted to a shared file path (such as NFS)": "备份路径需要在每个节点上自行创建，并将路径该挂载到共享的文件路径(如 NFS)",

diff --git a/src/resources/cluster.jsx b/src/resources/cluster.jsx
@@ -17,6 +17,9 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { getRoles, nodeEnum } from 'resources/node';
 import RenderOption from 'components/RenderOption';
+import { Tag } from 'antd';
+import { checkExpired } from 'utils';
+import moment from 'moment';
 
 export const clusterParams = {
   offline: true,
@@ -267,6 +270,25 @@ export const columns = [
     isHideable: true,
     copyable: true,
     render: (name) => <Link to={`/cluster/${name}`}>{name}</Link>,
+    extraRender: (name, data) => {
+      let isExpired = null;
+      if (data.licenseExpirationTime) {
+        const date = moment(data.licenseExpirationTime)
+          .subtract(1, 'day')
+          .format('YYYY-MM-DD HH:mm:ss');
+        isExpired = !checkExpired(date);
+      }
+
+      return (
+        <>
+          {isExpired ? (
+            <Tag style={{ marginLeft: '12px' }} color={'red'} key={name}>
+              {t('License Expiration')}
+            </Tag>
+          ) : null}
+        </>
+      );
+    },
   },
   {
     title: t('Region'),