Merge pull request #188 from recogito/develop

Beta fixes
recogito · May 29, 2024 · 506e990 · 506e990
2 parents f2ee425 + 21b1231
commit 506e990
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/apps/dashboard-projects/ProjectsHome.tsx b/src/apps/dashboard-projects/ProjectsHome.tsx
@@ -92,12 +92,14 @@ export const ProjectsHome = (props: ProjectsHomeProps) => {
   // Filtered projects
   const myProjects = projects.filter((p) => p.created_by?.id === me.id);
 
-  const openJoinProjects = projects.filter(
-    (p) =>
-      me.id !== p.created_by?.id &&
-      p.is_open_join &&
-      p.users.filter((u) => u.user.id === me.id).length === 0
-  );
+  const openJoinProjects = me.isOrgAdmin
+    ? projects.filter((p) => me.id !== p.created_by?.id && p.is_open_join)
+    : projects.filter(
+        (p) =>
+          me.id !== p.created_by?.id &&
+          p.is_open_join &&
+          p.users.filter((u) => u.user.id === me.id).length === 0
+      );
 
   const sharedProjects = isReader
     ? projects.filter(({ created_by, users }) =>

diff --git a/src/components/ProjectCard/ProjectCard.tsx b/src/components/ProjectCard/ProjectCard.tsx
@@ -57,15 +57,15 @@ export const ProjectCard = (props: ProjectCardProps) => {
 
   const texts = documents.filter(({ content_type }) => content_type);
 
-  const { t } = props.i18n;
+  const { t, lang } = props.i18n;
 
   const showDocs = props.orgPolicies
     ? props.orgPolicies.get('projects').has('INSERT')
     : false;
 
   const onClick = () => {
-    if (!is_open_join || users.length > 0) {
-      window.location.href = `./projects/${id}`;
+    if (!is_open_join || users.length > 0 || props.me.isOrgAdmin) {
+      window.location.pathname = `${lang}/projects/${id}`;
     }
   };
 
@@ -77,7 +77,7 @@ export const ProjectCard = (props: ProjectCardProps) => {
     setJoinProjectOpen(false);
     joinProject(supabase, id).then((resp) => {
       if (resp) {
-        window.location.href = `./projects/${id}`;
+        window.location.pathname = `${lang}/projects/${id}`;
       } else {
         props.onError(props.i18n.t['Something happened']);
       }