Skip to content

Commit b42f143

Browse files
author
Katarzyna Ziomek-Zdanowicz
committed
FN Lint RenderFnDashboard
1 parent 6ef52ef commit b42f143

File tree

1 file changed

+19
-24
lines changed

1 file changed

+19
-24
lines changed

public/app/fn-app/fn-dashboard-page/render-fn-dashboard.tsx

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const DEFAULT_DASHBOARD_PAGE_PROPS: Pick<DashboardPageProps, 'isFNDashboard' | '
2121
path: '/d/:uid/:slug?',
2222
url: '',
2323
},
24-
24+
2525
history: {} as DashboardPageProps['history'],
2626
route: {
2727
routeName: DashboardRoutes.Normal,
@@ -32,16 +32,7 @@ const DEFAULT_DASHBOARD_PAGE_PROPS: Pick<DashboardPageProps, 'isFNDashboard' | '
3232
};
3333

3434
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;
4536

4637
const dispatch = useDispatch();
4738

@@ -95,19 +86,23 @@ export const RenderFNDashboard: FC<FNDashboardProps> = (props) => {
9586
locationService.fnPathnameChange(window.location.pathname, queryParams);
9687
}, [dispatch, uid, slug, controlsContainer, pageTitle, queryParams, mode, hiddenVariables]);
9788

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+
);
111106

112107
return isEmpty(queryParams || {}) ? <>{fnLoader}</> : <DashboardPage {...dashboardPageProps} />;
113108
};

0 commit comments

Comments
 (0)