Merge branch 'fix_obee_audit' into 'develop'

yuning · yuning · commit caa25993f54d · 2023-02-23T09:24:48.000Z
fix: add enableAuditLog

See merge request taco/openblocks-oss!13
diff --git a/client/packages/openblocks/src/constants/configConstants.ts b/client/packages/openblocks/src/constants/configConstants.ts
@@ -1,6 +1,7 @@
 interface FeatureFlag {
   enableCustomBranding: boolean;
   enableEnterpriseLogin: boolean;
+  enableAuditLog: boolean;
 }
 
 export interface BrandingConfig {
diff --git a/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx b/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx
@@ -274,14 +274,18 @@ export const DatasourceEditPage = () => {
                 {trans("query.whitelistTooltip")}
               </div>
 
-              <span>{trans("query.address")}</span>
-              {REACT_APP_SERVER_IPS.split(",")
-                .filter((s) => s)
-                .map((ip, i) => (
-                  <IPWrapper key={i}>
-                    {ip} <CopyTextButton text={ip} />
-                  </IPWrapper>
-                ))}
+              {REACT_APP_SERVER_IPS && (
+                <>
+                  <span>{trans("query.address")}</span>
+                  {REACT_APP_SERVER_IPS.split(",")
+                    .filter((s) => s)
+                    .map((ip, i) => (
+                      <IPWrapper key={i}>
+                        {ip} <CopyTextButton text={ip} />
+                      </IPWrapper>
+                    ))}
+                </>
+              )}
             </Whitelist>
           )}
         </Body>
diff --git a/client/packages/openblocks/src/pages/setting/settingHome.tsx b/client/packages/openblocks/src/pages/setting/settingHome.tsx
@@ -5,7 +5,7 @@ import { AdvancedSetting } from "./advanced/AdvancedSetting";
 import { currentOrgAdmin } from "util/permissionUtils";
 import { trans } from "i18n";
 import AuditSetting from "@openblocks-ee/pages/setting/audit";
-import { developEnv, isEE, isEnterpriseMode, isSelfDomain } from "util/envUtils";
+import { developEnv, isEE, isEnterpriseMode, isSelfDomain, showAuditLog } from "util/envUtils";
 import { TwoColumnSettingPageContent } from "./styled";
 import SubSideBar from "components/layout/SubSideBar";
 import { Menu } from "openblocks-design";
@@ -42,7 +42,7 @@ export function SettingHome() {
       key: SettingPageEnum.Organization,
       label: trans("settings.organization"),
     },
-    ...(isEE() && currentOrgAdmin(user)
+    ...(showAuditLog(config) && currentOrgAdmin(user)
       ? [
           {
             key: SettingPageEnum.Audit,
diff --git a/client/packages/openblocks/src/util/envUtils.ts b/client/packages/openblocks/src/util/envUtils.ts
@@ -29,6 +29,10 @@ export function isSelfDomain(config?: SystemConfig) {
   return config?.selfDomain;
 }
 
+export function showAuditLog(config?: SystemConfig) {
+  return config?.featureFlag.enableAuditLog;
+}
+
 export function useCloudHosting() {
   const systemConfig = useSelector(selectSystemConfig);
   return systemConfig?.cloudHosting ?? true;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`interface FeatureFlag {`
`2`	`2`	`enableCustomBranding: boolean;`
`3`	`3`	`enableEnterpriseLogin: boolean;`
	`4`	`+ enableAuditLog: boolean;`
`4`	`5`	`}`
`5`	`6`
`6`	`7`	`export interface BrandingConfig {`