Filter "your study" cards when not publicly accessible or admin logge…

…d in
revisit-studies · Jan 28, 2025 · 997cbc6 · 997cbc6
1 parent 11b287e
commit 997cbc6
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 6 deletions.
diff --git a/src/components/ConfigSwitcher.tsx b/src/components/ConfigSwitcher.tsx
@@ -16,6 +16,8 @@ import { ErrorLoadingConfig } from './ErrorLoadingConfig';
 import { ParticipantStatusBadges } from '../analysis/interface/ParticipantStatusBadges';
 import { useStorageEngine } from '../storage/storageEngineHooks';
 import { REVISIT_MODE } from '../storage/engines/StorageEngine';
+import { FirebaseStorageEngine } from '../storage/engines/FirebaseStorageEngine';
+import { useAuth } from '../store/hooks/useAuth';
 
 const REVISIT_GITHUB_PUBLIC = 'https://github.com/revisit-studies/study/tree/main/public/';
 
@@ -197,17 +199,38 @@ export function ConfigSwitcher({
   globalConfig: GlobalConfig;
   studyConfigs: Record<string, ParsedConfig<StudyConfig> | null>;
 }) {
+  const { storageEngine } = useStorageEngine();
   const { configsList } = globalConfig;
 
   const demos = configsList.filter((configName) => configName.startsWith('demo-'));
   const tutorials = configsList.filter((configName) => configName.startsWith('tutorial-'));
   const examples = configsList.filter((configName) => configName.startsWith('example-'));
   const tests = configsList.filter((configName) => configName.startsWith('test-'));
   const libraries = configsList.filter((configName) => configName.startsWith('library-'));
-  const others = configsList.filter((configName) => !configName.startsWith('demo-') && !configName.startsWith('tutorial-') && !configName.startsWith('example-') && !configName.startsWith('test-') && !configName.startsWith('library-'));
+  const others = useMemo(() => configsList.filter((configName) => !configName.startsWith('demo-') && !configName.startsWith('tutorial-') && !configName.startsWith('example-') && !configName.startsWith('test-') && !configName.startsWith('library-')), [configsList]);
+
+  const [otherStudyVisibility, setOtherStudyVisibility] = useState<Record<string, boolean>>({});
+  useEffect(() => {
+    async function getVisibilities() {
+      const visibility: Record<string, boolean> = {};
+      await Promise.all(
+        others.map(async (configName) => {
+          if (storageEngine instanceof FirebaseStorageEngine) {
+            const modes = await storageEngine.getModes(configName);
+            visibility[configName] = modes.analyticsInterfacePubliclyAccessible;
+          }
+        }),
+      );
+      setOtherStudyVisibility(visibility);
+    }
+    getVisibilities();
+  }, [others, storageEngine]);
+
+  const { user } = useAuth();
+  const othersFiltered = useMemo(() => others.filter((configName) => otherStudyVisibility[configName] || user.isAdmin), [others, otherStudyVisibility, user]);
 
   const [searchParams] = useSearchParams();
-  const tab = useMemo(() => searchParams.get('tab') || (others.length > 0 ? 'Others' : 'Demos'), [others.length, searchParams]);
+  const tab = useMemo(() => searchParams.get('tab') || (othersFiltered.length > 0 ? 'Others' : 'Demos'), [othersFiltered.length, searchParams]);
   const navigate = useNavigate();
 
   return (
@@ -223,7 +246,7 @@ export function ConfigSwitcher({
         />
         <Tabs variant="outline" defaultValue={others.length > 0 ? 'Others' : 'Demos'} value={tab} onChange={(value) => navigate(`/?tab=${value}`)}>
           <Tabs.List>
-            {others.length > 0 && (
+            {othersFiltered.length > 0 && (
               <Tabs.Tab value="Others">Your Studies</Tabs.Tab>
             )}
             <Tabs.Tab value="Demos">Demo Studies</Tabs.Tab>
@@ -233,9 +256,9 @@ export function ConfigSwitcher({
             <Tabs.Tab value="Libraries">Libraries</Tabs.Tab>
           </Tabs.List>
 
-          {others.length > 0 && (
+          {othersFiltered.length > 0 && (
             <Tabs.Panel value="Others">
-              <StudyCards configNames={others} studyConfigs={studyConfigs} />
+              <StudyCards configNames={othersFiltered} studyConfigs={studyConfigs} />
             </Tabs.Panel>
           )}
 

diff --git a/src/components/settings/GlobalSettings.tsx b/src/components/settings/GlobalSettings.tsx
@@ -11,7 +11,7 @@ import { StoredUser } from '../../storage/engines/StorageEngine';
 import { signInWithGoogle } from '../../Login';
 
 export function GlobalSettings() {
-  const { user, triggerAuth } = useAuth();
+  const { user, triggerAuth, logout } = useAuth();
   const { storageEngine } = useStorageEngine();
 
   const [isAuthEnabled, setAuthEnabled] = useState<boolean>(false);
@@ -155,6 +155,14 @@ export function GlobalSettings() {
                     </Flex>
                   ),
                 ) : null}
+                <Flex direction="row" justify="left">
+                  <Button
+                    onClick={() => logout()}
+                    mt={20}
+                  >
+                    Log out
+                  </Button>
+                </Flex>
               </Flex>
             )
             : null}