Skip to content

[Backport 2024.01.xx] #9932: On Binary dashboard public dashboard have + button (#10277) #10297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tdipisa merged 1 commit into from
May 10, 2024
Merged

[Backport 2024.01.xx] #9932: On Binary dashboard public dashboard have + button (#10277) #10297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions web/client/selectors/__tests__/dashboard-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ describe('dashboard selectors', () => {
}
}
})).toBe(false);
expect(buttonCanEdit({
router: {
location: {
pathname: '/dashboard/1'
}
}
})).toBe(false);
});

it("test dashboardServicesSelector", () => {
Expand Down
4 changes: 3 additions & 1 deletion web/client/selectors/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ export const isDashboardLoading = state => state && state.dashboard && state.das
export const getDashboardSaveErrors = state => state && state.dashboard && state.dashboard.saveErrors;
export const isBrowserMobile = state => state && state.browser && state.browser.mobile;
export const buttonCanEdit = createSelector(pathnameSelector, dashboardResource, isBrowserMobile,
(path, resource, isMobile) => isMobile ? !isMobile : (resource && resource.canEdit || isNaN(path.substr(-4))));
// can edit only on desktop, when the resource is saved and editable by the user or when we are editing a new dashboard
// in that case the `path` ends with a number. Like `dashboard/1` or `dashboard/1234`.
(path, resource, isMobile) => isMobile ? !isMobile : (resource && resource.canEdit || isNaN(path.substr(-1))));
export const originalDataSelector = state => state?.dashboard?.originalData;

export const dashboardServicesSelector = state => state && state.dashboard && state.dashboard.services;
Expand Down