[feature](CompanyNotice): Add time-based notice display and include_latest_outside_period param

packages/base/src/locale/en-US/dmsSystem.ts

@@ -240,6 +240,15 @@ export default {
     hasDirtyDataTips:
       'The current content has changed. are you sure you want to cancel the modification?',
     successMessage: 'Successfully published system announcement!',
-    notData: 'No announcement information'
+    notData: 'No announcement information',
+    validPeriod: 'Valid period',
+    startTimePlaceholder: 'Select start time',
+    endTimePlaceholder: 'Select end time',
+    timeRangeRequired:
+      'Please select the effective time range for the announcement',
+    timeRangeValidate: 'Start time must be earlier than end time',
+    noticeContent: 'Announcement content',
+    effectivePeriod: 'Effective period',
+    viewFullContent: 'View full content'
   }
 };

packages/base/src/locale/zh-CN/dmsSystem.ts

@@ -291,6 +291,14 @@ export default {
     title: '系统公告',
     hasDirtyDataTips: '当前内容已经发生更改，是否确认取消修改？',
     successMessage: '成功发布系统公告!',
-    notData: '暂无公告信息'
+    notData: '暂无公告信息',
+    validPeriod: '有效时间范围',
+    startTimePlaceholder: '请选择开始时间',
+    endTimePlaceholder: '请选择结束时间',
+    timeRangeRequired: '请选择公告生效时间范围',
+    timeRangeValidate: '开始时间必须早于结束时间',
+    noticeContent: '公告内容',
+    effectivePeriod: '有效期',
+    viewFullContent: '查看全部'
   }
 };

packages/base/src/page/BindUser/index.test.tsx

@@ -6,11 +6,6 @@ import dms from '@actiontech/shared/lib/testUtil/mockApi/base/global';
 import { getBySelector } from '@actiontech/shared/lib/testUtil/customQuery';
 import { eventEmitter } from '@actiontech/dms-kit/es/utils/EventEmitter';
 import EmitterKey from '@actiontech/dms-kit/es/data/EmitterKey';
-import { LocalStorageWrapper } from '@actiontech/dms-kit';
-import {
-  CompanyNoticeDisplayStatusEnum,
-  StorageKey
-} from '@actiontech/dms-kit';
 import { ROUTE_PATHS } from '@actiontech/dms-kit';
 
 import BindUser from '.';
