From fdb9d2530042c68fa659c8f69f6bf8e42e7cc7a3 Mon Sep 17 00:00:00 2001
From: hexxa <hexxa@outlook.com>
Date: Sat, 27 Nov 2021 17:59:53 +0800
Subject: [PATCH] fix(root_frame): fix tabs issues in the root_frame

---
 public/static/css/white.css                   | 12 +++-
 .../web/src/components/control/tabs.tsx       | 15 +++--
 src/client/web/src/components/core_state.ts   | 13 +++-
 src/client/web/src/components/pane_admin.tsx  |  2 +-
 src/client/web/src/components/root_frame.tsx  | 62 ++++++++++---------
 .../web/src/components/state_updater.ts       |  6 +-
 src/client/web/src/i18n/en_US.ts              |  3 +
 src/client/web/src/i18n/zh_CN.ts              |  3 +
 8 files changed, 77 insertions(+), 39 deletions(-)

diff --git a/public/static/css/white.css b/public/static/css/white.css
index 92e3404..dde605e 100644
--- a/public/static/css/white.css
+++ b/public/static/css/white.css
@@ -78,7 +78,7 @@
   /* padding: 1rem; */
 }
 
-#browser .container {
+.container {
   width: 100%;
   color: #34495e;
   background-color: white;
@@ -175,6 +175,16 @@
   margin: auto 1rem auto auto;
 }
 
