@@ -21,7 +21,7 @@ const DEFAULT_DASHBOARD_PAGE_PROPS: Pick<DashboardPageProps, 'isFNDashboard' | '
21
21
path : '/d/:uid/:slug?' ,
22
22
url : '' ,
23
23
} ,
24
-
24
+
25
25
history : { } as DashboardPageProps [ 'history' ] ,
26
26
route : {
27
27
routeName : DashboardRoutes . Normal ,
@@ -32,16 +32,7 @@ const DEFAULT_DASHBOARD_PAGE_PROPS: Pick<DashboardPageProps, 'isFNDashboard' | '
32
32
} ;
33
33
34
34
export const RenderFNDashboard : FC < FNDashboardProps > = ( props ) => {
35
- const {
36
- queryParams,
37
- uid,
38
- slug,
39
- mode,
40
- controlsContainer,
41
- pageTitle = '' ,
42
- setErrors,
43
- fnLoader,
44
- } = props ;
35
+ const { queryParams, uid, slug, mode, controlsContainer, pageTitle = '' , setErrors, fnLoader } = props ;
45
36
46
37
const dispatch = useDispatch ( ) ;
47
38
@@ -95,19 +86,23 @@ export const RenderFNDashboard: FC<FNDashboardProps> = (props) => {
95
86
locationService . fnPathnameChange ( window . location . pathname , queryParams ) ;
96
87
} , [ dispatch , uid , slug , controlsContainer , pageTitle , queryParams , mode , hiddenVariables ] ) ;
97
88
98
- const dashboardPageProps : DashboardPageProps = useMemo ( ( ) => merge ( { } , DEFAULT_DASHBOARD_PAGE_PROPS , {
99
- ...DEFAULT_DASHBOARD_PAGE_PROPS ,
100
- match : {
101
- params : {
102
- ...props ,
103
- } ,
104
- } ,
105
- location : locationService . getLocation ( ) ,
106
- queryParams,
107
- hiddenVariables,
108
- controlsContainer,
109
- fnLoader,
110
- } ) , [ controlsContainer , fnLoader , hiddenVariables , props , queryParams ] ) ;
89
+ const dashboardPageProps : DashboardPageProps = useMemo (
90
+ ( ) =>
91
+ merge ( { } , DEFAULT_DASHBOARD_PAGE_PROPS , {
92
+ ...DEFAULT_DASHBOARD_PAGE_PROPS ,
93
+ match : {
94
+ params : {
95
+ ...props ,
96
+ } ,
97
+ } ,
98
+ location : locationService . getLocation ( ) ,
99
+ queryParams,
100
+ hiddenVariables,
101
+ controlsContainer,
102
+ fnLoader,
103
+ } ) ,
104
+ [ controlsContainer , fnLoader , hiddenVariables , props , queryParams ]
105
+ ) ;
111
106
112
107
return isEmpty ( queryParams || { } ) ? < > { fnLoader } </ > : < DashboardPage { ...dashboardPageProps } /> ;
113
108
} ;
0 commit comments