Merge pull request #4657 from dlabrecq/mfe-to-ros

dlabrecq · web-flow · commit ed308f39a25b · 2025-11-17T19:39:49.000-05:00
Replace MFE references with ROS and update routes
diff --git a/apps/koku-ui-ros/README.md b/apps/koku-ui-ros/README.md
@@ -68,7 +68,7 @@ Follow the prompts that follow.
 
 2. Open the following URL
 ```
-https://stage.foo.redhat.com:1337/staging/cost-management
+https://stage.foo.redhat.com:1337/staging/cost-management/ros
 ```
 
 Note: Must log in with a user that has Cost Management permissions
diff --git a/apps/koku-ui-ros/RELEASE.md b/apps/koku-ui-ros/RELEASE.md
@@ -87,8 +87,8 @@ After releasing to each staging environment, open an incognito window and view o
 
 Please ensure expected changes have been updated before releasing to the next staging environment.
 
-1. For stage-ros, view https://console.stage.redhat.com/staging/cost-management/
-2. For prod-ros, view https://console.redhat.com/staging/cost-management/ (preview mode only)
+1. For stage-ros, view https://console.stage.redhat.com/staging/cost-management/ros
+2. For prod-ros, view https://console.redhat.com/staging/cost-management/ros (preview mode only)
 
 ## Release notes
 
diff --git a/apps/koku-ui-ros/deploy/frontend.yaml b/apps/koku-ui-ros/deploy/frontend.yaml
@@ -12,41 +12,43 @@ objects:
     spec:
       feoConfigEnabled: true
       bundleSegments:
-        - segmentId: 'cost-management.staging'
+        - segmentId: 'cost-management-plugin'
           bundleId: 'staging'
           position: 100
           navItems:
-            - id: 'cost-management.staging.cost-management'
+            - id: 'cost-management-plugin.nav'
               title: 'Cost Management'
               expandable: true
               routes:
-                - id: 'cost-management.staging.ros'
+                - id: 'cost-management-plugin.ros'
                   title: 'ROS'
                   expandable: true
+
+                  # Must match apps/koku-ui-ros/src/utils/paths.ts base
                   routes:
-                    - id: 'cost-management.staging.ros.badge'
+                    - id: 'cost-management-plugin.ros.badge'
                       title: 'Optimizations badge'
-                      href: '/staging/cost-management-ros/ros/optimizations/badge'
-                    - id: 'cost-management.staging.ros.link'
+                      href: '/staging/cost-management/ros/optimizations/badge'
+                    - id: 'cost-management-plugin.ros.link'
                       title: 'Optimizations link'
-                      href: '/staging/cost-management-ros/ros/optimizations/link'
-                    - id: 'cost-management.staging.ros.summary'
+                      href: '/staging/cost-management/ros/optimizations/link'
+                    - id: 'cost-management-plugin.ros.summary'
                       title: 'Optimizations summary'
-                      href: "/staging/cost-management-ros/ros/optimizations/summary"
-                    - id: 'cost-management.staging.ros.table'
+                      href: "/staging/cost-management/ros/optimizations/summary"
+                    - id: 'cost-management-plugin.ros.table'
                       title: 'Optimizations table'
-                      href: '/staging/cost-management-ros/ros/optimizations/table'
-                    - id: 'cost-management.staging.ros.details'
+                      href: '/staging/cost-management/ros/optimizations/table'
+                    - id: 'cost-management-plugin.ros.details'
                       title: 'Optimizations details'
-                      href: '/staging/cost-management-ros/ros/optimizations/details'
-                    - id: 'cost-management.staging.ros.breakdown'
+                      href: '/staging/cost-management/ros/optimizations/details'
+                    - id: 'cost-management-plugin.ros.breakdown'
                       title: 'Optimizations breakdown'
-                      href: '/staging/cost-management-ros/ros/optimizations/breakdown'
+                      href: '/staging/cost-management/ros/optimizations/breakdown'
       API:
         versions:
           - v1
       envName: ${ENV_NAME}
-      title: 'Cost Management Resource Optimizations UI'
+      title: 'Cost Management ROS UI'
       deploymentRepo: https://github.com/project-koku/koku-ui/apps/koku-ui-ros
       frontend:
         paths:
@@ -58,7 +60,7 @@ objects:
           - id: 'cost-management-ros'
             module: './RootApp'
             routes:
