From d004e3b3c1212fbf287410e63a49acedb66196ef Mon Sep 17 00:00:00 2001
From: Enya <enya@Enyas-MacBook-Pro.local>
Date: Fri, 29 Jul 2022 12:21:08 +0800
Subject: [PATCH 1/4] add management menu bar

---
 ui/.env                                 |  1 +
 ui/src/components/sidemenu/siteMenu.tsx | 15 +++++++++++++++
 ui/src/react-app-env.d.ts               |  1 +
 3 files changed, 17 insertions(+)

diff --git a/ui/.env b/ui/.env
index 33b8c8ce4..0105a1136 100644
--- a/ui/.env
+++ b/ui/.env
@@ -1,3 +1,4 @@
 REACT_APP_AZURE_CLIENT_ID=db8dc4b0-202e-450c-b38d-7396ad9631a5
 REACT_APP_AZURE_TENANT_ID=common
 REACT_APP_API_ENDPOINT=https://feathr-sql-registry.azurewebsites.net
+REACT_APP_ENABLE_RBAC=false
diff --git a/ui/src/components/sidemenu/siteMenu.tsx b/ui/src/components/sidemenu/siteMenu.tsx
index defa334cb..fb258403a 100644
--- a/ui/src/components/sidemenu/siteMenu.tsx
+++ b/ui/src/components/sidemenu/siteMenu.tsx
@@ -4,6 +4,7 @@ import {
   DatabaseOutlined,
   EyeOutlined,
   RocketOutlined,
+  ControlOutlined,
 } from "@ant-design/icons";
 import { Link } from "react-router-dom";
 
