webpack fix and warning fixes

GurinderRawala · GurinderRawala · commit 1f251ccd6314 · 2024-09-05T12:24:16.000-04:00
diff --git a/public/app/core/reducers/fn-slice.ts b/public/app/core/reducers/fn-slice.ts
@@ -41,16 +41,6 @@ export const fnStateProps: FnStateProp[] = [
   'version',
 ];
 
-export const fnPropsMappedFromState: readonly FnPropMappedFromState[] = [
-  'FNDashboard',
-  'hiddenVariables',
-  'mode',
-  'uid',
-  'queryParams',
-  'slug',
-  'version',
-] as const;
-
 const INITIAL_MODE = GrafanaThemeType.Light;
 
 export const FN_STATE_KEY = 'fnGlobalState';
diff --git a/public/app/fn-app/fn-dashboard-page/fn-dashboard.tsx b/public/app/fn-app/fn-dashboard-page/fn-dashboard.tsx
@@ -1,8 +1,7 @@
-import { pick } from 'lodash';
 import { FC, useMemo } from 'react';
 
-import { FnPropMappedFromState, fnPropsMappedFromState } from 'app/core/reducers/fn-slice';
-import { StoreState, useSelector } from 'app/types';
+import { FnGlobalState, FnPropMappedFromState } from 'app/core/reducers/fn-slice';
+import { useSelector } from 'app/types';
 
 import { FnAppProvider } from '../fn-app-provider';
 import { FNDashboardProps } from '../types';
@@ -20,12 +19,8 @@ export const FNDashboard: FC<FNDashboardComponentProps> = (props) => {
   );
 };
 
-function mapStateToProps() {
-  return ({ fnGlobalState }: StoreState) => pick(fnGlobalState, ...fnPropsMappedFromState);
-}
-
 export const DashboardPortal: FC<FNDashboardComponentProps> = (p) => {
-  const globalFnProps = useSelector(mapStateToProps());
+  const globalFnProps = useSelector<FnGlobalState>(({ fnGlobalState }) => fnGlobalState);
 
   const props = useMemo(
     () => ({
diff --git a/public/microfrontends/fn_dashboard/index.html b/public/microfrontends/fn_dashboard/index.html
@@ -19,7 +19,7 @@
      
     <script nonce="" src="../../../public/build/runtime~fn_dashboard.27b2008e9aab8f8985b3.js" type="text/javascript"></script>
       
-    <script nonce="" src="../../../public/build/fn_dashboard.1f9b5b453196a7012a75.js" type="text/javascript"></script>
+    <script nonce="" src="../../../public/build/fn_dashboard.3df600ee86003d356e2c.js" type="text/javascript"></script>
      
   </body>
 </html>
diff --git a/scripts/webpack/webpack.dev.js b/scripts/webpack/webpack.dev.js
@@ -12,7 +12,7 @@ const path = require('path');
 const { DefinePlugin, EnvironmentPlugin } = require('webpack');
 const WebpackAssetsManifest = require('webpack-assets-manifest');
 const { merge } = require('webpack-merge');
-const WebpackBar = require('webpackbar');
+// const WebpackBar = require('webpackbar');
 
 const getEnvConfig = require('./env-util.js');
 const HTMLWebpackCSSChunks = require('./plugins/HTMLWebpackCSSChunks');
@@ -131,10 +131,10 @@ module.exports = (env = {}) => {
         integrity: true,
         publicPath: true,
       }),
-      new WebpackBar({
-        color: '#eb7b18',
-        name: 'Grafana',
-      }),
+      // new WebpackBar({
+      //   color: '#eb7b18',
+      //   name: 'Grafana',
+      // }),
       new EnvironmentPlugin(envConfig),
       new DefinePlugin({
         'process.env': {
