From 95d0f3f9b341020c742cf0df8402a564cc7c5dec Mon Sep 17 00:00:00 2001
From: Jenny Yu <jennyyu212@outlook.com>
Date: Sun, 12 Jun 2022 22:45:23 -0700
Subject: fix: filtering dashboards

---
 src/client/views/DashboardView.tsx | 11 +++++++----
 src/client/views/topbar/TopBar.tsx |  7 ++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/client/views/DashboardView.tsx b/src/client/views/DashboardView.tsx
index efc1644fe..e48c1bde1 100644
--- a/src/client/views/DashboardView.tsx
+++ b/src/client/views/DashboardView.tsx
@@ -40,10 +40,13 @@ export class DashboardView extends React.Component {
       }
 
       getDashboards = () => {
-            const allDashbaords = DocListCast(CurrentUserUtils.MyDashboards.data);
-            // TODO: filter the dashboards
-            // return allDashbaords.filter(...)
-            return allDashbaords
+            const allDashboards = DocListCast(CurrentUserUtils.MyDashboards.data);
+            if (this.selectedDashboardGroup === DashboardGroup.MyDashboards) {
+                  return allDashboards.filter((dashboard) => dashboard.author === Doc.CurrentUserEmail)
+            } else {
+                  allDashboards.map(d => console.log(d.author))
+                  return allDashboards.filter((dashboard) => dashboard.author !== Doc.CurrentUserEmail)
+            }
       }
 
       render() {
diff --git a/src/client/views/topbar/TopBar.tsx b/src/client/views/topbar/TopBar.tsx
index 0db3950a2..214fe1dbf 100644
--- a/src/client/views/topbar/TopBar.tsx
+++ b/src/client/views/topbar/TopBar.tsx
@@ -66,11 +66,12 @@ export class TopBar extends React.Component {
                                     </Tooltip>
                               </div>
                               <div className="topbar-right" >
-                                    <div className="topbar-button-text" onClick={() => {SharingManager.Instance.open(undefined, activeDashboard)}}>
-                                        {/* TODO: if this is my dashboard, display share
+                                    {CurrentUserUtils.ActiveDashboard ? <div className="topbar-button-text" onClick={() => {SharingManager.Instance.open(undefined, activeDashboard)}}>
+                                        {/* TODO: if I have edit access to the dashboard, display share
                                         if this is a shared dashboard, display "view original or view annotated" */}
                                         { Doc.GetProto(CurrentUserUtils.ActiveDashboard)?.author ===  Doc.CurrentUserEmail ?  "Share": "view original" }
-                                    </div>
+                                        {/* { GetEffectiveAcl(Doc) === AclAdmin ?  "Share": "view original" } */}
+                                    </div> : (null)}
                                     <div className="topbar-button-icon" onClick={() => window.open(
                                           "https://brown-dash.github.io/Dash-Documentation/", "_blank")}>
                                           <FontAwesomeIcon icon="question-circle" />
-- 
cgit v1.2.3-70-g09d2