Merge pull request #6619 from CitizenLabDotCo/master

Release 11/12/2023:2
CitizenLabDotCo · Dec 11, 2023 · f4cec9c · f4cec9c
2 parents cd8d5bb + 7b6b7bd
commit f4cec9c
Show file tree

Hide file tree

Showing 7 changed files with 240 additions and 279 deletions.
diff --git a/cl2-component-library/package-lock.json b/cl2-component-library/package-lock.json
diff --git a/cl2-component-library/package.json b/cl2-component-library/package.json
@@ -58,6 +58,7 @@
     "@types/css-mediaquery": "^0.1.3",
     "@types/jest": "^28.1.6",
     "@types/lodash": "^4.14.200",
+    "@types/lodash-es": "^4.17.12",
     "@types/react": "^17.0.2",
     "@types/react-color": "3.0.10",
     "@types/react-dom": "^17.0.13",

diff --git a/front/app/containers/Admin/index.tsx b/front/app/containers/Admin/index.tsx
@@ -109,9 +109,13 @@ const AdminPage = memo<Props & WithRouterProps>(
     if (!userCanViewPath) {
       return null;
     }
-    const isProjectPage = pathname.match(
-      /admin\/projects\/[a-f0-9-]+(\/[\w-]+)*/
+    const isFoldersPage = pathname.match(
+      /admin\/projects\/folders\/[a-f0-9-]+(\/(?!projects(?:\/|$))[\w-]+)*/
     );
+    const isProjectPage =
+      pathname.match(
+        /admin\/projects\/[a-f0-9-]+(\/(?!projects(?:\/|$))[\w-]+)*/
+      ) && !isFoldersPage;
 
     const noPadding =
       pathname.includes('admin/dashboard') ||

diff --git a/front/app/containers/Admin/projects/project/analysis/components/ShortInputFieldValue.tsx b/front/app/containers/Admin/projects/project/analysis/components/ShortInputFieldValue.tsx
@@ -53,11 +53,7 @@ const ShortInputFieldValue = ({ customField, rawValue }: Props) => {
     case 'number':
     case 'checkbox':
     case 'linear_scale': {
-      if (
-        rawValue === null ||
-        typeof rawValue === undefined ||
-        rawValue === ''
-      ) {
+      if (rawValue === null || rawValue === undefined || rawValue === '') {
         return <>No Answer</>;
       } else {
         return <>{rawValue}</>;

diff --git a/front/app/containers/Admin/projects/project/analysis/components/ShortUserFieldValue.tsx b/front/app/containers/Admin/projects/project/analysis/components/ShortUserFieldValue.tsx
@@ -43,11 +43,7 @@ const ShortUserFieldValue = ({ customField, rawValue }: Props) => {
     case 'multiline_text':
     case 'number':
     case 'checkbox':
-      if (
-        rawValue === null ||
-        typeof rawValue === undefined ||
-        rawValue === ''
-      ) {
+      if (rawValue === null || rawValue === undefined || rawValue === '') {
         return <>{formatMessage(messages.noAnswer)}</>;
       } else {
         return <>{rawValue}</>;