feat: remove duplicated API calls [DHIS2-14112]

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-05-29T16:48:00.591Z\n"
-"PO-Revision-Date: 2023-05-29T16:48:00.591Z\n"
+"POT-Creation-Date: 2023-07-05T09:36:08.695Z\n"
+"PO-Revision-Date: 2023-07-05T09:36:08.695Z\n"
 
 msgid ""
 "The initial configuration of the app has been completed and it is now ready "
@@ -974,3 +974,6 @@ msgstr "Check the amount of data a user would sync to their device."
 
 msgid "User"
 msgstr "User"
+
+msgid "Failed to get data"
+msgstr "Failed to get data"

src/components/analyticVisualization/SelectDataset.js

@@ -1,11 +1,11 @@
 import i18n from '@dhis2/d2-i18n'
 import PropTypes from 'prop-types'
 import React from 'react'
-import { useReadDatasetQuery } from '../../pages/Analytics/Dataset/DatasetVisualizationQuery'
+import { useWorkflowContext } from '../../workflow-context'
 import { SelectField } from '../field'
 
 export const SelectDataset = ({ settings, onChange }) => {
-    const { datasetList, loading } = useReadDatasetQuery()
+    const { dataSets: datasetList } = useWorkflowContext()
     const options = datasetList || []
 
     const handleChange = (e) => {
@@ -26,7 +26,6 @@ export const SelectDataset = ({ settings, onChange }) => {
             selected={settings.dataset || ''}
             onChange={handleChange}
             options={options}
-            loading={loading}
         />
     )
 }

src/components/analyticVisualization/SelectProgram.js

@@ -1,11 +1,11 @@
 import i18n from '@dhis2/d2-i18n'
 import PropTypes from 'prop-types'
 import React from 'react'
-import { useReadProgramQuery } from '../../pages/Analytics/Program/ProgramVisualizationQueries'
+import { useWorkflowContext } from '../../workflow-context'
 import { SelectField } from '../field'
 
 export const SelectProgram = ({ settings, onChange }) => {
-    const { programList, loading } = useReadProgramQuery()
+    const { programs: programList } = useWorkflowContext()
     const options = programList || []
 
     const handleChange = (e) => {
@@ -25,7 +25,6 @@ export const SelectProgram = ({ settings, onChange }) => {
             label={i18n.t('Program')}
             selected={settings.program || ''}
             onChange={handleChange}
-            loading={loading}
             options={options}
         />
     )

src/pages/Analytics/Dataset/DatasetAnalyticList.js

@@ -6,9 +6,9 @@ import PropTypes from 'prop-types'
 import React, { useEffect, useState } from 'react'
 import { DatasetTable } from '../../../components/analyticVisualization'
 import { NoticeError } from '../../../components/noticeAlert'
+import { useWorkflowContext } from '../../../workflow-context'
 import { getVisualizationIdList } from '../helper'
 import { useVisualizations } from '../VisualizationQuery'
-import { useReadDatasetQuery } from './DatasetVisualizationQuery'
 import { prepareRows, rowsToDataStore } from './helper'
 import NewDatasetVisualization from './NewDatasetVisualization'
 
@@ -22,7 +22,7 @@ const DatasetAnalyticList = ({
         error,
         visualizations: visualizationAPI,
     } = useVisualizations(getVisualizationIdList(visualizations))
-    const { datasetList } = useReadDatasetQuery()
+    const { dataSets: datasetList } = useWorkflowContext()
     const [rows, setRows] = useState()
     const [initialRows, setInitialRows] = useState()
     const [groups, setGroups] = useState()

src/pages/Analytics/Program/ProgramAnalyticsList.js

@@ -6,11 +6,11 @@ import PropTypes from 'prop-types'
 import React, { useEffect, useState } from 'react'
 import { ProgramTable } from '../../../components/analyticVisualization'
 import { NoticeError } from '../../../components/noticeAlert'
+import { useWorkflowContext } from '../../../workflow-context'
 import { getVisualizationIdList } from '../helper'
 import { useVisualizations } from '../VisualizationQuery'
 import { prepareRows, rowsToDataStore } from './helper'
 import NewProgramVisualization from './NewProgramVisualization'
-import { useReadProgramQuery } from './ProgramVisualizationQueries'
 
 const ProgramAnalyticsList = ({
     visualizations,
@@ -22,7 +22,7 @@ const ProgramAnalyticsList = ({
         error,
         visualizations: visualizationAPI,
     } = useVisualizations(getVisualizationIdList(visualizations))
-    const { programList } = useReadProgramQuery()
+    const { programs: programList } = useWorkflowContext()
     const [rows, setRows] = useState()
     const [initialRows, setInitialRows] = useState()
     const [groups, setGroups] = useState()

src/pages/AppLayout.js

@@ -5,6 +5,7 @@ import { AuthWall } from '../auth'
 import Router from '../components/Router'
 import SideBar from '../components/sidebar/Sidebar'
 import styles from '../styles/Layout.module.css'
+import { WorkflowProvider } from '../workflow-context'
 
 const AppLayout = () => (
     <HashRouter>
@@ -15,7 +16,9 @@ const AppLayout = () => (
                         <SideBar />
                     </div>
                     <div className={styles.content}>
-                        <Router />
+                        <WorkflowProvider>
+                            <Router />
+                        </WorkflowProvider>
                     </div>
                 </div>
             </AuthWall>

src/pages/Appearance/Datasets/DatasetSpecificSettings.js

@@ -4,14 +4,18 @@ import keyBy from 'lodash/keyBy'
 import PropTypes from 'prop-types'
 import React, { useEffect, useState } from 'react'
 import PageSubtitle from '../../../components/page/PageSubtitle'
-import { filterUnusedElements } from '../../../utils/utils'
-import { useReadDataset } from './datasetQuery'
+import {
+    filterListByDataWriteAccess,
+    filterUnusedElements,
+} from '../../../utils/utils'
+import { useWorkflowContext } from '../../../workflow-context'
 import { prepareSpecificSettingsList } from './helper'
 import NewDatasetSettings from './NewDatasetSettings'
 import SpecificTableAction from './SpecificTableAction'
 
 const DatasetSpecificSettings = ({ onChange, specificSettings, disabled }) => {
-    const { datasetList } = useReadDataset()
+    const { dataSets } = useWorkflowContext()
+    const datasetList = filterListByDataWriteAccess(dataSets)
     const [initialRows, setInitialRows] = useState()
     const [rows, setRows] = useState()
     const [listName, setListName] = useState()
@@ -28,7 +32,7 @@ const DatasetSpecificSettings = ({ onChange, specificSettings, disabled }) => {
             setListName(filterUnusedElements(datasetList, updated))
             setLoad(true)
         }
-    }, [specificSettings, datasetList])
+    }, [specificSettings])
 
     useEffect(() => {
         if (rows && !isEqual(rows, initialRows)) {

src/pages/Synchronization/Datasets/DatasetSpecificSettings.js

@@ -4,8 +4,11 @@ import keyBy from 'lodash/keyBy'
 import PropTypes from 'prop-types'
 import React, { useEffect, useState } from 'react'
 import PageHeader from '../../../components/page/PageHeader'
-import { filterUnusedElements } from '../../../utils/utils'
-import { useReadDataset } from './datasetQueries'
+import {
+    filterListByReadAccess,
+    filterUnusedElements,
+} from '../../../utils/utils'
+import { useWorkflowContext } from '../../../workflow-context'
 import { prepareSpecificSettingsList } from './helper'
 import NewDatasetSpecific from './NewDatasetSpecific'
 import SpecificTableAction from './SpecificTableAction'
@@ -15,8 +18,9 @@ const DatasetSpecificSettings = ({
     handleSpecificSettings,
     disabled,
 }) => {
-    const { datasetList } = useReadDataset()
+    const { dataSets } = useWorkflowContext()
     const [rows, setRows] = useState()
+    const datasetList = filterListByReadAccess(dataSets)
     const [initialRows, setInitialRows] = useState()
     const [listName, setListName] = useState()
     const [loadSpecific, setLoad] = useState(false)
@@ -32,7 +36,7 @@ const DatasetSpecificSettings = ({
             setListName(filterUnusedElements(datasetList, rowList))
             setLoad(true)
         }
-    }, [specificSettings, datasetList])
+    }, [specificSettings])
 
     useEffect(() => {
         if (rows && initialRows && !isEqual(rows, initialRows)) {

src/pages/Synchronization/Programs/ProgramSpecificSettings.js

@@ -4,18 +4,22 @@ import keyBy from 'lodash/keyBy'
 import PropTypes from 'prop-types'
 import React, { useEffect, useState } from 'react'
 import PageHeader from '../../../components/page/PageHeader'
-import { filterUnusedElements } from '../../../utils/utils'
+import {
+    filterListByReadAccess,
+    filterUnusedElements,
+} from '../../../utils/utils'
+import { useWorkflowContext } from '../../../workflow-context'
 import { prepareSpecificSettingsList } from './helper'
 import NewProgramSpecific from './NewProgramSpecific'
-import { useReadProgram } from './programQueries'
 import SpecificTableAction from './SpecificTableAction'
 
 const ProgramSpecificSettings = ({
     specificSettings,
     changeSpecificSettings,
     disabled,
 }) => {
-    const { programList } = useReadProgram()
+    const { programs } = useWorkflowContext()
+    const programList = filterListByReadAccess(programs)
     const [rows, setRows] = useState()
     const [initialRows, setInitialRows] = useState()
     const [listName, setListName] = useState()
@@ -32,7 +36,7 @@ const ProgramSpecificSettings = ({
             setListName(filterUnusedElements(programList, rowList))
             setLoad(true)
         }
-    }, [specificSettings, programList])
+    }, [specificSettings])
 
     useEffect(() => {
         if (rows && initialRows && !isEqual(rows, initialRows)) {

src/utils/utils/filterListByAccess.js

@@ -0,0 +1,7 @@
+import filter from 'lodash/filter'
+
+export const filterListByReadAccess = (list) =>
+    filter(list, { access: { read: true } })
+
+export const filterListByDataWriteAccess = (list) =>
+    filter(list, { access: { data: { write: true } } })

src/utils/utils/index.js

@@ -1,3 +1,4 @@
+export * from './filterListByAccess'
 export * from './filterUnusedElements'
 export * from './findProgramNameById'
 export * from './formatList'

src/workflow-context/WorkflowContext.js

@@ -0,0 +1,8 @@
+import { createContext } from 'react'
+
+const WorkflowContext = createContext({
+    programs: [],
+    dataSets: [],
+})
+
+export { WorkflowContext }