Merge branch 'master' into CORE-5090-logo-update

oacore · Jan 24, 2025 · ddaac14 · ddaac14
2 parents 208f03d + 456513a
commit ddaac14
Show file tree

Hide file tree

Showing 59 changed files with 72 additions and 3,293 deletions.
diff --git a/components/pdf-upload/defaultUpload.jsx b/components/pdf-upload/defaultUpload.jsx
@@ -6,6 +6,7 @@ import { useRouter } from 'next/router'
 import text from '../../data/retention.yml'
 import uploadSvg from '../../public/images/logos/upload.svg'
 import styles from './styles.module.scss'
+import sdgText from '../../data/sdg.yml'
 
 const DefaultUploadView = ({
   handleClick,
@@ -59,7 +60,11 @@ const DefaultUploadView = ({
         </div>
       )}
       <div className={styles.uploadFooter}>
-        <span className={styles.footerText}>{text.upload.subInfo.format}</span>
+        <span className={styles.footerText}>
+          {router.pathname.includes('sdg')
+            ? sdgText.upload.subInfo.format
+            : text.upload.subInfo.format}
+        </span>
         <span className={styles.footerText}>{text.upload.subInfo.size}</span>
       </div>
     </div>

diff --git a/components/pdf-upload/formatUpload.jsx b/components/pdf-upload/formatUpload.jsx
@@ -4,6 +4,7 @@ import { ProgressSpinner } from '@oacore/design/lib/elements'
 import { useRouter } from 'next/router'
 
 import text from '../../data/retention.yml'
+import sdgText from '../../data/sdg.yml'
 import styles from './styles.module.scss'
 
 const FormatUploadIssue = ({
@@ -42,7 +43,9 @@ const FormatUploadIssue = ({
       ) : (
         <div className={styles.innerIssueWrapper}>
           <span className={styles.innerIssueTitle}>
-            {text.upload.subInfo.format}
+            {router.pathname.includes('sdg')
+              ? sdgText.upload.subInfo.format
+              : text.upload.subInfo.format}
           </span>
           <input
             ref={uploadRef}

diff --git a/components/pdf-upload/index.jsx b/components/pdf-upload/index.jsx
@@ -21,23 +21,25 @@ const RrsCheckCard = ({
   const router = useRouter()
 
   const handleClick = () => {
-    uploadRef.current.click()
+    if (!rrsPdfLoading && uploadRef.current) uploadRef.current.click()
   }
 
   const handleDragOver = (event) => {
     event.preventDefault()
   }
 
   useEffect(() => {
+    if (!uploadResults) return
+
     const results = Array.isArray(uploadResults) ? uploadResults : []
     if (results.some((result) => result.predictions)) setCurrentView('success')
-    if (uploadResults.rightsRetentionSentence) setCurrentView('success')
-    if (
+    else if (uploadResults.rightsRetentionSentence) setCurrentView('success')
+    else if (
       !uploadResults.rightsRetentionSentence &&
       uploadResults.confidence === 0
     )
       setCurrentView('fail')
-    if (results.some((result) => result.predictions === null))
+    else if (results.some((result) => result.predictions === null))
       setCurrentView('fail')
   }, [uploadResults])
 
@@ -52,22 +54,17 @@ const RrsCheckCard = ({
     if (files && files.length) {
       // eslint-disable-next-line prefer-destructuring
       file = files[0]
-      uploadPdf(file)
-      setFileName(file.name)
       if (file.size > 10 * 1024 * 1024) {
         setCurrentView('sizeIssue')
         return
       }
       const fileType = file.type
-      if (
-        !(
-          fileType === 'application/pdf' ||
-          fileType === 'application/msword' ||
-          fileType ===
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-        )
-      )
+      if (fileType !== 'application/pdf') {
         setCurrentView('formatIssue')
+        return
+      }
+      uploadPdf(file)
+      setFileName(file.name)
     }
   }
 

diff --git a/data/retention.yml b/data/retention.yml
@@ -28,7 +28,7 @@ upload:
     action: Upload new file
   subInfo:
     format: |
-     Supported formats: pdf, doc
+     Supported formats: pdf
     size: |
       Maximum  size: 10MB
 

diff --git a/data/sdg.yml b/data/sdg.yml
@@ -29,7 +29,7 @@ upload:
     action: Upload new file
   subInfo:
     format: |
-      Supported formats: pdf, doc
+      Supported formats: pdf
     size: |
       Maximum  size: 10MB
 

diff --git a/netlify-cms.config.yml b/netlify-cms.config.yml
@@ -1685,8 +1685,8 @@ collections:
 
 - name: board-of-supporters
 
-  media_folder: '/images'
-  public_folder: '/images'
+  media_folder: '/images/community'
+  public_folder: '/images/community'
 
   create: false
   delete: false
@@ -1834,8 +1834,8 @@ collections:
 
 - name: api
 
-  media_folder: '/images'
-  public_folder: '/images'
+  media_folder: '/images/services'
+  public_folder: '/images/services'
 
   create: false
   delete: false
@@ -2294,8 +2294,8 @@ collections:
 
 - name: datasets
 
-  media_folder: '/images'
-  public_folder: '/images'
+  media_folder: '/images/services'
+  public_folder: '/images/services'
 
   create: false
   delete: false
@@ -2698,8 +2698,8 @@ collections:
 
 - name: fastsync
 
-  media_folder: '/images'
-  public_folder: '/images'
+  media_folder: '/images/services'
+  public_folder: '/images/services'
 
   create: false
   delete: false
@@ -3041,8 +3041,8 @@ collections:
 
 - name: recomender
 
-  media_folder: '/images'
-  public_folder: '/images'
+  media_folder: '/images/services'
+  public_folder: '/images/services'
 
   create: false
   delete: false
@@ -3349,8 +3349,8 @@ collections:
 
 - name: discovery
 
-  media_folder: '/images'
-  public_folder: '/images'
+  media_folder: '/images/services'
+  public_folder: '/images/services'
 
   create: false
   delete: false
@@ -3697,8 +3697,8 @@ collections:
 
 - name: dashboard
 
-  media_folder: '/images'
-  public_folder: '/images'
+  media_folder: '/images/services'
+  public_folder: '/images/services'
 
   create: false
   delete: false

diff --git a/package-lock.json b/package-lock.json
diff --git a/pages/governance/advisory.jsx b/pages/governance/advisory.jsx
@@ -6,22 +6,21 @@ import retrieveContent from 'content'
 
 const ASSETS_BASE_URL = 'https://oacore.github.io/content/'
 
-const setAssetsUrl = (object) =>
+const setAssetsUrl = (object) => {
   Object.entries(object).forEach(([key, value]) => {
     if (typeof value === 'string' && value.includes('/images'))
       object[key] = ASSETS_BASE_URL + value
+    else if (typeof value === 'object') setAssetsUrl(value) // Recursively process nested objects
   })
+}
 
 const getSections = async ({ ref } = {}) => {
   const content = await retrieveContent('advisory', {
     ref,
     transform: 'object',
   })
 
-  Object.values(content).forEach((section) => {
-    setAssetsUrl(section)
-    if (section.table) setAssetsUrl(section.table)
-  })
+  setAssetsUrl(content)
 
   return content
 }

diff --git a/pages/governance/supporters.jsx b/pages/governance/supporters.jsx
@@ -8,22 +8,21 @@ import apiRequest from 'api'
 
 const ASSETS_BASE_URL = 'https://oacore.github.io/content/'
 
-const setAssetsUrl = (object) =>
+const setAssetsUrl = (object) => {
   Object.entries(object).forEach(([key, value]) => {
     if (typeof value === 'string' && value.includes('/images'))
       object[key] = ASSETS_BASE_URL + value
+    else if (typeof value === 'object') setAssetsUrl(value) // Recursively process nested objects
   })
+}
 
 const getSections = async ({ ref } = {}) => {
   const content = await retrieveContent('board-supporters', {
     ref,
     transform: 'object',
   })
 
-  Object.values(content).forEach((section) => {
-    setAssetsUrl(section)
-    if (section.items) setAssetsUrl(section.items)
-  })
+  setAssetsUrl(content)
 
   return content
 }

diff --git a/pages/services/api.jsx b/pages/services/api.jsx
@@ -6,11 +6,13 @@ import retrieveContent from 'content'
 
 const ASSETS_BASE_URL = 'https://oacore.github.io/content/'
 
-const setAssetsUrl = (object) =>
+const setAssetsUrl = (object) => {
   Object.entries(object).forEach(([key, value]) => {
     if (typeof value === 'string' && value.includes('/images'))
       object[key] = ASSETS_BASE_URL + value
+    else if (typeof value === 'object') setAssetsUrl(value) // Recursively process nested objects
   })
+}
 
 const getSections = async ({ ref } = {}) => {
   const page = await retrieveContent('api', {

diff --git a/pages/services/consultancy.jsx b/pages/services/consultancy.jsx
@@ -5,11 +5,13 @@ import retrieveContent from 'content'
 
 const ASSETS_BASE_URL = 'https://oacore.github.io/content/'
 
-const setAssetsUrl = (object) =>
+const setAssetsUrl = (object) => {
   Object.entries(object).forEach(([key, value]) => {
     if (typeof value === 'string' && value.includes('/images'))
       object[key] = ASSETS_BASE_URL + value
+    else if (typeof value === 'object') setAssetsUrl(value) // Recursively process nested objects
   })
+}
 
 const getSections = async ({ ref } = {}) => {
   const content = await retrieveContent('consultancy', {

diff --git a/pages/services/dataset.jsx b/pages/services/dataset.jsx
@@ -6,11 +6,13 @@ import retrieveContent from 'content'
 
 const ASSETS_BASE_URL = 'https://oacore.github.io/content/'
 
-const setAssetsUrl = (object) =>
+const setAssetsUrl = (object) => {
   Object.entries(object).forEach(([key, value]) => {
     if (typeof value === 'string' && value.includes('/images'))
       object[key] = ASSETS_BASE_URL + value
+    else if (typeof value === 'object') setAssetsUrl(value) // Recursively process nested objects
   })
+}
 
 const getSections = async ({ ref } = {}) => {
   const page = await retrieveContent('datasets', {

diff --git a/pages/services/discovery.jsx b/pages/services/discovery.jsx
@@ -6,11 +6,13 @@ import retrieveContent from 'content'
 
 const ASSETS_BASE_URL = 'https://oacore.github.io/content/'
 
-const setAssetsUrl = (object) =>
+const setAssetsUrl = (object) => {
   Object.entries(object).forEach(([key, value]) => {
     if (typeof value === 'string' && value.includes('/images'))
       object[key] = ASSETS_BASE_URL + value
+    else if (typeof value === 'object') setAssetsUrl(value) // Recursively process nested objects
   })
+}
 
 const getSections = async ({ ref } = {}) => {
   const page = await retrieveContent('discovery', {

diff --git a/pages/services/fastsync.jsx b/pages/services/fastsync.jsx
@@ -5,11 +5,13 @@ import retrieveContent from 'content'
 
 const ASSETS_BASE_URL = 'https://oacore.github.io/content/'
 
-const setAssetsUrl = (object) =>
+const setAssetsUrl = (object) => {
   Object.entries(object).forEach(([key, value]) => {
     if (typeof value === 'string' && value.includes('/images'))
       object[key] = ASSETS_BASE_URL + value
+    else if (typeof value === 'object') setAssetsUrl(value) // Recursively process nested objects
   })
+}
 
 const getSections = async ({ ref } = {}) => {
   const page = await retrieveContent('fastsync', {

diff --git a/pages/services/recommender.jsx b/pages/services/recommender.jsx
@@ -5,11 +5,13 @@ import retrieveContent from 'content'
 
 const ASSETS_BASE_URL = 'https://oacore.github.io/content/'
 
-const setAssetsUrl = (object) =>
+const setAssetsUrl = (object) => {
   Object.entries(object).forEach(([key, value]) => {
     if (typeof value === 'string' && value.includes('/images'))
       object[key] = ASSETS_BASE_URL + value
+    else if (typeof value === 'object') setAssetsUrl(value) // Recursively process nested objects
   })
+}
 
 const getSections = async ({ ref } = {}) => {
   const page = await retrieveContent('recomender', {

diff --git a/pages/services/repository-dashboard.jsx b/pages/services/repository-dashboard.jsx
@@ -5,11 +5,13 @@ import retrieveContent from 'content'
 
 const ASSETS_BASE_URL = 'https://oacore.github.io/content/'
 
-const setAssetsUrl = (object) =>
+const setAssetsUrl = (object) => {
   Object.entries(object).forEach(([key, value]) => {
     if (typeof value === 'string' && value.includes('/images'))
       object[key] = ASSETS_BASE_URL + value
+    else if (typeof value === 'object') setAssetsUrl(value) // Recursively process nested objects
   })
+}
 
 const getSections = async ({ ref } = {}) => {
   const page = await retrieveContent('dashboard', {