chore: remove New suffix from new dashboards-bar dir

dhis2 · Nov 28, 2024 · fd5dfb3 · fd5dfb3
1 parent 13c225e
commit fd5dfb3
Show file tree

Hide file tree

Showing 33 changed files with 11 additions and 20 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,27 +5,12 @@ 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: 2024-11-26T15:41:22.294Z\n"
-"PO-Revision-Date: 2024-11-26T15:41:22.297Z\n"
+"POT-Creation-Date: 2024-11-28T16:32:58.551Z\n"
+"PO-Revision-Date: 2024-11-28T16:32:58.551Z\n"
 
 msgid "Untitled dashboard"
 msgstr "Untitled dashboard"
 
-msgid "Cannot create a dashboard while offline"
-msgstr "Cannot create a dashboard while offline"
-
-msgid "Create new dashboard"
-msgstr "Create new dashboard"
-
-msgid "Search for a dashboard"
-msgstr "Search for a dashboard"
-
-msgid "Show fewer dashboards"
-msgstr "Show fewer dashboards"
-
-msgid "Show more dashboards"
-msgstr "Show more dashboards"
-
 msgid "Dashboards"
 msgstr "Dashboards"
 
@@ -120,6 +105,9 @@ msgstr "No dashboards available."
 msgid "Create a new dashboard using the + button."
 msgstr "Create a new dashboard using the + button."
 
+msgid "Search for a dashboard"
+msgstr "Search for a dashboard"
+
 msgid "No dashboards found"
 msgstr "No dashboards found"
 

diff --git a/...ponents/DashboardsBarNew/DashboardsBar.js → ...components/DashboardsBar/DashboardsBar.js b/...ponents/DashboardsBarNew/DashboardsBar.js → ...components/DashboardsBar/DashboardsBar.js
diff --git a/...ardsBarNew/InformationBlock/ActionsBar.js → ...hboardsBar/InformationBlock/ActionsBar.js b/...ardsBarNew/InformationBlock/ActionsBar.js → ...hboardsBar/InformationBlock/ActionsBar.js
diff --git a/...rdsBarNew/InformationBlock/Description.js → ...boardsBar/InformationBlock/Description.js b/...rdsBarNew/InformationBlock/Description.js → ...boardsBar/InformationBlock/Description.js
diff --git a/...dsBarNew/InformationBlock/FilterDialog.js → ...oardsBar/InformationBlock/FilterDialog.js b/...dsBarNew/InformationBlock/FilterDialog.js → ...oardsBar/InformationBlock/FilterDialog.js
diff --git a/...BarNew/InformationBlock/FilterSelector.js → ...rdsBar/InformationBlock/FilterSelector.js b/...BarNew/InformationBlock/FilterSelector.js → ...rdsBar/InformationBlock/FilterSelector.js
diff --git a/...rNew/InformationBlock/InformationBlock.js → ...sBar/InformationBlock/InformationBlock.js b/...rNew/InformationBlock/InformationBlock.js → ...sBar/InformationBlock/InformationBlock.js
diff --git a/...BarNew/InformationBlock/LastUpdatedTag.js → ...rdsBar/InformationBlock/LastUpdatedTag.js b/...BarNew/InformationBlock/LastUpdatedTag.js → ...rdsBar/InformationBlock/LastUpdatedTag.js
diff --git a/...w/InformationBlock/StarDashboardButton.js → ...r/InformationBlock/StarDashboardButton.js b/...w/InformationBlock/StarDashboardButton.js → ...r/InformationBlock/StarDashboardButton.js
diff --git a/...ionBlock/__tests__/FilterSelector.spec.js → ...ionBlock/__tests__/FilterSelector.spec.js b/...ionBlock/__tests__/FilterSelector.spec.js → ...ionBlock/__tests__/FilterSelector.spec.js
diff --git a/...__snapshots__/FilterSelector.spec.js.snap → ...__snapshots__/FilterSelector.spec.js.snap b/...__snapshots__/FilterSelector.spec.js.snap → ...__snapshots__/FilterSelector.spec.js.snap
diff --git a/...rNew/InformationBlock/apiStarDashboard.js → ...sBar/InformationBlock/apiStarDashboard.js b/...rNew/InformationBlock/apiStarDashboard.js → ...sBar/InformationBlock/apiStarDashboard.js
diff --git a/...ashboardsBarNew/InformationBlock/index.js → ...s/DashboardsBar/InformationBlock/index.js b/...ashboardsBarNew/InformationBlock/index.js → ...s/DashboardsBar/InformationBlock/index.js
diff --git a/...rmationBlock/styles/ActionsBar.module.css → ...rmationBlock/styles/ActionsBar.module.css b/...rmationBlock/styles/ActionsBar.module.css → ...rmationBlock/styles/ActionsBar.module.css
diff --git a/...mationBlock/styles/Description.module.css → ...mationBlock/styles/Description.module.css b/...mationBlock/styles/Description.module.css → ...mationBlock/styles/Description.module.css
diff --git a/...ionBlock/styles/FilterSelector.module.css → ...ionBlock/styles/FilterSelector.module.css b/...ionBlock/styles/FilterSelector.module.css → ...ionBlock/styles/FilterSelector.module.css
diff --git a/...nBlock/styles/InformationBlock.module.css → ...nBlock/styles/InformationBlock.module.css b/...nBlock/styles/InformationBlock.module.css → ...nBlock/styles/InformationBlock.module.css
diff --git a/...ock/styles/StarDashboardButton.module.css → ...ock/styles/StarDashboardButton.module.css b/...ock/styles/StarDashboardButton.module.css → ...ock/styles/StarDashboardButton.module.css
diff --git a/...dsBarNew/NavigationMenu/IconNavigation.js → ...oardsBar/NavigationMenu/IconNavigation.js b/...dsBarNew/NavigationMenu/IconNavigation.js → ...oardsBar/NavigationMenu/IconNavigation.js
diff --git a/...dsBarNew/NavigationMenu/NavigationMenu.js → ...oardsBar/NavigationMenu/NavigationMenu.js b/...dsBarNew/NavigationMenu/NavigationMenu.js → ...oardsBar/NavigationMenu/NavigationMenu.js
diff --git a/...rNew/NavigationMenu/NavigationMenuItem.js → ...sBar/NavigationMenu/NavigationMenuItem.js b/...rNew/NavigationMenu/NavigationMenuItem.js → ...sBar/NavigationMenu/NavigationMenuItem.js
diff --git a/.../DashboardsBarNew/NavigationMenu/index.js → ...nts/DashboardsBar/NavigationMenu/index.js b/.../DashboardsBarNew/NavigationMenu/index.js → ...nts/DashboardsBar/NavigationMenu/index.js
diff --git a/...tionMenu/styles/NavigationMenu.module.css → ...tionMenu/styles/NavigationMenu.module.css b/...tionMenu/styles/NavigationMenu.module.css → ...tionMenu/styles/NavigationMenu.module.css
diff --git a/...Menu/styles/NavigationMenuItem.module.css → ...Menu/styles/NavigationMenuItem.module.css b/...Menu/styles/NavigationMenuItem.module.css → ...Menu/styles/NavigationMenuItem.module.css
diff --git a/...s/DashboardsBarNew/__tests__/Chip.spec.js → ...ents/DashboardsBar/__tests__/Chip.spec.js b/...s/DashboardsBarNew/__tests__/Chip.spec.js → ...ents/DashboardsBar/__tests__/Chip.spec.js
diff --git a/...oardsBarNew/__tests__/ClearButton.spec.js → ...shboardsBar/__tests__/ClearButton.spec.js b/...oardsBarNew/__tests__/ClearButton.spec.js → ...shboardsBar/__tests__/ClearButton.spec.js
diff --git a/...rdsBarNew/__tests__/DashboardsBar.spec.js → ...boardsBar/__tests__/DashboardsBar.spec.js b/...rdsBarNew/__tests__/DashboardsBar.spec.js → ...boardsBar/__tests__/DashboardsBar.spec.js
diff --git a/...DashboardsBarNew/__tests__/Filter.spec.js → ...ts/DashboardsBar/__tests__/Filter.spec.js b/...DashboardsBarNew/__tests__/Filter.spec.js → ...ts/DashboardsBar/__tests__/Filter.spec.js
diff --git a/src/components/DashboardsBar/index.js b/src/components/DashboardsBar/index.js
@@ -0,0 +1,3 @@
+import { DashboardsBar } from './DashboardsBar.js'
+
+export default DashboardsBar
diff --git a/...rdsBarNew/styles/DashboardsBar.module.css → ...boardsBar/styles/DashboardsBar.module.css b/...rdsBarNew/styles/DashboardsBar.module.css → ...boardsBar/styles/DashboardsBar.module.css
diff --git a/src/pages/start/LandingPage.js b/src/pages/start/LandingPage.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types'
 import React, { useEffect } from 'react'