+.theme-default .float-l {
+  display: inline-block;
+  margin: auto 1rem auto auto;
+}
+
+.theme-default .float-r {
+  display: inline-block;
+  margin: auto auto 1rem 1rem;
+}
+
 .theme-default .float-input {
   display: inline-block;
   margin: auto 1rem 1rem auto;
diff --git a/src/client/web/src/components/control/tabs.tsx b/src/client/web/src/components/control/tabs.tsx
index 87b8be8..e8005cf 100644
--- a/src/client/web/src/components/control/tabs.tsx
+++ b/src/client/web/src/components/control/tabs.tsx
@@ -37,34 +37,37 @@ export class Tabs extends React.Component<Props, State, {}> {
     if (!updater().setControlOption(targetControl, targetOption)) {
       alertMsg(this.props.msg.pkg.get("op.fail"));
     }
+    this.props.update(updater().updateUI);
   };
 
   render() {
     const displaying = this.props.ui.control.controls.get(
       this.props.targetControl
     );
+
     const options = this.props.ui.control.options.get(this.props.targetControl);
-    const tabs = options.map((option: string, targetControl: string) => {
+    const tabs = options.map((option: string) => {
       const iconProps = this.props.tabIcons.has(option)
         ? this.props.tabIcons.get(option)
         : defaultIconProps;
 
-      // <RiFolder2Fill size="1.6rem" className="margin-r-s cyan0-font" />,
       const icon = getIcon(iconProps.name, iconProps.size, iconProps.color);
 
       return (
         <button
-          key={`${targetControl}-${option}`}
+          key={`${this.props.targetControl}-${option}`}
           onClick={() => {
-            this.setTab(targetControl, option);
+            this.setTab(this.props.targetControl, option);
           }}
-          className="float"
+          className="float-l"
         >
           <Flexbox
             children={List([
               <span className="margin-r-s">{icon}</span>,
               <span>
-                {this.props.msg.pkg.get(`switch.${targetControl}.${option}`)}
+                {this.props.msg.pkg.get(
+                  `control.${this.props.targetControl}.${option}`
+                )}
               </span>,
             ])}
             childrenStyles={List([{ flex: "30%" }, { flex: "70%" }])}
diff --git a/src/client/web/src/components/core_state.ts b/src/client/web/src/components/core_state.ts
index 362932f..613ef60 100644
--- a/src/client/web/src/components/core_state.ts
+++ b/src/client/web/src/components/core_state.ts
@@ -5,6 +5,7 @@ import { UploadEntry } from "../worker/interface";
 import { FilesProps } from "./panel_files";
 import { UploadingsProps } from "./panel_uploadings";
 import { SharingsProps } from "./panel_sharings";
+import { controlName as panelTabs } from "./root_frame";
 import { PanesProps } from "./panes";
 import { LoginProps } from "./pane_login";
 import { AdminProps } from "./pane_admin";
@@ -109,8 +110,16 @@ export function initState(): ICoreState {
         align: "",
       },
       control: {
-        controls: Map<string, string>(),
-        options: Map<string, Set<string>>(),
+        controls: Map<string, string>({
+          [panelTabs]: "filesPanel",
+        }),
+        options: Map<string, Set<string>>({
+          [panelTabs]: Set<string>([
+            "filesPanel",
+            "uploadingsPanel",
+            "sharingsPanel",
+          ]),
+        }),
       },
     },
   };
diff --git a/src/client/web/src/components/pane_admin.tsx b/src/client/web/src/components/pane_admin.tsx
index 30a58d4..8df9d06 100644
--- a/src/client/web/src/components/pane_admin.tsx
+++ b/src/client/web/src/components/pane_admin.tsx
@@ -432,7 +432,7 @@ export class AdminPane extends React.Component<Props, State, {}> {
 
     const roleList = this.props.admin.roles.valueSeq().map((role: string) => {
       return (
-        <div className="role-list-item">
+        <div key={role} className="role-list-item">
           <Flexbox
             children={List([
               <span>{role}</span>,
diff --git a/src/client/web/src/components/root_frame.tsx b/src/client/web/src/components/root_frame.tsx
index bbc8572..d8ab8bf 100644
--- a/src/client/web/src/components/root_frame.tsx
+++ b/src/client/web/src/components/root_frame.tsx
@@ -14,7 +14,7 @@ import { AdminProps } from "./pane_admin";
 import { TopBar } from "./topbar";
 import { roleVisitor } from "../client";
 
-const controlName = "panel-tabs";
+export const controlName = "panelTabs";
 export interface Props {
   filesInfo: FilesProps;
   uploadingsInfo: UploadingsProps;
@@ -59,9 +59,10 @@ export class RootFrame extends React.Component<Props, State, {}> {
         : "";
 
     const displaying = this.props.ui.control.controls.get(controlName);
-    const filesPanelClass = displaying === "files" ? "" : "none";
-    const uploadingsPanelClass = displaying === "uploadings" ? "" : "none";
-    const sharingsPanelClass = displaying === "sharings" ? "" : "none";
+    const filesPanelClass = displaying === "filesPanel" ? "" : "hidden";
+    const uploadingsPanelClass =
+      displaying === "uploadingsPanel" ? "" : "hidden";
+    const sharingsPanelClass = displaying === "sharingsPanel" ? "" : "hidden";
 
     return (
       <div id="root-frame" className={`${theme} ${fontSizeClass}`}>
@@ -91,30 +92,35 @@ export class RootFrame extends React.Component<Props, State, {}> {
               update={this.props.update}
             /> */}
 
-            <Tabs
-              targetControl={controlName}
-              tabIcons={Map<string, IconProps>({
-                filesPanel: {
-                  name: "RiFolder2Fill",
-                  size: "1.6rem",
-                  color: "cyan0",
-                },
-                uploadingsPanel: {
-                  name: "RiFolder2Fill",
-                  size: "1.6rem",
-                  color: "cyan0",
-                },
-                sharingsPanel: {
-                  name: "RiFolder2Fill",
-                  size: "1.6rem",
-                  color: "cyan0",
-                },
-              })}
-              login={this.props.login}
-              admin={this.props.admin}
-              ui={this.props.ui}
-              msg={this.props.msg}
-            />
+            <div className="container">
+              <div className="padding-m">
+                <Tabs
+                  targetControl={controlName}
+                  tabIcons={Map<string, IconProps>({
+                    filesPanel: {
+                      name: "RiFolder2Fill",
+                      size: "1.6rem",
+                      color: "cyan0",
+                    },
+                    uploadingsPanel: {
+                      name: "RiUploadCloudFill",
+                      size: "1.6rem",
+                      color: "blue0",
+                    },
+                    sharingsPanel: {
+                      name: "RiShareBoxLine",
+                      size: "1.6rem",
+                      color: "purple0",
+                    },
+                  })}
+                  login={this.props.login}
+                  admin={this.props.admin}
+                  ui={this.props.ui}
+                  msg={this.props.msg}
+                  update={this.props.update}
+                />
+              </div>
+            </div>
 
             <span className={filesPanelClass}>
               <FilesPanel
diff --git a/src/client/web/src/components/state_updater.ts b/src/client/web/src/components/state_updater.ts
index 0e67414..2454926 100644
--- a/src/client/web/src/components/state_updater.ts
+++ b/src/client/web/src/components/state_updater.ts
@@ -572,8 +572,12 @@ export class Updater {
 
   setControlOption = (controlName: string, option: string): boolean => {
     const controlExists = this.props.ui.control.controls.has(controlName);
+    const optionsExists = this.props.ui.control.options.has(controlName);
     const options = this.props.ui.control.options.get(controlName);
-    if (!controlExists || !options.has(option)) {
+    if (!controlExists || !optionsExists || !options.has(option)) {
+      console.error(
+        `control(${controlName}-${controlExists}) or option(${option}-${optionsExists}) not found`
+      );
       return false;
     }
 
diff --git a/src/client/web/src/i18n/en_US.ts b/src/client/web/src/i18n/en_US.ts
index 191d0c8..075f361 100644
--- a/src/client/web/src/i18n/en_US.ts
+++ b/src/client/web/src/i18n/en_US.ts
@@ -106,4 +106,7 @@ export const msgs: Map<string, string> = Map({
   "settings.lanPackURL": "Language Pack URL",
   "op.fail": "Operation Failed",
   "op.confirm": "Do you confirm to apply the action?",
+  "control.panelTabs.filesPanel": "Files",
+  "control.panelTabs.uploadingsPanel": "Uploadings",
+  "control.panelTabs.sharingsPanel": "Sharings",
 });
diff --git a/src/client/web/src/i18n/zh_CN.ts b/src/client/web/src/i18n/zh_CN.ts
index 905f231..1ac425a 100644
--- a/src/client/web/src/i18n/zh_CN.ts
+++ b/src/client/web/src/i18n/zh_CN.ts
@@ -105,4 +105,7 @@ export const msgs: Map<string, string> = Map({
   "settings.lanPackURL": "语言包链接",
   "op.fail": "操作失败",
   "op.confirm": "你确定执行此操作吗?",
+  "control.panelTabs.filesPanel": "文件",
+  "control.panelTabs.uploadingsPanel": "上传",
+  "control.panelTabs.sharingsPanel": "共享",
 });