Replace branch with pkg name

Author: dlabrecq

apps/koku-ui-hccm/fec.config.js

@@ -4,7 +4,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const { GitRevisionPlugin } = require('git-revision-webpack-plugin');
 const path = require('path');
 const webpack = require('webpack');
-const { dependencies, insights } = require('./package.json');
+const { dependencies, insights, name } = require('./package.json');
 
 const moduleName = insights.appname.replace(/-(\w)/g, (_, match) => match.toUpperCase());
 const srcDir = path.resolve(__dirname, './src');
@@ -89,8 +89,8 @@ module.exports = {
     }),
     gitRevisionPlugin,
     new webpack.DefinePlugin({
-      'process.env.COMMITHASH': JSON.stringify(gitRevisionPlugin.commithash()),
-      'process.env.BRANCH': JSON.stringify(gitRevisionPlugin.branch()),
+      'process.env.KOKU_UI_COMMITHASH': JSON.stringify(gitRevisionPlugin.commithash()),
+      'process.env.KOKU_UI_PKGNAME': JSON.stringify(name),
     }),
   ],
   resolve: {

apps/koku-ui-hccm/src/app.tsx

@@ -38,7 +38,7 @@ const App = () => {
       <NotificationsProvider store={store}>
         <Routes />
       </NotificationsProvider>
-      <UiVersion appName={pkg.name} />
+      <UiVersion />
     </div>
   );
 };

apps/koku-ui-ros/fec.config.js

@@ -4,7 +4,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const { GitRevisionPlugin } = require('git-revision-webpack-plugin');
 const path = require('path');
 const webpack = require('webpack');
-const { dependencies, insights } = require('./package.json');
+const { dependencies, insights, name } = require('./package.json');
 
 const moduleName = insights.appname.replace(/-(\w)/g, (_, match) => match.toUpperCase());
 const srcDir = path.resolve(__dirname, './src');
@@ -93,8 +93,8 @@ module.exports = {
     }),
     gitRevisionPlugin,
     new webpack.DefinePlugin({
-      'process.env.COMMITHASH': JSON.stringify(gitRevisionPlugin.commithash()),
-      'process.env.BRANCH': JSON.stringify(gitRevisionPlugin.branch()),
+      'process.env.KOKU_UI_COMMITHASH': JSON.stringify(gitRevisionPlugin.commithash()),
+      'process.env.KOKU_UI_PKGNAME': JSON.stringify(name),
     }),
   ],
   resolve: {

apps/koku-ui-ros/src/app.tsx

@@ -38,7 +38,7 @@ const App = () => {
       <NotificationsProvider store={store}>
         <Routes />
       </NotificationsProvider>
-      <UiVersion appName={pkg.name} />
+      <UiVersion />
     </div>
   );
 };

apps/koku-ui-ros/src/fed-modules/optimizationsWrapper.tsx

@@ -8,8 +8,6 @@ import { rosStore } from 'store';
 
 // eslint-disable-next-line no-restricted-imports
 import messages from '../../locales/data.json';
-// eslint-disable-next-line no-restricted-imports
-import pkg from '../../package.json';
 
 export interface OptimizationsWrapperOwnProps {
   children?: React.ReactNode;
@@ -25,7 +23,7 @@ const OptimizationsWrapper: React.FC<OptimizationsWrapperProps> = ({ children }:
     <IntlProvider defaultLocale="en" locale={locale} messages={messages[locale]} onError={console.log}>
       <Provider store={rosStore as any}>
         <div className="costManagementRos">{children}</div>
-        <UiVersion appName={pkg.name} />
+        <UiVersion />
       </Provider>
     </IntlProvider>
   );

libs/ui-lib/src/components/page/uiVersion/uiVersion.tsx

@@ -1,14 +1,10 @@
 import React from 'react';
 
-interface UiVersionProps {
-  appName?: string;
-}
+const UiVersion = () => {
+  const pkgname = process.env.KOKU_UI_PKGNAME ?? 'unknown-pkgname';
+  const commithash = process.env.KOKU_UI_COMMITHASH ?? 'unknown-commithash';
 
-const UiVersion = ({ appName = '@koku-ui' }: UiVersionProps) => {
-  const branch = process.env.BRANCH ?? 'unknown-branch';
-  const commithash = process.env.COMMITHASH ?? 'unknown-commithash';
-
-  return <div id={`${appName}:${branch}:${commithash}`} hidden />;
+  return <div id={`${pkgname}_${commithash}`} hidden />;
 };
 
 export default UiVersion;