fix: manual updates for react/vite migration

dhis2 · Oct 24, 2024 · 96a18ce · 96a18ce
1 parent 3297817
commit 96a18ce
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 36 deletions.
diff --git a/src/__tests__/AppWrapper.spec.jsx b/src/__tests__/AppWrapper.spec.jsx
@@ -13,22 +13,22 @@ jest.mock('@dhis2/app-runtime-adapter-d2', () => {
 })
 
 jest.mock(
-    '../components/App',
+    '../components/App.jsx',
     () =>
         function MockApp() {
             return <div />
         }
 )
 
 jest.mock(
-    '../components/SystemSettingsProvider.js',
+    '../components/SystemSettingsProvider.jsx',
     () =>
         function Mock() {
             return <div className="SystemSettingsProvider" />
         }
 )
 jest.mock(
-    '../components/UserSettingsProvider.js',
+    '../components/UserSettingsProvider.jsx',
     () =>
         function Mock() {
             return <div className="UserSettingsProvider" />

diff --git a/src/components/DashboardsBar/__tests__/__snapshots__/Filter.spec.jsx.snap b/src/components/DashboardsBar/__tests__/__snapshots__/Filter.spec.jsx.snap
@@ -47,7 +47,6 @@ exports[`Filter renders with empty filter text 1`] = `
         type="text"
         value=""
       />
-      
     </div>
   </span>
 </div>

diff --git a/src/components/Item/AppItem/__tests__/Item.spec.jsx b/src/components/Item/AppItem/__tests__/Item.spec.jsx
@@ -27,7 +27,7 @@ jest.mock('@dhis2/ui', () => {
 })
 
 jest.mock(
-    '../../ItemHeader/DeleteItemButton.js',
+    '../../ItemHeader/DeleteItemButton.jsx',
     () =>
         function Mock() {
             return <div className="DeleteItemButton" />

diff --git a/...ponents/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.offline.spec.jsx b/...ponents/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.offline.spec.jsx
@@ -6,7 +6,7 @@ import { useSystemSettings } from '../../../../SystemSettingsProvider.jsx'
 import WindowDimensionsProvider from '../../../../WindowDimensionsProvider.jsx'
 import ItemContextMenu from '../ItemContextMenu.jsx'
 
-jest.mock('../../../../SystemSettingsProvider', () => {
+jest.mock('../../../../SystemSettingsProvider.jsx', () => {
     return {
         __esModule: true,
         default: jest.fn((children) => <div>{children}</div>),

diff --git a/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.spec.jsx b/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.spec.jsx
@@ -6,7 +6,7 @@ import { useSystemSettings } from '../../../../SystemSettingsProvider.jsx'
 import WindowDimensionsProvider from '../../../../WindowDimensionsProvider.jsx'
 import ItemContextMenu from '../ItemContextMenu.jsx'
 
-jest.mock('../../../../SystemSettingsProvider', () => {
+jest.mock('../../../../SystemSettingsProvider.jsx', () => {
     return {
         __esModule: true,
         default: jest.fn((children) => <div>{children}</div>),

diff --git a/src/components/Item/VisualizationItem/Visualization/__tests__/Visualization.spec.jsx b/src/components/Item/VisualizationItem/Visualization/__tests__/Visualization.spec.jsx
@@ -14,15 +14,15 @@ jest.mock('@dhis2/analytics', () => ({
 }))
 
 jest.mock(
-    '../LegacyPlugin',
+    '../LegacyPlugin.jsx',
     () =>
         function MockLegacyPlugin() {
             return <div className="legacy-plugin" />
         }
 )
 
 jest.mock(
-    '../IframePlugin',
+    '../IframePlugin.jsx',
     () =>
         function MockIframePlugin() {
             return <div className="iframe-plugin" />

diff --git a/src/components/Item/VisualizationItem/__tests__/Item.spec.jsx b/src/components/Item/VisualizationItem/__tests__/Item.spec.jsx
@@ -9,15 +9,15 @@ import WindowDimensionsProvider from '../../../WindowDimensionsProvider.jsx'
 import Item from '../Item.jsx'
 
 jest.mock('../../../../api/fetchVisualization')
-jest.mock('../../../SystemSettingsProvider')
+jest.mock('../../../SystemSettingsProvider.jsx')
 jest.mock('../Visualization/plugin', () => {
     return {
         pluginIsAvailable: () => true,
     }
 })
 
 jest.mock(
-    '../../ItemHeader/DeleteItemButton.js',
+    '../../ItemHeader/DeleteItemButton.jsx',
     () =>
         function Mock() {
             return <div className="DeleteItemButton" />

diff --git a/src/components/__tests__/App.spec.jsx b/src/components/__tests__/App.spec.jsx
@@ -53,7 +53,7 @@ jest.mock('../../api/dataStatistics.js', () => {
 })
 
 jest.mock(
-    '../DashboardsBar/DashboardsBar',
+    '../DashboardsBar/DashboardsBar.jsx',
     () =>
         function MockDashboardsBar() {
             return <div>DashboardsBar</div>
@@ -68,7 +68,7 @@ jest.mock('../../pages/view', () => {
     }
 })
 
-jest.mock('../SystemSettingsProvider', () => {
+jest.mock('../SystemSettingsProvider.jsx', () => {
     return {
         __esModule: true,
         default: jest.fn((children) => <div>{children}</div>),
@@ -78,7 +78,7 @@ jest.mock('../SystemSettingsProvider', () => {
     }
 })
 
-jest.mock('../UserSettingsProvider', () => {
+jest.mock('../UserSettingsProvider.jsx', () => {
     return {
         __esModule: true,
         default: jest.fn((children) => <div>{children}</div>),

diff --git a/src/pages/edit/__tests__/ActionsBar.spec.jsx b/src/pages/edit/__tests__/ActionsBar.spec.jsx
@@ -47,7 +47,7 @@ jest.mock('@dhis2/analytics', () => {
 /* eslint-enable react/prop-types */
 
 jest.mock(
-    '../FilterSettingsDialog',
+    '../FilterSettingsDialog.jsx',
     () =>
         function Mock() {
             return <div className="mock-filter-settings-dialog" />
@@ -56,7 +56,7 @@ jest.mock(
 
 /* eslint-disable react/prop-types */
 jest.mock(
-    '../../../components/ConfirmActionDialog',
+    '../../../components/ConfirmActionDialog.jsx',
     () =>
         function MockConfirmActionDialog({ open }) {
             return open ? <div className="mock-confirm-action-dialog" /> : null

diff --git a/src/pages/edit/__tests__/EditDashboard.spec.jsx b/src/pages/edit/__tests__/EditDashboard.spec.jsx
@@ -27,38 +27,38 @@ jest.mock('@dhis2/ui', () => {
 /* eslint-enable react/prop-types */
 
 jest.mock(
-    '../../../components/Notice.js',
+    '../../../components/Notice.jsx',
     () =>
         function Mock() {
             return <div className="Notice" />
         }
 )
 
 jest.mock(
-    '../ActionsBar',
+    '../ActionsBar.jsx',
     () =>
         function MockActionsBar() {
             return <div>ActionsBar</div>
         }
 )
 
 jest.mock(
-    '../TitleBar',
+    '../TitleBar.jsx',
     () =>
         function MockTitleBar() {
             return <div>TitleBar</div>
         }
 )
 jest.mock(
-    '../ItemGrid',
+    '../ItemGrid.jsx',
     () =>
         function MockEditItemGrid() {
             return <div>ItemGrid</div>
         }
 )
 
 jest.mock(
-    '../../print/PrintLayoutDashboard',
+    '../../print/PrintLayoutDashboard.jsx',
     () =>
         function MockLayoutPrintPreview() {
             return <div>LayoutPrintPreview</div>

diff --git a/src/pages/edit/__tests__/FilterSettingsDialog.spec.jsx b/src/pages/edit/__tests__/FilterSettingsDialog.spec.jsx
@@ -52,7 +52,7 @@ jest.mock('@dhis2/ui', () => {
 })
 /* eslint-enable react/prop-types, react/no-unknown-property */
 
-jest.mock('../../../modules/useDimensions', () => ({
+jest.mock('../../../modules/useDimensions.js', () => ({
     __esModule: true,
     default: () => {
         return [

diff --git a/src/pages/edit/__tests__/NewDashboard.spec.jsx b/src/pages/edit/__tests__/NewDashboard.spec.jsx
@@ -29,30 +29,30 @@ jest.mock('@dhis2/ui', () => {
 /* eslint-enable react/prop-types */
 
 jest.mock(
-    '../ActionsBar',
+    '../ActionsBar.jsx',
     () =>
         function MockActionsBar() {
             return <div>ActionsBar</div>
         }
 )
 
 jest.mock(
-    '../TitleBar',
+    '../TitleBar.jsx',
     () =>
         function MockTitleBar() {
             return <div>TitleBar</div>
         }
 )
 jest.mock(
-    '../ItemGrid',
+    '../ItemGrid.jsx',
     () =>
         function MockEditItemGrid() {
             return <div>ItemGrid</div>
         }
 )
 
 jest.mock(
-    '../../print/PrintLayoutDashboard',
+    '../../print/PrintLayoutDashboard.jsx',
     () =>
         function MockLayoutPrintPreview() {
             return <div>LayoutPrintPreview</div>

diff --git a/src/pages/edit/__tests__/TitleBar.spec.jsx b/src/pages/edit/__tests__/TitleBar.spec.jsx
@@ -7,7 +7,7 @@ import TitleBar from '../TitleBar.jsx'
 const mockStore = configureMockStore()
 
 jest.mock(
-    '../ItemSelector/ItemSelector.js',
+    '../ItemSelector/ItemSelector.jsx',
     () =>
         function MockItemSelector() {
             return <div className="item-selector" />

diff --git a/src/pages/edit/__tests__/__snapshots__/ActionsBar.spec.jsx.snap b/src/pages/edit/__tests__/__snapshots__/ActionsBar.spec.jsx.snap
@@ -39,8 +39,6 @@ exports[`renders Save and Discard buttons but not translation dialog when new da
             Filter settings
           </div>
         </div>
-        
-        
       </div>
       <div
         class="ui-Button"
@@ -52,8 +50,6 @@ exports[`renders Save and Discard buttons but not translation dialog when new da
   <div
     class="mock-filter-settings-dialog"
   />
-  
-  
 </div>
 `;
 

diff --git a/src/pages/view/TitleBar/__tests__/FilterSelector.spec.jsx b/src/pages/view/TitleBar/__tests__/FilterSelector.spec.jsx
@@ -14,7 +14,7 @@ jest.mock('@dhis2/app-runtime', () => ({
 
 /* eslint-disable react/prop-types */
 jest.mock(
-    '../../../../components/DropdownButton/DropdownButton.js',
+    '../../../../components/DropdownButton/DropdownButton.jsx',
     () =>
         function Mock({ children, ...props }) {
             return (

diff --git a/src/pages/view/__tests__/ViewDashboard.spec.jsx b/src/pages/view/__tests__/ViewDashboard.spec.jsx
@@ -30,31 +30,31 @@ jest.mock('@dhis2/app-runtime', () => ({
 jest.mock('../../../api/fetchDashboard')
 
 jest.mock(
-    '../../../components/DashboardsBar/DashboardsBar',
+    '../../../components/DashboardsBar/DashboardsBar.jsx',
     () =>
         function MockDashboardsBar() {
             return <div>DashboardsBar</div>
         }
 )
 
 jest.mock(
-    '../TitleBar/TitleBar',
+    '../TitleBar/TitleBar.jsx',
     () =>
         function MockTitleBar() {
             return <div>TitleBar</div>
         }
 )
 
 jest.mock(
-    '../FilterBar/FilterBar',
+    '../FilterBar/FilterBar.jsx',
     () =>
         function MockFilterBar() {
             return <div>MockFilterBar</div>
         }
 )
 
 jest.mock(
-    '../ItemGrid',
+    '../ItemGrid.jsx',
     () =>
         function MockItemGrid() {
             return <div>MockItemGrid</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,6 @@ exports[`Filter renders with empty filter text 1`] = ` @@
             type="text"
             value=""
           />
         </div>
       </span>
     </div>
@@ Expand Down @@