Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 14 additions & 20 deletions src/actions/inventory-item-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ import {
createAction,
stopLoading,
startLoading,
showMessage,
showSuccessMessage,
authErrorHandler,
snackbarSuccessHandler,
snackbarErrorHandler,
escapeFilterValue
} from "openstack-uicore-foundation/lib/utils/actions";
import history from "../history";
import { getAccessTokenSafely } from "../utils/methods";
import {
DEFAULT_CURRENT_PAGE,
Expand Down Expand Up @@ -139,7 +137,7 @@ export const getInventoryItems =
createAction(REQUEST_INVENTORY_ITEMS),
createAction(RECEIVE_INVENTORY_ITEMS),
`${window.INVENTORY_API_BASE_URL}/api/v1/inventory-items`,
authErrorHandler,
snackbarErrorHandler,
{ order, orderDir, page, perPage, term, showArchived }
)(params)(dispatch).then(() => {
dispatch(stopLoading());
Expand All @@ -160,7 +158,7 @@ export const getInventoryItem = (inventoryItemId) => async (dispatch) => {
null,
createAction(RECEIVE_INVENTORY_ITEM),
`${window.INVENTORY_API_BASE_URL}/api/v1/inventory-items/${inventoryItemId}`,
authErrorHandler
snackbarErrorHandler
)(params)(dispatch).then(() => {
dispatch(stopLoading());
});
Expand All @@ -180,7 +178,7 @@ export const deleteInventoryItem = (inventoryItemId) => async (dispatch) => {
createAction(INVENTORY_ITEM_DELETED)({ inventoryItemId }),
`${window.INVENTORY_API_BASE_URL}/api/v1/inventory-items/${inventoryItemId}`,
null,
authErrorHandler
snackbarErrorHandler
)(params)(dispatch).then(() => {
dispatch(stopLoading());
});
Expand Down Expand Up @@ -219,7 +217,7 @@ export const saveInventoryItem = (entity) => async (dispatch) => {
createAction(INVENTORY_ITEM_UPDATED),
`${window.INVENTORY_API_BASE_URL}/api/v1/inventory-items/${entity.id}`,
normalizedEntity,
authErrorHandler,
snackbarErrorHandler,
entity
)(params)(dispatch)
.then(() => {
Expand All @@ -235,9 +233,10 @@ export const saveInventoryItem = (entity) => async (dispatch) => {

return Promise.all(promises).then(() => {
dispatch(
showSuccessMessage(
T.translate("edit_inventory_item.inventory_item_saved")
)
snackbarSuccessHandler({
title: T.translate("general.success"),
html: T.translate("edit_inventory_item.inventory_item_saved")
})
Comment thread
coderabbitai[bot] marked this conversation as resolved.
);
});
})
Expand All @@ -250,18 +249,12 @@ export const saveInventoryItem = (entity) => async (dispatch) => {
});
}

const success_message = {
title: T.translate("general.done"),
html: T.translate("edit_inventory_item.inventory_item_created"),
type: "success"
};

return postRequest(
createAction(ADD_INVENTORY_ITEM),
createAction(INVENTORY_ITEM_ADDED),
`${window.INVENTORY_API_BASE_URL}/api/v1/inventory-items`,
normalizedEntity,
authErrorHandler,
snackbarErrorHandler,
entity
)(params)(dispatch)
.then(({ response }) => {
Expand All @@ -278,8 +271,9 @@ export const saveInventoryItem = (entity) => async (dispatch) => {

return Promise.all(promises).then(() => {
dispatch(
showMessage(success_message, () => {
history.push("/app/inventory");
snackbarSuccessHandler({
title: T.translate("general.done"),
html: T.translate("edit_inventory_item.inventory_item_created")
})
);
});
Expand Down
25 changes: 13 additions & 12 deletions src/actions/inventory-shared-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
createAction,
stopLoading,
startLoading,
authErrorHandler
snackbarErrorHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import { getAccessTokenSafely } from "../utils/methods";

Expand Down Expand Up @@ -68,7 +68,7 @@ export const saveMetaFieldTypes =
createAction(settings.updatedActionName),
`${settings.url}/${metaFieldType.id}`,
normalizedEntity,
authErrorHandler,
snackbarErrorHandler,
metaFieldType
)(params)(dispatch).then(() => {
if (
Expand All @@ -88,7 +88,7 @@ export const saveMetaFieldTypes =
createAction(settings.addedActionName),
settings.url,
normalizedEntity,
authErrorHandler,
snackbarErrorHandler,
metaFieldType
)(params)(dispatch).then(({ response }) => {
if (
Expand All @@ -104,6 +104,7 @@ export const saveMetaFieldTypes =

return Promise.all(promises).catch((err) => {
console.error(err);
throw err;
});
};

Expand All @@ -129,7 +130,7 @@ export const deleteMetaFieldType =
createAction(settings.deletedActionName)({ metaFieldId }),
`${settings.url}/${metaFieldId}`,
null,
authErrorHandler
snackbarErrorHandler
)(params)(dispatch).then(() => {
dispatch(stopLoading());
});
Expand Down Expand Up @@ -168,7 +169,7 @@ export const saveMetaFieldValues =
createAction(settings.updatedActionName),
`${settings.url}/${value.id}`,
normalizedEntity,
authErrorHandler,
snackbarErrorHandler,
value
)(params)(dispatch);
} else {
Expand All @@ -177,7 +178,7 @@ export const saveMetaFieldValues =
createAction(settings.addedActionName),
settings.url,
normalizedEntity,
authErrorHandler,
snackbarErrorHandler,
value
)(params)(dispatch);
}
Expand Down Expand Up @@ -209,7 +210,7 @@ export const deleteMetaFieldTypeValue =
}),
`${settings.url}${valueId}`,
null,
authErrorHandler
snackbarErrorHandler
)(params)(dispatch).then(() => {
dispatch(stopLoading());
});
Expand All @@ -236,7 +237,7 @@ export const saveFiles =
createAction(settings.updatedActionName),
`${settings.url}${file.id}/`,
file,
authErrorHandler,
snackbarErrorHandler,
file
)(params)(dispatch);
}
Expand All @@ -245,7 +246,7 @@ export const saveFiles =
createAction(settings.addedActionName),
settings.url,
file,
authErrorHandler,
snackbarErrorHandler,
file
)(params)(dispatch);
});
Expand Down Expand Up @@ -275,7 +276,7 @@ export const deleteFile =
createAction(settings.deletedActionName)({ fileId }),
`${settings.url}/${fileId}`,
null,
authErrorHandler
snackbarErrorHandler
)(params)(dispatch).then(() => {
dispatch(stopLoading());
});
Expand All @@ -294,7 +295,7 @@ export const archiveItem =
createAction(settings.updatedActionName),
`${settings.url}`,
item,
authErrorHandler,
snackbarErrorHandler,
item
)(params)(dispatch);
};
Expand All @@ -312,7 +313,7 @@ export const unarchiveItem =
createAction(settings.deletedActionName)(item.id),
`${settings.url}`,
null,
authErrorHandler,
snackbarErrorHandler,
item
)(params)(dispatch).then(() => {
dispatch(stopLoading());
Expand Down
Loading