@@ -133,7 +128,6 @@ describe('page/BindUser-ee', () => {
     });
 
     it('render oauth2_token params submit without target param', async () => {
-      const LocalStorageWrapperSet = jest.spyOn(LocalStorageWrapper, 'set');
       const search = `oauth2_token=oauth2_token_val&refresh_token=id_token_val`;
       const requestFn = dms.bindUser();
       const { baseElement } = customRender(`/user/bind?${search}`);
@@ -184,15 +178,9 @@ describe('page/BindUser-ee', () => {
       expect(getSessionUserInfoAsyncSpy).toHaveBeenCalledTimes(1);
       expect(navigateSpy).toHaveBeenCalled();
       expect(navigateSpy).toHaveBeenCalledWith('/');
-      expect(LocalStorageWrapperSet).toHaveBeenCalled();
-      expect(LocalStorageWrapperSet).toHaveBeenCalledWith(
-        StorageKey.SHOW_COMPANY_NOTICE,
-        CompanyNoticeDisplayStatusEnum.NotDisplayed
-      );
     });
 
     it('render oauth2_token params submit with target param', async () => {
-      const LocalStorageWrapperSet = jest.spyOn(LocalStorageWrapper, 'set');
       const search = `oauth2_token=oauth2_token_val&refresh_token=id_token_val&target=${encodeURIComponent(
         '/project/test'
       )}`;
@@ -238,11 +226,9 @@ describe('page/BindUser-ee', () => {
       expect(getSessionUserInfoAsyncSpy).toHaveBeenCalledTimes(1);
       expect(navigateSpy).toHaveBeenCalled();
       expect(navigateSpy).toHaveBeenCalledWith('/project/test');
-      expect(LocalStorageWrapperSet).toHaveBeenCalled();
     });
 
     it('render oauth2_token params submit with target param containing query params', async () => {
-      const LocalStorageWrapperSet = jest.spyOn(LocalStorageWrapper, 'set');
       const search = `oauth2_token=oauth2_token_val&refresh_token=id_token_val&target=${encodeURIComponent(
         '/project/test?active=overview'
       )}`;
@@ -288,11 +274,9 @@ describe('page/BindUser-ee', () => {
       expect(getSessionUserInfoAsyncSpy).toHaveBeenCalledTimes(1);
       expect(navigateSpy).toHaveBeenCalled();
       expect(navigateSpy).toHaveBeenCalledWith('/project/test?active=overview');
-      expect(LocalStorageWrapperSet).toHaveBeenCalled();
     });
 
     it('render oauth2_token params submit with cloud-beaver target param', async () => {
-      const LocalStorageWrapperSet = jest.spyOn(LocalStorageWrapper, 'set');
       const search = `oauth2_token=oauth2_token_val&refresh_token=id_token_val&target=${encodeURIComponent(
         '/cloud-beaver'
       )}`;
@@ -340,7 +324,6 @@ describe('page/BindUser-ee', () => {
       expect(navigateSpy).toHaveBeenCalledWith(
         '/cloud-beaver?open_cloud_beaver=true'
       );
-      expect(LocalStorageWrapperSet).toHaveBeenCalled();
     });
   });
 

packages/base/src/page/BindUser/index.tsx

@@ -25,11 +25,6 @@ import {
   OPEN_CLOUD_BEAVER_URL_PARAM_NAME,
   ROUTE_PATHS
 } from '@actiontech/dms-kit';
-import { LocalStorageWrapper } from '@actiontech/dms-kit';
-import {
-  StorageKey,
-  CompanyNoticeDisplayStatusEnum
-} from '@actiontech/dms-kit';
 import useSessionUser from '../../hooks/useSessionUser';
 import useNavigateToWorkbench from '../../hooks/useNavigateToWorkbench';
 const BindUser = () => {
@@ -135,12 +130,6 @@ const BindUser = () => {
             })
           );
           navigateToTarget();
-          // #if [ee]
-          LocalStorageWrapper.set(
-            StorageKey.SHOW_COMPANY_NOTICE,
-            CompanyNoticeDisplayStatusEnum.NotDisplayed
-          );
-          // #endif
         }
       })
       .finally(() => {

packages/base/src/page/Login/index.test.tsx

@@ -11,14 +11,9 @@ import {
 } from '@actiontech/shared/lib/testUtil/mockApi/base/global/data';
 import { getBySelector } from '@actiontech/shared/lib/testUtil/customQuery';
 import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
-import { LocalStorageWrapper } from '@actiontech/dms-kit';
 import { eventEmitter } from '@actiontech/dms-kit/es/utils/EventEmitter';
 import Login from '.';
-import {
-  CompanyNoticeDisplayStatusEnum,
-  StorageKey,
-  SystemRole
-} from '@actiontech/dms-kit';
+import { SystemRole } from '@actiontech/dms-kit';
 import {
   OPEN_CLOUD_BEAVER_URL_PARAM_NAME,
   ROUTE_PATHS
@@ -297,7 +292,6 @@ describe('page/Login-ee', () => {
 
     it('render with other search val', async () => {
       const requestLogin = dms.addSession();
-      const LocalStorageWrapperSet = jest.spyOn(LocalStorageWrapper, 'set');
       useSearchParamsSpy.mockReturnValue([
         new URLSearchParams({
           target: encodeURIComponent('/index1')
@@ -356,16 +350,10 @@ describe('page/Login-ee', () => {
       expect(getSessionUserInfoAsyncSpy).toHaveBeenCalledTimes(1);
       expect(navigateSpy).toHaveBeenCalled();
       expect(navigateSpy).toHaveBeenCalledWith('/index1');
-      expect(LocalStorageWrapperSet).toHaveBeenCalled();
-      expect(LocalStorageWrapperSet).toHaveBeenCalledWith(
-        StorageKey.SHOW_COMPANY_NOTICE,
-        CompanyNoticeDisplayStatusEnum.NotDisplayed
-      );
     });
 
     it('render with cloud-beaver path', async () => {
       const requestLogin = dms.addSession();
-      const LocalStorageWrapperSet = jest.spyOn(LocalStorageWrapper, 'set');
       useSearchParamsSpy.mockReturnValue([
         new URLSearchParams({
           target: encodeURIComponent('/project/700300/cloud-beaver')
@@ -426,16 +414,10 @@ describe('page/Login-ee', () => {
       expect(navigateSpy).toHaveBeenCalledWith(
         `/project/700300/cloud-beaver?${OPEN_CLOUD_BEAVER_URL_PARAM_NAME}=true`
       );
-      expect(LocalStorageWrapperSet).toHaveBeenCalled();
-      expect(LocalStorageWrapperSet).toHaveBeenCalledWith(
-        StorageKey.SHOW_COMPANY_NOTICE,
-        CompanyNoticeDisplayStatusEnum.NotDisplayed
-      );
     });
 
     it('render search value with search params', async () => {
       const requestLogin = dms.addSession();
-      const LocalStorageWrapperSet = jest.spyOn(LocalStorageWrapper, 'set');
       useSearchParamsSpy.mockReturnValue([
         new URLSearchParams({
           target: encodeURIComponent('/transit?from=cloudbeaver')
@@ -494,11 +476,6 @@ describe('page/Login-ee', () => {
       expect(getSessionUserInfoAsyncSpy).toHaveBeenCalledTimes(1);
       expect(navigateSpy).toHaveBeenCalled();
       expect(navigateSpy).toHaveBeenCalledWith('/transit?from=cloudbeaver');
-      expect(LocalStorageWrapperSet).toHaveBeenCalled();
-      expect(LocalStorageWrapperSet).toHaveBeenCalledWith(
-        StorageKey.SHOW_COMPANY_NOTICE,
-        CompanyNoticeDisplayStatusEnum.NotDisplayed
-      );
     });
   });
 

packages/base/src/page/Login/index.tsx

@@ -8,12 +8,7 @@ import { useTypedNavigate, useTypedQuery } from '@actiontech/shared';
 import { LoginFormFieldValue, VerificationCodeFormFieldValue } from './types';
 import { useBoolean, useRequest } from 'ahooks';
 import useBrowserVersionTips from '../../hooks/useBrowserVersionTips';
-import { LocalStorageWrapper } from '@actiontech/dms-kit';
-import {
-  StorageKey,
-  CompanyNoticeDisplayStatusEnum,
-  ResponseCode
-} from '@actiontech/dms-kit';
+import { ResponseCode } from '@actiontech/dms-kit';
 import {
   OPEN_CLOUD_BEAVER_URL_PARAM_NAME,
   ROUTE_PATHS
@@ -134,12 +129,6 @@ const Login = () => {
             }
           });
         }
-        // #if [ee]
-        LocalStorageWrapper.set(
-          StorageKey.SHOW_COMPANY_NOTICE,
-          CompanyNoticeDisplayStatusEnum.NotDisplayed
-        );
-        // #endif
       })
       .finally(() => {
         setFalse();