fix: update instance endpoint, use ConfigProvider

dhis2 · Nov 7, 2024 · 8a91b2b · 8a91b2b
1 parent e494464
commit 8a91b2b
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 61 deletions.
diff --git a/src/__demo__/OpenFileDialog.stories.js b/src/__demo__/OpenFileDialog.stories.js
@@ -1,4 +1,4 @@
-import { Provider } from '@dhis2/app-runtime'
+import { DataProvider } from '@dhis2/app-runtime'
 import React from 'react'
 import { OpenFileDialog } from '../components/OpenFileDialog/OpenFileDialog.js'
 import {
@@ -10,10 +10,14 @@ import {
     VIS_TYPE_LINE_LIST,
 } from '../modules/visTypes.js'
 
-const configMock = {
-    baseUrl: 'https://debug.dhis2.org/dev',
-    apiVersion: 37,
-}
+const Wrapper = (story) => (
+    <DataProvider
+        baseUrl="https://test.e2e.dhis2.org/analytics-41dev/"
+        apiVersion="41"
+    >
+        {story()}
+    </DataProvider>
+)
 
 const user = {
     displayName: 'John Traore',
@@ -33,38 +37,35 @@ const filterVisTypesWithGroupsAndDivider = [
 
 export default {
     title: 'OpenFileDialog',
+    decorators: [Wrapper],
 }
 
 export const ListOfVisualizationsWithVisTypeFilterAndDividerNoDefaultVisType =
     () => (
-        <Provider config={configMock}>
-            <OpenFileDialog
-                type="visualization"
-                filterVisTypes={filterVisTypesWithGroupsAndDivider}
-                onClose={Function.prototype}
-                onFileSelect={onFileSelect}
-                onNew={Function.prototype}
-                open={true}
-                currentUser={user}
-            />
-        </Provider>
-    )
-
-ListOfVisualizationsWithVisTypeFilterAndDividerNoDefaultVisType.story = {
-    name: 'List of visualizations with vis type filter and divider (no default vis type)',
-}
-
-export const ListOfMapsNoVisTypeFilter = () => (
-    <Provider config={configMock}>
         <OpenFileDialog
-            type="map"
+            type="visualization"
+            filterVisTypes={filterVisTypesWithGroupsAndDivider}
             onClose={Function.prototype}
             onFileSelect={onFileSelect}
             onNew={Function.prototype}
             open={true}
             currentUser={user}
         />
-    </Provider>
+    )
+
+ListOfVisualizationsWithVisTypeFilterAndDividerNoDefaultVisType.story = {
+    name: 'List of visualizations with vis type filter and divider (no default vis type)',
+}
+
+export const ListOfMapsNoVisTypeFilter = () => (
+    <OpenFileDialog
+        type="map"
+        onClose={Function.prototype}
+        onFileSelect={onFileSelect}
+        onNew={Function.prototype}
+        open={true}
+        currentUser={user}
+    />
 )
 
 ListOfMapsNoVisTypeFilter.story = {
@@ -78,18 +79,16 @@ const filterVisTypesWithDisabled = [
 
 export const ListOfEventVisualizationsWithVisTypeFilterDisabledTypeAndDefaultVisType =
     () => (
-        <Provider config={configMock}>
-            <OpenFileDialog
-                type="eventVisualization"
-                filterVisTypes={filterVisTypesWithDisabled}
-                defaultFilterVisType={VIS_TYPE_LINE_LIST}
-                onClose={Function.prototype}
-                onFileSelect={onFileSelect}
-                onNew={Function.prototype}
-                open={true}
-                currentUser={user}
-            />
-        </Provider>
+        <OpenFileDialog
+            type="eventVisualization"
+            filterVisTypes={filterVisTypesWithDisabled}
+            defaultFilterVisType={VIS_TYPE_LINE_LIST}
+            onClose={Function.prototype}
+            onFileSelect={onFileSelect}
+            onNew={Function.prototype}
+            open={true}
+            currentUser={user}
+        />
     )
 
 ListOfEventVisualizationsWithVisTypeFilterDisabledTypeAndDefaultVisType.story =
@@ -105,17 +104,15 @@ const filterVisTypesWithGroupDividerAndDisabled = [
 
 export const ListOfVisualizationsWithVisTypeFilterWithGroupTypeDividerAndDisabledOptionNoDefaultVisType =
     () => (
-        <Provider config={configMock}>
-            <OpenFileDialog
-                type="visualization"
-                filterVisTypes={filterVisTypesWithGroupDividerAndDisabled}
-                onClose={Function.prototype}
-                onFileSelect={onFileSelect}
-                onNew={Function.prototype}
-                open={true}
-                currentUser={user}
-            />
-        </Provider>
+        <OpenFileDialog
+            type="visualization"
+            filterVisTypes={filterVisTypesWithGroupDividerAndDisabled}
+            onClose={Function.prototype}
+            onFileSelect={onFileSelect}
+            onNew={Function.prototype}
+            open={true}
+            currentUser={user}
+        />
     )
 
 ListOfVisualizationsWithVisTypeFilterWithGroupTypeDividerAndDisabledOptionNoDefaultVisType.story =
@@ -124,16 +121,14 @@ ListOfVisualizationsWithVisTypeFilterWithGroupTypeDividerAndDisabledOptionNoDefa
     }
 
 export const NoConnection = () => (
-    <Provider config={configMock}>
-        <OpenFileDialog
-            type="map"
-            onClose={Function.prototype}
-            onFileSelect={onFileSelect}
-            onNew={Function.prototype}
-            open={true}
-            currentUser={user}
-        />
-    </Provider>
+    <OpenFileDialog
+        type="map"
+        onClose={Function.prototype}
+        onFileSelect={onFileSelect}
+        onNew={Function.prototype}
+        open={true}
+        currentUser={user}
+    />
 )
 
 NoConnection.story = {

diff --git a/src/__demo__/OrgUnitDimension.stories.js b/src/__demo__/OrgUnitDimension.stories.js
@@ -4,8 +4,8 @@ import OrgUnitDimension from '../components/OrgUnitDimension/OrgUnitDimension.js
 
 const Wrapper = (story) => (
     <DataProvider
-        baseUrl="https://debug.dhis2.org/analytics-dev/"
-        apiVersion=""
+        baseUrl="https://test.e2e.dhis2.org/analytics-41dev/"
+        apiVersion="41"
     >
         {story()}
     </DataProvider>

diff --git a/src/__demo__/PeriodDimension.stories.js b/src/__demo__/PeriodDimension.stories.js
@@ -1,3 +1,5 @@
+import { DataProvider } from '@dhis2/app-runtime'
+import { ConfigProvider } from '@dhis2/app-service-config'
 import React from 'react'
 import PeriodDimension from '../components/PeriodDimension/PeriodDimension.js'
 import {
@@ -12,10 +14,22 @@ import {
     BIMONTHLY,
 } from '../components/PeriodDimension/utils/index.js'
 
+const Wrapper = (story) => (
+    <ConfigProvider config={{ systemInfo: {} }}>
+        <DataProvider
+            baseUrl="https://test.e2e.dhis2.org/analytics-41dev/"
+            apiVersion="41"
+        >
+            {story()}
+        </DataProvider>
+    </ConfigProvider>
+)
+
 const selectedPeriods = [{ id: 'LAST_12_MONTHS', name: 'Last 12 months' }]
 
 export default {
     title: 'PeriodDimension',
+    decorators: [Wrapper],
 }
 
 export const NoneSelected = () => {