Skip to content
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

Add Error handling on duplicate dashboard names #441

Merged
merged 6 commits into from
May 4, 2023
Merged

Add Error handling on duplicate dashboard names #441

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
876652c
Add check for existing panel name
rupal-bq May 2, 2023
3af34f7
Nit
rupal-bq May 2, 2023
f40b10a
Remove double await
rupal-bq May 2, 2023
7bc3618
Add rename name check test
rupal-bq May 2, 2023
d2b6d6e
Remove test
rupal-bq May 3, 2023
55fdc01
Add unique id to sample panel name
rupal-bq May 4, 2023
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
13 changes: 13 additions & 0 deletions .cypress/integration/3_panels.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,19 @@ describe('Testing panels table', () => {
expectUuid(renamed);
});

it.only('Renames panel with existing name', () => {
rupal-bq marked this conversation as resolved.
Show resolved Hide resolved
createLegacyPanel();
cy.reload();
const cell = cy.get('.euiTableCellContent');
expectLegacyId(cell);
selectThePanel();
openActionsDropdown();
cy.get('button[data-test-subj="renameContextMenuItem"]').click();
cy.get('input.euiFieldText').focus().type(TEST_PANEL);
cy.get('button[data-test-subj="runModalButton"]').click();
expectToastWith(`Observability Dashboard with name ${TEST_PANEL} already exists`);
});

it('Deletes the panel', () => {
cy.get('input[data-test-subj="checkboxSelectAll"]').click();
openActionsDropdown();
Expand Down
13 changes: 10 additions & 3 deletions public/components/custom_panels/custom_panel_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import { DeleteModal } from '../common/helpers/delete_modal';
import {
createPanel,
deletePanels,
doesNameExist,
fetchPanels,
isUuid,
newPanelTemplate,
Expand Down Expand Up @@ -120,7 +121,9 @@ export const CustomPanelTable = ({
};

const onCreate = async (newCustomPanelName: string) => {
if (!isNameValid(newCustomPanelName)) {
if (await doesNameExist(newCustomPanelName)) {
setToast(`Observability Dashboard with name "${newCustomPanelName}" already exists`, 'danger');
} else if (!isNameValid(newCustomPanelName)) {
setToast('Invalid Dashboard name', 'danger');
} else {
const newPanel = newPanelTemplate(newCustomPanelName);
Expand All @@ -130,7 +133,9 @@ export const CustomPanelTable = ({
};

const onRename = async (newCustomPanelName: string) => {
if (!isNameValid(newCustomPanelName)) {
if (await doesNameExist(newCustomPanelName)) {
setToast(`Observability Dashboard with name "${newCustomPanelName}" already exists`, 'danger');
} else if (!isNameValid(newCustomPanelName)) {
setToast('Invalid Dashboard name', 'danger');
} else {
dispatch(renameCustomPanel(newCustomPanelName, selectedCustomPanels[0].id));
Expand All @@ -139,7 +144,9 @@ export const CustomPanelTable = ({
};

const onClone = async (newName: string) => {
if (!isNameValid(newName)) {
if (await doesNameExist(newName)) {
setToast(`Observability Dashboard with name "${newName}" already exists`, 'danger');
} else if (!isNameValid(newName)) {
setToast('Invalid Operational Panel name', 'danger');
} else {
let sourcePanel = selectedCustomPanels[0];
Expand Down
5 changes: 4 additions & 1 deletion public/components/custom_panels/custom_panel_view_so.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import { VisaulizationFlyoutSO } from './panel_modules/visualization_flyout/visu
import {
clonePanel,
deletePanels,
doesNameExist,
fetchPanel,
renameCustomPanel,
selectPanel,
Expand Down Expand Up @@ -208,7 +209,9 @@ export const CustomPanelViewSO = (props: CustomPanelViewProps) => {
};

const onRename = async (newCustomPanelName: string) => {
rupal-bq marked this conversation as resolved.
Show resolved Hide resolved
if (!isNameValid(newCustomPanelName)) {
if (await doesNameExist(newCustomPanelName)) {
setToast(`Observability Dashboard with name "${newCustomPanelName}" already exists`, 'danger');
} else if (!isNameValid(newCustomPanelName)) {
setToast('Invalid Dashboard name', 'danger');
} else {
dispatch(renameCustomPanel(newCustomPanelName, panel.id));
Expand Down
18 changes: 11 additions & 7 deletions public/components/custom_panels/redux/panel_slice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const normalizedPanel = (panel: CustomPanelType): CustomPanelType => ({

export const selectPanelList = (rootState): CustomPanelType[] => rootState.customPanel.panelList;

const {setToast} = useToast();
const { setToast } = useToast();

/*
** ASYNC DISPATCH FUNCTIONS
Expand Down Expand Up @@ -128,7 +128,7 @@ export const fetchPanel = (id) => async (dispatch, getState) => {
dispatch(setPanel(panel));
};

export const fetchVisualization = () => (dispatch, getState) => {};
export const fetchVisualization = () => (dispatch, getState) => { };

const updateLegacyPanel = (panel: CustomPanelType) =>
coreRefs.http!.post(`${CUSTOM_PANELS_API_PREFIX}/panels/update`, {
Expand All @@ -141,6 +141,11 @@ export const uuidRx = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a

export const isUuid = (id) => !!id.match(uuidRx);

export const doesNameExist = async (newCustomPanelName: string) => {
const panels = await fetchCustomPanels();
console.log(panels);
rupal-bq marked this conversation as resolved.
Show resolved Hide resolved
return (panels.some(({ title }: {title: string}) => title === newCustomPanelName));
}
export const updatePanel = (panel: CustomPanelType, successMsg: string, failureMsg: string) => async (dispatch, getState) => {
try {
if (isUuid(panel.id)) await updateSavedObjectPanel(panel);
Expand All @@ -151,7 +156,7 @@ export const updatePanel = (panel: CustomPanelType, successMsg: string, failureM
dispatch(setPanel(panel));
const panelList = getState().customPanel.panelList.map((p) => (p.id === panel.id ? panel : p));
dispatch(setPanelList(panelList));
} catch (e) {
} catch (e) {
if (failureMsg) {
setToast(failureMsg, 'danger')
}
Expand Down Expand Up @@ -193,7 +198,7 @@ export const replaceVizInPanel = (oldPanel, oldVizId, vizId, newVisualizationTit
const visualizationsWithNewPanel = addVisualizationPanel(vizId, oldVizId, allVisualizations);

const updatedPanel = { ...panel, visualizations: visualizationsWithNewPanel };

dispatch(updatePanel(updatedPanel, `Visualization ${newVisualizationTitle} successfully added!`, `Error in adding ${newVisualizationTitle} visualization to the panel`));
};

Expand All @@ -211,9 +216,8 @@ const deleteLegacyPanels = (customPanelIdList: string[]) => {
};

export const deletePanels = (panelsToDelete: CustomPanelType[]) => async (dispatch, getState) => {
const toastMessage = `Observability Dashboard${
panelsToDelete.length > 1 ? 's' : ' ' + panelsToDelete[0].title
} successfully deleted!`;
const toastMessage = `Observability Dashboard${panelsToDelete.length > 1 ? 's' : ' ' + panelsToDelete[0].title
} successfully deleted!`;
try {
const ids = panelsToDelete.map((p) => p.id);
await Promise.all([deleteLegacyPanels(ids), deletePanelSO(ids)]);
Expand Down