-import { DashboardsBar } from '../../components/DashboardsBarNew/DashboardsBar.js'
+import DashboardsBar from '../../components/DashboardsBar/index.js'
 import StartScreen from './StartScreen.js'
 
 const LandingPage = ({ username, onMount }) => {

diff --git a/src/pages/view/CacheableViewDashboard.js b/src/pages/view/CacheableViewDashboard.js
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types'
 import React, { useEffect } from 'react'
 import { connect } from 'react-redux'
 import { acClearSelected } from '../../actions/selected.js'
-import { DashboardsBar } from '../../components/DashboardsBarNew/DashboardsBar.js'
+import DashboardsBar from '../../components/DashboardsBar/index.js'
 import LoadingMask from '../../components/LoadingMask.js'
 import NoContentMessage from '../../components/NoContentMessage.js'
 import getCacheableSectionId from '../../modules/getCacheableSectionId.js'

diff --git a/src/pages/view/ViewDashboard.js b/src/pages/view/ViewDashboard.js
@@ -17,7 +17,7 @@ import {
 } from '../../actions/selected.js'
 import { apiPostDataStatistics } from '../../api/dataStatistics.js'
 import DashboardContainer from '../../components/DashboardContainer.js'
-import { DashboardsBar } from '../../components/DashboardsBarNew/DashboardsBar.js'
+import DashboardsBar from '../../components/DashboardsBar/index.js'
 import { setHeaderbarVisible } from '../../modules/setHeaderbarVisible.js'
 import { useCacheableSection } from '../../modules/useCacheableSection.js'
 import { sGetDashboardById } from '../../reducers/dashboards.js'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { DashboardsBar } from './DashboardsBar.js'

		export default DashboardsBar