-              - pathname: '/staging/cost-management-ros'
+              - pathname: '/staging/cost-management/ros'
 parameters:
   - name: ENV_NAME
     required: true
diff --git a/apps/koku-ui-ros/docs/index.md b/apps/koku-ui-ros/docs/index.md
@@ -1,3 +1,3 @@
-# Koku UI MFE Documentation Index #
+# Koku ROS UI Documentation Index #
 
-Welcome to the Koku UI MFE documentation!
+Welcome to the Koku ROS UI documentation!
diff --git a/apps/koku-ui-ros/fec.config.js b/apps/koku-ui-ros/fec.config.js
@@ -32,7 +32,7 @@ class WatchRunPlugin {
 }
 
 module.exports = {
-  appUrl: '/staging/cost-management',
+  appUrl: '/staging/cost-management/ros',
   debug: true,
   interceptChromeConfig: false, // Change to false after your app is registered in configuration files
   proxyVerbose: true,
diff --git a/apps/koku-ui-ros/locales/data.json b/apps/koku-ui-ros/locales/data.json
@@ -213,7 +213,7 @@
     "costManagement": [
       {
         "type": 0,
-        "value": "Cost Management MFE"
+        "value": "Cost Management ROS"
       }
     ],
     "cpu": [
@@ -1406,7 +1406,7 @@
     "pageTitleDefault": [
       {
         "type": 0,
-        "value": "Cost Management MFE | OpenShift"
+        "value": "Cost Management ROS | OpenShift"
       }
     ],
     "pageTitleOptimizations": [
@@ -2084,7 +2084,7 @@
     "welcomeTitle": [
       {
         "type": 0,
-        "value": "Cost Management microfrontend (MFE) with Module Federation"
+        "value": "Cost Management ROS UI"
       }
     ]
   }
diff --git a/apps/koku-ui-ros/locales/translations.json b/apps/koku-ui-ros/locales/translations.json
@@ -10,7 +10,7 @@
   "chooseValuePlaceholder": "Choose value",
   "copyToClipboard": "Copy to clipboard",
   "copyToClipboardSuccessfull": "Successfully copied to clipboard!",
-  "costManagement": "Cost Management MFE",
+  "costManagement": "Cost Management ROS",
   "cpu": "CPU",
   "cpuUtilization": "CPU utilization",
   "currencyAbbreviations": "{symbol, select, billion {{value} B} million {{value} M} quadrillion {{value} q} thousand {{value} K} trillion {{value} t} other {}}",
@@ -71,7 +71,7 @@
   "optimizationsViewAllDisabled": "This project has not reported data this month.",
   "optimizedStateDesc": "Good job optimizing the current configuration.",
   "optimizedStateTitle": "You have reached recommended state!",
-  "pageTitleDefault": "Cost Management MFE | OpenShift",
+  "pageTitleDefault": "Cost Management ROS | OpenShift",
   "pageTitleOptimizations": "Optimizations - Cost Management | OpenShift",
   "paginationTitle": "{placement, select, top {{title} top pagination} bottom {{title} bottom pagination} other {{title} pagination}}",
   "percentPlus": "{count, plural, one {+{value}%} other {{value}%}}",
@@ -97,5 +97,5 @@
   "usage": "Usage",
   "valueUnits": "{value} {units}",
   "welcomeInfo": "For more information visit {url}",
-  "welcomeTitle": "Cost Management microfrontend (MFE) with Module Federation"
+  "welcomeTitle": "Cost Management ROS UI"
 }
diff --git a/apps/koku-ui-ros/src/appEntry.tsx b/apps/koku-ui-ros/src/appEntry.tsx
@@ -13,14 +13,14 @@ import { Provider } from 'react-redux';
 // eslint-disable-next-line no-restricted-imports
 import messages from '../locales/data.json';
 import App from './app';
-import { mfeStore } from './store';
+import { rosStore } from './store';
 
 const AppEntry = () => {
   const locale = getLocale();
 
   return (
     <IntlProvider defaultLocale="en" locale={locale} messages={messages[locale]} onError={console.log}>
-      <Provider store={mfeStore as any}>
+      <Provider store={rosStore as any}>
         <NotificationsPortal />
         <App />
       </Provider>
diff --git a/apps/koku-ui-ros/src/components/featureToggle/featureToggle.tsx b/apps/koku-ui-ros/src/components/featureToggle/featureToggle.tsx
@@ -5,9 +5,9 @@ import { useDispatch } from 'react-redux';
 import { featureToggleActions } from 'store/featureToggle';
 
 export const enum FeatureToggle {
-  boxPlot = 'cost-management.mfe.box-plot', // https://issues.redhat.com/browse/COST-4619
-  debug = 'cost-management.mfe.debug',
-  projectLink = 'cost-management.mfe.project-link', // https://issues.redhat.com/browse/COST-4527 '
+  boxPlot = 'cost-management.ros.box-plot', // https://issues.redhat.com/browse/COST-4619
+  debug = 'cost-management.ros.debug',
+  projectLink = 'cost-management.ros.project-link', // https://issues.redhat.com/browse/COST-4527 '
 }
 
 const useIsToggleEnabled = (toggle: FeatureToggle) => {
diff --git a/apps/koku-ui-ros/src/fed-modules/optimizationsWrapper.tsx b/apps/koku-ui-ros/src/fed-modules/optimizationsWrapper.tsx
@@ -3,7 +3,7 @@ import IntlProvider from '@redhat-cloud-services/frontend-components-translation
 import { getLocale } from 'components/i18n';
 import React from 'react';
 import { Provider } from 'react-redux';
-import { mfeStore } from 'store';
+import { rosStore } from 'store';
 
 // eslint-disable-next-line no-restricted-imports
 import messages from '../../locales/data.json';
@@ -20,7 +20,7 @@ const OptimizationsWrapper: React.FC<OptimizationsWrapperProps> = ({ children }:
   // Note: className is a workaround for ConsoleDot outputting the app name instead of module name
   return (
     <IntlProvider defaultLocale="en" locale={locale} messages={messages[locale]} onError={console.log}>
-      <Provider store={mfeStore as any}>
+      <Provider store={rosStore as any}>
         <div className="costManagementRos">{children}</div>
       </Provider>
     </IntlProvider>
diff --git a/apps/koku-ui-ros/src/locales/messages.ts b/apps/koku-ui-ros/src/locales/messages.ts
@@ -59,8 +59,8 @@ export default defineMessages({
     id: 'copyToClipboardSuccessfull',
   },
   costManagement: {
-    defaultMessage: 'Cost Management MFE',
-    description: 'Cost Management MFE',
+    defaultMessage: 'Cost Management ROS',
+    description: 'Cost Management ROS',
     id: 'costManagement',
   },
   cpu: {
@@ -464,8 +464,8 @@ export default defineMessages({
     id: 'optimizedStateTitle',
   },
   pageTitleDefault: {
-    defaultMessage: 'Cost Management MFE | OpenShift',
-    description: 'Cost Management MFE | OpenShift',
+    defaultMessage: 'Cost Management ROS | OpenShift',
+    description: 'Cost Management ROS | OpenShift',
     id: 'pageTitleDefault',
   },
   pageTitleOptimizations: {
@@ -651,8 +651,8 @@ export default defineMessages({
     id: 'welcomeInfo',
   },
   welcomeTitle: {
-    defaultMessage: 'Cost Management microfrontend (MFE) with Module Federation',
-    description: 'Cost Management microfrontend (MFE) with Module Federation',
+    defaultMessage: 'Cost Management ROS UI',
+    description: 'Cost Management ROS UI',
     id: 'welcomeTitle',
   },
 });
diff --git a/apps/koku-ui-ros/src/routes.tsx b/apps/koku-ui-ros/src/routes.tsx
@@ -27,27 +27,27 @@ const Welcome = lazy(() => import(/* webpackChunkName: "ocpDetails" */ 'routes/c
 const routes = {
   optimizationsBadge: {
     element: userAccess(OptimizationsBadgeStaging),
-    path: '/ros/optimizations/badge',
+    path: '/optimizations/badge',
   },
   optimizationsBreakdown: {
     element: userAccess(OptimizationsBreakdownStaging),
-    path: '/ros/optimizations/breakdown',
+    path: '/optimizations/breakdown',
   },
   optimizationsDetails: {
     element: userAccess(OptimizationsDetailsStaging),
-    path: '/ros/optimizations/details',
+    path: '/optimizations/details',
   },
   optimizationsLink: {
     element: userAccess(OptimizationsLinkStaging),
-    path: '/ros/optimizations/link',
+    path: '/optimizations/link',
   },
   optimizationsSummary: {
     element: userAccess(OptimizationsSummaryStaging),
-    path: '/ros/optimizations/summary',
+    path: '/optimizations/summary',
   },
   optimizationsTable: {
     element: userAccess(OptimizationsTableStaging),
-    path: '/ros/optimizations/table',
+    path: '/optimizations/table',
   },
   welcome: {
     element: userAccess(Welcome),
diff --git a/apps/koku-ui-ros/src/routes/components/charts/theme/theme-koku-ros.ts b/apps/koku-ui-ros/src/routes/components/charts/theme/theme-koku-ros.ts
diff --git a/apps/koku-ui-ros/src/routes/components/charts/theme/theme-utils.ts b/apps/koku-ui-ros/src/routes/components/charts/theme/theme-utils.ts
@@ -1,6 +1,6 @@
 import { ChartThemeColor, getCustomTheme } from '@patternfly/react-charts/victory';
 
-import { default as ChartTheme } from './theme-koku-mfe';
+import { default as ChartTheme } from './theme-koku-ros';
 
 // Applies theme color and variant to base theme
 const getTheme = () => getCustomTheme(ChartThemeColor.default, ChartTheme);
diff --git a/apps/koku-ui-ros/src/store/index.ts b/apps/koku-ui-ros/src/store/index.ts
@@ -1,2 +1,2 @@
-export { configureStore, mfeStore } from './store';
+export { configureStore, rosStore } from './store';
 export type { RootState } from './rootReducer';
diff --git a/apps/koku-ui-ros/src/store/store.ts b/apps/koku-ui-ros/src/store/store.ts
@@ -28,4 +28,4 @@ export function configureStore(initialState: Partial<RootState>) {
   return store;
 }
 
-export const mfeStore = configureStore({});
+export const rosStore = configureStore({});
diff --git a/apps/koku-ui-ros/src/utils/paths.ts b/apps/koku-ui-ros/src/utils/paths.ts
@@ -6,7 +6,7 @@ import { routes } from 'routes';
 // Note the basename does not include a release prefix (/beta, /preview, etc.), unlike the getBaseName function from
 // @redhat-cloud-services/frontend-components-utilities/helpers
 export const formatPath = path => {
-  const basePath = '/staging/cost-management-ros';
+  const basePath = '/staging/cost-management/ros';
   return path === routes.welcome.path ? basePath : `${basePath}${path}`;
 };
 
diff --git a/apps/koku-ui-ros/src/utils/sessionStorage.ts b/apps/koku-ui-ros/src/utils/sessionStorage.ts
@@ -1,6 +1,6 @@
 const accountCurrencyID = 'account_currency';
 const accountNumberID = 'account_number';
-const costManagementID = 'cost_management_mfe';
+const costManagementID = 'cost_management_ros';
 const currencyID = 'currency';
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class WatchRunPlugin {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`module.exports = {`
`35`		`- appUrl: '/staging/cost-management',`
	`35`	`+ appUrl: '/staging/cost-management/ros',`
`36`	`36`	`debug: true,`
`37`	`37`	`interceptChromeConfig: false, // Change to false after your app is registered in configuration files`
`38`	`38`	`proxyVerbose: true,`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@`
`213`	`213`	`"costManagement": [`
`214`	`214`	`{`
`215`	`215`	`"type": 0,`
`216`		`- "value": "Cost Management MFE"`
	`216`	`+ "value": "Cost Management ROS"`
`217`	`217`	`}`
`218`	`218`	`],`
`219`	`219`	`"cpu": [`
`@@ -1406,7 +1406,7 @@`
`1406`	`1406`	`"pageTitleDefault": [`
`1407`	`1407`	`{`
`1408`	`1408`	`"type": 0,`
`1409`		`- "value": "Cost Management MFE \| OpenShift"`
	`1409`	`+ "value": "Cost Management ROS \| OpenShift"`
`1410`	`1410`	`}`
`1411`	`1411`	`],`
`1412`	`1412`	`"pageTitleOptimizations": [`
`@@ -2084,7 +2084,7 @@`
`2084`	`2084`	`"welcomeTitle": [`
`2085`	`2085`	`{`
`2086`	`2086`	`"type": 0,`
`2087`		`- "value": "Cost Management microfrontend (MFE) with Module Federation"`
	`2087`	`+ "value": "Cost Management ROS UI"`
`2088`	`2088`	`}`
`2089`	`2089`	`]`
`2090`	`2090`	`}`