Hide 'onlyMyTheses' switch in program overview page, show all theses …

…of the program by default
UniversityOfHelsinkiCS · Dec 12, 2024 · 63d916c · 63d916c
1 parent c3bcd04
commit 63d916c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/client/components/ProgramOverview/ProgramOverview.tsx b/src/client/components/ProgramOverview/ProgramOverview.tsx
@@ -164,7 +164,10 @@ const ProgramOverview = () => {
             <Typography component="h1" variant="h4">
               {t('theses')}
             </Typography>
-            <ThesesPage filteringProgramId={selectedProgram.id} />
+            <ThesesPage
+              filteringProgramId={selectedProgram.id}
+              noOwnThesesSwitch
+            />
           </Stack>
         </>
       )}

diff --git a/src/client/components/ThesisPage/ThesesPage.tsx b/src/client/components/ThesisPage/ThesesPage.tsx
@@ -44,8 +44,9 @@ const PAGE_SIZE = 25
 
 interface Props {
   filteringProgramId?: string
+  noOwnThesesSwitch?: boolean
 }
-const ThesesPage = ({ filteringProgramId }: Props) => {
+const ThesesPage = ({ filteringProgramId, noOwnThesesSwitch }: Props) => {
   const apiRef = useGridApiRef()
   const footerRef = useRef<HTMLDivElement>(null)
   const { t, i18n } = useTranslation()
@@ -65,7 +66,7 @@ const ThesesPage = ({ filteringProgramId }: Props) => {
   const [editedTesis, setEditedThesis] = useState<Thesis | null>(null)
   const [deletedThesis, setDeletedThesis] = useState<Thesis | null>(null)
   const [newThesis, setNewThesis] = useState<Thesis | null>(null)
-  const [showOnlyOwnTheses, setShowOnlyOwnTheses] = useState(true)
+  const [showOnlyOwnTheses, setShowOnlyOwnTheses] = useState(!noOwnThesesSwitch)
 
   const {
     theses,
@@ -304,6 +305,7 @@ const ThesesPage = ({ filteringProgramId }: Props) => {
               toggleShowOnlyOwnTheses: () =>
                 setShowOnlyOwnTheses((prev) => !prev),
               showOnlyOwnTheses,
+              noOwnThesesSwitch,
             },
             footer: {
               footerRef,

diff --git a/src/client/components/ThesisPage/ThesisToolbar.tsx b/src/client/components/ThesisPage/ThesisToolbar.tsx
@@ -17,7 +17,13 @@ const ThesisToolbar = (props: GridSlotProps['toolbar']) => {
 
   const { mutateAsync: applyFilters } = useUserThesesTableFilterMutation()
 
-  const { createNewThesis, toggleShowOnlyOwnTheses, showOnlyOwnTheses } = props
+  const {
+    createNewThesis,
+    toggleShowOnlyOwnTheses,
+    showOnlyOwnTheses,
+    noOwnThesesSwitch,
+  } = props
+  console.log(noOwnThesesSwitch)
 
   const handleNewThesis = () => {
     createNewThesis()
@@ -48,7 +54,7 @@ const ThesisToolbar = (props: GridSlotProps['toolbar']) => {
         >
           {t('thesesTableToolbar:newThesisButton')}
         </Button>
-        {user?.isAdmin && (
+        {!noOwnThesesSwitch && user?.isAdmin && (
           <FormControlLabel
             control={
               <Switch
@@ -59,7 +65,11 @@ const ThesisToolbar = (props: GridSlotProps['toolbar']) => {
             label={t('thesesTableToolbar:showAllThesesSwitch')}
           />
         )}
-        {Boolean(!user?.isAdmin && user?.managedProgramIds?.length) && (
+        {Boolean(
+          !noOwnThesesSwitch &&
+            !user?.isAdmin &&
+            user?.managedProgramIds?.length
+        ) && (
           <FormControlLabel
             control={
               <Switch