Merge pull request #6 from actiontech/feature/cb-edition

[feature]: hide watermark when sqle edition is ce

Author: LordofAvernus

webapp/packages/core-app/src/Body.tsx

@@ -5,8 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { decompressFromBase64 } from 'lz-string';
 import { observer } from 'mobx-react-lite';
-import { useLayoutEffect, useRef } from 'react';
+import { useLayoutEffect, useRef, useState } from 'react';
 import styled, { css } from 'reshadow';
 
 import { AuthInfoService } from '@cloudbeaver/core-authentication';
@@ -18,6 +19,7 @@ import { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { SessionPermissionsResource } from '@cloudbeaver/core-root';
 import { ScreenService } from '@cloudbeaver/core-routing';
 import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
+import { LocalStorageSaveService } from '@cloudbeaver/core-settings';
 import { ThemeService } from '@cloudbeaver/core-theming';
 import { DNDProvider } from '@cloudbeaver/core-ui';
 import { useAppVersion } from '@cloudbeaver/plugin-version';
@@ -37,6 +39,7 @@ const bodyStyles = css`
 `;
 
 export const Body = observer(function Body() {
+  const [edition, setEdition] = useState();
   // const serverConfigLoader = useResource(Body, ServerConfigResource, undefined);
   const themeService = useService(ThemeService);
   const style = useStyles(bodyStyles);
@@ -59,6 +62,20 @@ export const Body = observer(function Body() {
     document.documentElement.dataset.backendVersion = backendVersion;
   });
 
+  useLayoutEffect(() => {
+    const channel = localStorage.getItem('DMS_CB_CHANNEL');
+    if (channel) {
+      try {
+        const json = JSON.parse(decompressFromBase64(channel));
+        if (json.type === 'sqle_edition') {
+          setEdition(json.data);
+        }
+      } catch (error) {
+        console.error(error);
+      }
+    }
+  }, []);
+
   return styled(style)(
     <DNDProvider>
       <Loader suspense>
@@ -67,7 +84,9 @@ export const Body = observer(function Body() {
           <DialogsPortal />
           <Notifications />
         </theme>
-        {userInfo && <Watermark theme={userInfo.configurationParameters?.['app.theme']} text={userInfo.displayName || userInfo.userId} />}
+        {userInfo && edition === 'ee' && (
+          <Watermark theme={userInfo.configurationParameters?.['app.theme']} text={userInfo.displayName || userInfo.userId} />
+        )}
       </Loader>
     </DNDProvider>,
   );

webapp/packages/core-localization/src/locales/en.ts

@@ -14,6 +14,7 @@ export default [
   ['ui_processing_reload', 'Reload'],
   ['ui_processing_retry', 'Retry'],
   ['ui_create_workflow', 'Create Workflow'],
+  ['ui_create_workflow_tips', '当前SQL未通过审核，如需要执行该SQL，请结合审核建议修改语句，或点击创建工单按钮，进行安全发布。'],
   ['ui_processing_ok', 'Ok'],
   ['ui_processing_create', 'Create'],
   ['ui_processing_save', 'Save'],

webapp/packages/core-localization/src/locales/zh.ts

@@ -13,6 +13,7 @@ export default [
   ['ui_processing_canceling', '取消中...'],
   ['ui_processing_retry', '重试'],
   ['ui_create_workflow', '发起变更工单'],
+  ['ui_create_workflow_tips', '当前SQL未通过审核，如需要执行该SQL，请结合审核建议修改语句，或点击创建工单按钮，进行安全发布。'],
   ['ui_processing_ok', '好'],
   ['ui_processing_create', '创建'],
   ['ui_processing_save', '保存'],

webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx

@@ -81,6 +81,9 @@ const style = css`
       flex-shrink: 0;
     }
   }
+  create-workflow-tips {
+    margin-top: 24px;
+  }
 `;
 
 interface Props {
@@ -189,6 +192,8 @@ export const TableError = observer<Props>(function TableError({ model, loading,
           {translate('ui_create_workflow')}
         </Button>
       </controls>
+
+      <create-workflow-tips>{translate('ui_create_workflow_tips')}</create-workflow-tips>
     </error>,
   );
 });