Skip to content

fix: replace item popup with shared item popup, adjust props and actions #1034

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

Open
tomrndom wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: replace item popup with shared item popup, adjust props and actions #1034

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
122 changes: 25 additions & 97 deletions src/actions/sponsor-forms-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,37 +1231,6 @@ export const deleteSponsorFormItem =
});
};

const saveItemImages =
(formId, formItemId, images) => async (dispatch, getState) => {
const { currentSummitState } = getState();
const { currentSummit } = currentSummitState;
const accessToken = await getAccessTokenSafely();
const params = { access_token: accessToken };

const promises = images.map((file) => {
if (file.id) {
return putRequest(
null,
createAction(SPONSOR_FORM_ITEM_IMAGES_UPDATED),
`${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/show-forms/${formId}/items/${formItemId}/images/${file.id}`,
file,
authErrorHandler,
file
)(params)(dispatch);
}
return postRequest(
null,
createAction(SPONSOR_FORM_ITEM_IMAGES_UPDATED),
`${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/show-forms/${formId}/items/${formItemId}/images`,
file,
authErrorHandler,
file
)(params)(dispatch);
});

return Promise.all(promises);
};

export const saveSponsorFormItem =
(formId, entity) => async (dispatch, getState) => {
const { currentSummitState } = getState();
Expand All @@ -1276,85 +1245,44 @@ export const saveSponsorFormItem =

const normalizedEntity = normalizeItem(entity);

return postRequest(
null,
createAction(SPONSOR_FORM_ITEM_UPDATED),
`${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/show-forms/${formId}/items`,
normalizedEntity,
snackbarErrorHandler
)(params)(dispatch)
.then(({ response }) => {
const promises = [Promise.resolve(0)];

if (normalizedEntity.images?.length > 0) {
const savingImages = saveItemImages(
formId,
response.id,
normalizedEntity.images
)(dispatch, getState);

promises.push(savingImages);
}

return Promise.all(promises).then(() => {
if (entity.id) {
return putRequest(
null,
createAction(SPONSOR_FORM_ITEM_UPDATED),
`${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/show-forms/${formId}/items/${entity.id}`,
normalizedEntity,
snackbarErrorHandler
)(params)(dispatch)
.then(() => {
dispatch(
snackbarSuccessHandler({
title: T.translate("general.success"),
html: T.translate("sponsor_form_item_list.edit_item.created")
html: T.translate("sponsor_form_item_list.edit_item.updated")
})
);
})
.catch((err) => {
throw err;
})
.finally(() => {
dispatch(stopLoading());
});
})
.finally(() => {
dispatch(stopLoading());
});
};

export const updateSponsorFormItem =
(formId, entity) => async (dispatch, getState) => {
const { currentSummitState } = getState();
const accessToken = await getAccessTokenSafely();
const { currentSummit } = currentSummitState;

dispatch(startLoading());

const params = {
access_token: accessToken
};

const normalizedEntity = normalizeItem(entity);
}

return putRequest(
return postRequest(
null,
createAction(SPONSOR_FORM_ITEM_UPDATED),
`${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/show-forms/${formId}/items/${entity.id}`,
`${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/show-forms/${formId}/items`,
normalizedEntity,
snackbarErrorHandler
)(params)(dispatch)
.then(() => {
const promises = [Promise.resolve(0)];

if (normalizedEntity.images?.length > 0) {
const savingImages = saveItemImages(
formId,
entity.id,
normalizedEntity.images
)(dispatch, getState);

promises.push(savingImages);
}

return Promise.all(promises).then(() => {
dispatch(
snackbarSuccessHandler({
title: T.translate("general.success"),
html: T.translate("sponsor_form_item_list.edit_item.updated")
})
);
});
})
.catch((err) => {
throw err;
dispatch(
snackbarSuccessHandler({
title: T.translate("general.success"),
html: T.translate("sponsor_form_item_list.edit_item.created")
})
);
})
.finally(() => {
dispatch(stopLoading());
Expand Down
187 changes: 187 additions & 0 deletions src/pages/sponsors-global/form-templates/__tests__/sponsor-inventory-popup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
import React from "react";
import { render, screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import "@testing-library/jest-dom";
import SponsorItemDialog from "../sponsor-inventory-popup";

jest.mock("i18n-react/dist/i18n-react", () => ({
translate: jest.fn((key) => key)
}));

jest.mock("../../../../hooks/useScrollToError", () => jest.fn());

jest.mock("openstack-uicore-foundation/lib/components", () => ({
MuiFormikUpload: function MockMuiFormikUpload({ name }) {
return <div data-testid={`upload-${name}`} />;
}
}));

jest.mock(
"openstack-uicore-foundation/lib/components/mui/formik-inputs/additional-input-list",
() =>
function MockAdditionalInputList({ name }) {
return <div data-testid={`meta-fields-${name}`} />;
}
);

jest.mock(
"../../../../components/mui/formik-inputs/item-price-tiers",
() =>
function MockItemPriceTiers() {
return <div data-testid="price-tiers" />;
}
);

jest.mock(
"../../../../components/inputs/formik-text-editor",
() =>
function MockFormikTextEditor({ name }) {
return <textarea data-testid={`editor-${name}`} name={name} readOnly />;
}
);

const BASE_ENTITY = {
id: 0,
code: "",
name: "",
description: "",
early_bird_rate: "",
standard_rate: "",
onsite_rate: "",
quantity_limit_per_show: "",
quantity_limit_per_sponsor: "",
meta_fields: [],
images: []
};

const fillRequiredTextFields = async (user) => {
await user.type(document.querySelector("input[name=\"code\"]"), "CODE-1");
await user.type(document.querySelector("input[name=\"name\"]"), "Item 1");
};

const submit = async (user) => {
await user.click(
screen.getByRole("button", { name: "edit_inventory_item.save_changes" })
);
};

describe("SponsorItemDialog", () => {
let onSave;
let onClose;

beforeEach(() => {
jest.clearAllMocks();
onSave = jest.fn(() => Promise.resolve());
onClose = jest.fn();
});

it("titles itself by whether the entity has an id", () => {
const { rerender } = render(
<SponsorItemDialog
entity={BASE_ENTITY}
onSave={onSave}
onClose={onClose}
/>
);
expect(
screen.getByText("edit_inventory_item.new_item")
).toBeInTheDocument();

rerender(
<SponsorItemDialog
entity={{ ...BASE_ENTITY, id: 42 }}
onSave={onSave}
onClose={onClose}
/>
);
expect(
screen.getByText("edit_inventory_item.edit_item")
).toBeInTheDocument();
});

it("blocks save when code/name are empty", async () => {
const user = userEvent.setup();
render(
<SponsorItemDialog
entity={BASE_ENTITY}
onSave={onSave}
onClose={onClose}
/>
);

await submit(user);

expect(onSave).not.toHaveBeenCalled();
});

describe("default_quantity requirement", () => {
it("is optional by default: saves with no value and shows no required marker", async () => {
const user = userEvent.setup();
render(
<SponsorItemDialog
entity={BASE_ENTITY}
onSave={onSave}
onClose={onClose}
/>
);

expect(
screen.queryByText("edit_inventory_item.default_quantity *")
).not.toBeInTheDocument();

await fillRequiredTextFields(user);
await submit(user);

await waitFor(() => expect(onSave).toHaveBeenCalledTimes(1));
expect(onClose).toHaveBeenCalledTimes(1);
});

it("blocks save, shows the error and the required marker when required and empty", async () => {
const user = userEvent.setup();
render(
<SponsorItemDialog
entity={{ ...BASE_ENTITY, default_quantity: undefined }}
onSave={onSave}
onClose={onClose}
requireDefaultQuantity
/>
);

expect(
screen.getByText("edit_inventory_item.default_quantity *")
).toBeInTheDocument();

await fillRequiredTextFields(user);
await submit(user);

expect(onSave).not.toHaveBeenCalled();
expect(
await screen.findByText("validation.required")
).toBeInTheDocument();
});

it("allows save once a value is provided when required", async () => {
const user = userEvent.setup();
render(
<SponsorItemDialog
entity={{ ...BASE_ENTITY, default_quantity: "" }}
onSave={onSave}
onClose={onClose}
requireDefaultQuantity
/>
);

await fillRequiredTextFields(user);
await user.type(
document.querySelector("input[name=\"default_quantity\"]"),
"5"
);
await submit(user);

await waitFor(() => expect(onSave).toHaveBeenCalledTimes(1));
expect(onSave.mock.calls[0][0]).toEqual(
expect.objectContaining({ default_quantity: 5 })
);
});
});
});
13 changes: 10 additions & 3 deletions src/pages/sponsors-global/form-templates/sponsor-inventory-popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ const SponsorItemDialog = ({
onSave,
onMetaFieldTypeDeleted,
onMetaFieldTypeValueDeleted,
entity: initialEntity
entity: initialEntity,
requireDefaultQuantity = false
}) => {
const [isSaving, setIsSaving] = useState(false);

Expand All @@ -62,7 +63,11 @@ const SponsorItemDialog = ({
early_bird_rate: nullableDecimalValidation(),
standard_rate: nullableDecimalValidation(),
onsite_rate: nullableDecimalValidation(),
default_quantity: positiveNumberValidation(),
default_quantity: requireDefaultQuantity
? positiveNumberValidation().required(
T.translate("validation.required")
)
: positiveNumberValidation(),
quantity_limit_per_sponsor: positiveNumberValidation(),
quantity_limit_per_show: positiveNumberValidation(),
meta_fields: formMetafieldsValidation()
Expand Down Expand Up @@ -173,6 +178,7 @@ const SponsorItemDialog = ({
<Grid2 size={4}>
<InputLabel htmlFor="default_quantity">
{T.translate("edit_inventory_item.default_quantity")}
{requireDefaultQuantity && " *"}
</InputLabel>
<MuiFormikQuantityField
variant="outlined"
Expand Down Expand Up @@ -263,7 +269,8 @@ SponsorItemDialog.propTypes = {
onSave: PropTypes.func.isRequired,
onMetaFieldTypeDeleted: PropTypes.func,
onMetaFieldTypeValueDeleted: PropTypes.func,
entity: PropTypes.object
entity: PropTypes.object,
requireDefaultQuantity: PropTypes.bool
};

export default SponsorItemDialog;
Loading
Loading