@@ -11,6 +12,8 @@ const { Title } = Typography;
 const { Sider } = Layout;
 
 const SideMenu = () => {
+  const showManagement = process.env.REACT_APP_ENABLE_RBAC;
+
   return (
     <Sider theme="dark">
       <title>Codestin Search App</title>
+        <title>Codestin Search App</title>
         <UserRoles />
       </Card>
     </div>
diff --git a/ui/src/react-app-env.d.ts b/ui/src/react-app-env.d.ts
index 6cb4d470c..d1bd559de 100644
--- a/ui/src/react-app-env.d.ts
+++ b/ui/src/react-app-env.d.ts
@@ -19,6 +19,7 @@ declare global {
   interface EnvironmentConfig {
     azureClientId: string;
     azureTenantId: string;
+    enableRbac: boolean;
   }
 }
 

From 34bca18e690be7d515a60d9d95ce00c09e5deb07 Mon Sep 17 00:00:00 2001
From: Enya-Yx <enya@Enyas-MacBook-Pro.local>
Date: Wed, 3 Aug 2022 13:21:48 +0800
Subject: [PATCH 3/4] fix errors and update docs

---
 deploy/start.sh                               |  2 +-
 ...d-and-push-feathr-registry-docker-image.md |  2 +-
 ui/.env                                       |  2 +-
 ui/src/components/projectFeatureList.tsx      | 33 +++++++++++++++++++
 ui/src/components/sidemenu/siteMenu.tsx       |  9 ++---
 ui/src/react-app-env.d.ts                     |  2 +-
 6 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 ui/src/components/projectFeatureList.tsx

diff --git a/deploy/start.sh b/deploy/start.sh
index f59b5bc7a..e8bd1eea5 100755
--- a/deploy/start.sh
+++ b/deploy/start.sh
@@ -33,7 +33,7 @@ nginx
 # Start API app
 LISTENING_PORT="8000"
 
-if [ "x$ENABLE_RBAC" == "x" ]; then
+if [ "x$REACT_APP_ENABLE_RBAC" == "x" ]; then
     echo "RBAC flag not configured, only launch registry app"
     if [ "x$PURVIEW_NAME" == "x" ]; then
         echo "Purview flag is not configured, run SQL registry"
diff --git a/docs/dev_guide/build-and-push-feathr-registry-docker-image.md b/docs/dev_guide/build-and-push-feathr-registry-docker-image.md
index 78248fa66..76654a4ba 100644
--- a/docs/dev_guide/build-and-push-feathr-registry-docker-image.md
+++ b/docs/dev_guide/build-and-push-feathr-registry-docker-image.md
@@ -42,7 +42,7 @@ docker run --env PURVIEW_NAME=<REPLACE_ME> --env AZURE_CLIENT_ID=<REPLACE_ME> --
 
 ### Test SQL registry + RBAC
 ```bash
-docker run --env ENABLE_RBAC=true --env REACT_APP_AZURE_CLIENT_ID=<REPLACE_ME> --env REACT_APP_AZURE_TENANT_ID=<REPLACE_ME> --env CONNECTION_STR=<REPLACE_ME> --env API_BASE=api/v1 -it --rm -p 3000:80 feathrfeaturestore/feathr-registry
+docker run --env REACT_APP_ENABLE_RBAC=true --env REACT_APP_AZURE_CLIENT_ID=<REPLACE_ME> --env REACT_APP_AZURE_TENANT_ID=<REPLACE_ME> --env CONNECTION_STR=<REPLACE_ME> --env API_BASE=api/v1 -it --rm -p 3000:80 feathrfeaturestore/feathr-registry
 ```
 
 After docker image launched, open web browser and navigate to <https://localhost:3000>，verify both UI and backend api can work correctly.
diff --git a/ui/.env b/ui/.env
index 42f7420fa..0105a1136 100644
--- a/ui/.env
+++ b/ui/.env
@@ -1,4 +1,4 @@
 REACT_APP_AZURE_CLIENT_ID=db8dc4b0-202e-450c-b38d-7396ad9631a5
 REACT_APP_AZURE_TENANT_ID=common
-REACT_APP_API_ENDPOINT=https://feathr-rbac-registry.azurewebsites.net
+REACT_APP_API_ENDPOINT=https://feathr-sql-registry.azurewebsites.net
 REACT_APP_ENABLE_RBAC=false
diff --git a/ui/src/components/projectFeatureList.tsx b/ui/src/components/projectFeatureList.tsx
new file mode 100644
index 000000000..b2cee9853
--- /dev/null
+++ b/ui/src/components/projectFeatureList.tsx
@@ -0,0 +1,33 @@
+import React, { useCallback, useEffect, useState } from "react";
+import { Form, Select, Table } from "antd";
+
+const ProjectFeatureList: React.FC = () => {
+  const [project, setProject] = useState("");
+  const [feature, setFeature] = useState("");
+  const [features, setFeatures] = useState([]);
+  return (
+    <div>
+      <Form.Item
+        label="Select Feature: "
+        style={{ minWidth: "35%", float: "left", paddingLeft: "10px" }}
+        rules={[
+          {
+            required: true,
+            message: "Please select a feature to check.",
+          },
+        ]}
+      >
+        <Select
+          options={features}
+          defaultValue={feature}
+          value={feature}
+          optionFilterProp="label"
+          notFoundContent={<div>No projects found from server</div>}
+          //onChange={onFeatureChange}
+        ></Select>
+      </Form.Item>
+    </div>
+  );
+};
+
+export default ProjectFeatureList;
diff --git a/ui/src/components/sidemenu/siteMenu.tsx b/ui/src/components/sidemenu/siteMenu.tsx
index 37c9af920..a28159968 100644
--- a/ui/src/components/sidemenu/siteMenu.tsx
+++ b/ui/src/components/sidemenu/siteMenu.tsx
@@ -12,9 +12,10 @@ const { Title } = Typography;
 const { Sider } = Layout;
 
 const SideMenu = () => {
-  const showManagement =
-    window.environment?.enableRbac ??
-    process.env.REACT_APP_ENABLE_RBAC === "true";
+  const enableRBAC = window.environment?.enableRBAC;
+  const showManagement = enableRBAC
+    ? enableRBAC
+    : process.env.REACT_APP_ENABLE_RBAC;
 
   return (
     <Sider theme="dark">
@@ -63,7 +64,7 @@ const SideMenu = () => {
         >
           <Link to="/monitoring">Monitoring</Link>
         </Menu.Item>
-        {showManagement && (
+        {showManagement === "true" && (
           <Menu.Item
             key="/management"
             icon={
diff --git a/ui/src/react-app-env.d.ts b/ui/src/react-app-env.d.ts
index d1bd559de..3ec3e5bdf 100644
--- a/ui/src/react-app-env.d.ts
+++ b/ui/src/react-app-env.d.ts
@@ -19,7 +19,7 @@ declare global {
   interface EnvironmentConfig {
     azureClientId: string;
     azureTenantId: string;
-    enableRbac: boolean;
+    enableRBAC: boolean;
   }
 }
 

From 83dbb65b357d63114ea74a1901c251fc1ec3a4bc Mon Sep 17 00:00:00 2001
From: Enya-Yx <enya@Enyas-MacBook-Pro.local>
Date: Wed, 3 Aug 2022 13:25:17 +0800
Subject: [PATCH 4/4] remove extra files

---
 ui/src/components/projectFeatureList.tsx | 33 ------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 ui/src/components/projectFeatureList.tsx

diff --git a/ui/src/components/projectFeatureList.tsx b/ui/src/components/projectFeatureList.tsx
deleted file mode 100644
index b2cee9853..000000000
--- a/ui/src/components/projectFeatureList.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, { useCallback, useEffect, useState } from "react";
-import { Form, Select, Table } from "antd";
-
-const ProjectFeatureList: React.FC = () => {
-  const [project, setProject] = useState("");
-  const [feature, setFeature] = useState("");
-  const [features, setFeatures] = useState([]);
-  return (
-    <div>
-      <Form.Item
-        label="Select Feature: "
-        style={{ minWidth: "35%", float: "left", paddingLeft: "10px" }}
-        rules={[
-          {
-            required: true,
-            message: "Please select a feature to check.",
-          },
-        ]}
-      >
-        <Select
-          options={features}
-          defaultValue={feature}
-          value={feature}
-          optionFilterProp="label"
-          notFoundContent={<div>No projects found from server</div>}
-          //onChange={onFeatureChange}
-        ></Select>
-      </Form.Item>
-    </div>
-  );
-};
-
-export default ProjectFeatureList;