feat(graphs): Prioritise data and code sharing on the top of the page

dataesr · Feb 27, 2024 · cbf95b1 · cbf95b1
1 parent 402db23
commit cbf95b1
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 40 deletions.
diff --git a/src/pages/BaroNational/NationalResearchData/index.js b/src/pages/BaroNational/NationalResearchData/index.js
@@ -84,35 +84,35 @@ export default function NationalResearchData() {
                     id: 'app.publi.navigation.go-to-page',
                   }),
                   href: {
-                    en: '/research-data/general?id=general.utilisation',
-                    fr: '/donnees-de-la-recherche/general?id=general.utilisation',
+                    en: '/research-data/general?id=general.partage',
+                    fr: '/donnees-de-la-recherche/general?id=general.partage',
                   },
                 },
                 {
                   label: intl.formatMessage({
-                    id: 'app.data.navigation.utilisation',
+                    id: 'app.data.navigation.partage',
                   }),
                   href: {
-                    en: '/research-data/general?id=general.utilisation',
-                    fr: '/donnees-de-la-recherche/general?id=general.utilisation',
+                    en: '/research-data/general?id=general.partage',
+                    fr: '/donnees-de-la-recherche/general?id=general.partage',
                   },
                 },
                 {
                   label: intl.formatMessage({
-                    id: 'app.data.navigation.creation',
+                    id: 'app.data.navigation.utilisation',
                   }),
                   href: {
-                    en: '/research-data/general?id=general.creation',
-                    fr: '/donnees-de-la-recherche/general?id=general.creation',
+                    en: '/research-data/general?id=general.utilisation',
+                    fr: '/donnees-de-la-recherche/general?id=general.utilisation',
                   },
                 },
                 {
                   label: intl.formatMessage({
-                    id: 'app.data.navigation.partage',
+                    id: 'app.data.navigation.creation',
                   }),
                   href: {
-                    en: '/research-data/general?id=general.partage',
-                    fr: '/donnees-de-la-recherche/general?id=general.partage',
+                    en: '/research-data/general?id=general.creation',
+                    fr: '/donnees-de-la-recherche/general?id=general.creation',
                   },
                 },
                 {
@@ -127,6 +127,15 @@ export default function NationalResearchData() {
               ]}
             >
               <GraphContent>
+                <QuestionSection
+                  intlKey='app.national-data.general.partage'
+                  glossaryKeys={['embargo', 'barriere-mobile']}
+                  backgroundColor={blueSoft50}
+                  anchorId='general.partage'
+                >
+                  <BSOChart id='data.general.voies-ouverture.chart-data-shared' />
+                  <BSOChart id='data.general.voies-ouverture.chart-data-shared-among-all' />
+                </QuestionSection>
                 <QuestionSection
                   intlKey='app.national-data.general.utilisation'
                   glossaryKeys={['archive-ouverte']}
@@ -143,15 +152,6 @@ export default function NationalResearchData() {
                 >
                   <BSOChart id='data.general.voies-ouverture.chart-data-created' />
                 </QuestionSection>
-                <QuestionSection
-                  intlKey='app.national-data.general.partage'
-                  glossaryKeys={['embargo', 'barriere-mobile']}
-                  backgroundColor={blueSoft50}
-                  anchorId='general.partage'
-                >
-                  <BSOChart id='data.general.voies-ouverture.chart-data-shared' />
-                  <BSOChart id='data.general.voies-ouverture.chart-data-shared-among-all' />
-                </QuestionSection>
                 <QuestionSection
                   intlKey='app.national-data.general.statement'
                   glossaryKeys={['archive-ouverte']}

diff --git a/src/pages/BaroNational/NationalSoftwareCode/index.js b/src/pages/BaroNational/NationalSoftwareCode/index.js
@@ -86,40 +86,49 @@ export default function NationalSoftwareCode() {
                     id: 'app.publi.navigation.go-to-page',
                   }),
                   href: {
-                    en: '/software/general?id=general.utilisation',
-                    fr: '/codes-et-logiciels/general?id=general.utilisation',
+                    en: '/software/general?id=general.partage',
+                    fr: '/codes-et-logiciels/general?id=general.partage',
                   },
                 },
                 {
                   label: intl.formatMessage({
-                    id: 'app.software.navigation.utilisation',
+                    id: 'app.software.navigation.partage',
                   }),
                   href: {
-                    en: '/software/general?id=general.utilisation',
-                    fr: '/codes-et-logiciels/general?id=general.utilisation',
+                    en: '/software/general?id=general.partage',
+                    fr: '/codes-et-logiciels/general?id=general.partage',
                   },
                 },
                 {
                   label: intl.formatMessage({
-                    id: 'app.software.navigation.creation',
+                    id: 'app.software.navigation.utilisation',
                   }),
                   href: {
-                    en: '/software/general?id=general.creation',
-                    fr: '/codes-et-logiciels/general?id=general.creation',
+                    en: '/software/general?id=general.utilisation',
+                    fr: '/codes-et-logiciels/general?id=general.utilisation',
                   },
                 },
                 {
                   label: intl.formatMessage({
-                    id: 'app.software.navigation.partage',
+                    id: 'app.software.navigation.creation',
                   }),
                   href: {
-                    en: '/software/general?id=general.partage',
-                    fr: '/codes-et-logiciels/general?id=general.partage',
+                    en: '/software/general?id=general.creation',
+                    fr: '/codes-et-logiciels/general?id=general.creation',
                   },
                 },
               ]}
             >
               <GraphContent>
+                <QuestionSection
+                  intlKey='app.national-software.general.partage'
+                  glossaryKeys={['grobid', 'softcite']}
+                  backgroundColor={blueSoft50}
+                  anchorId='general.partage'
+                >
+                  <BSOChart id='software.general.voies-ouverture.chart-software-shared' />
+                  <BSOChart id='software.general.voies-ouverture.chart-software-shared-among-all' />
+                </QuestionSection>
                 <QuestionSection
                   intlKey='app.national-software.general.utilisation'
                   glossaryKeys={['grobid', 'softcite']}
@@ -136,15 +145,6 @@ export default function NationalSoftwareCode() {
                 >
                   <BSOChart id='software.general.voies-ouverture.chart-software-created' />
                 </QuestionSection>
-                <QuestionSection
-                  intlKey='app.national-software.general.partage'
-                  glossaryKeys={['grobid', 'softcite']}
-                  backgroundColor={blueSoft50}
-                  anchorId='general.partage'
-                >
-                  <BSOChart id='software.general.voies-ouverture.chart-software-shared' />
-                  <BSOChart id='software.general.voies-ouverture.chart-software-shared-among-all' />
-                </QuestionSection>
               </GraphContent>
             </GraphItem>