Skip to content

Fixes issue with amendment state being retained in businesses #118

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
lesleychard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes issue with amendment state being retained in businesses #118

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
33 changes: 17 additions & 16 deletions components/modules/businesses/BusinessesTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,21 @@ const BusinessesTable = (props: Props): ReactElement => {
const onGridReady = (
{ api, columnApi } : { api: GridOptions['api'], columnApi: GridOptions['columnApi'] }
) => {
console.log('grid ready', api, columnApi);
setGridApi(api);
setColumnApi(columnApi);
setAmendmentTransactions();
};

useEffect(
() => {
console.log('grid api change', gridApi);
if (gridApi) {
setAmendmentTransactions();
gridApi.setRowData(originalData);
if (
transactions.adds.length
|| transactions.updates.length
|| transactions.deletes.length
) {
setAmendmentTransactions();
}
}
},
[gridApi]
Expand All @@ -126,7 +130,7 @@ const BusinessesTable = (props: Props): ReactElement => {
transactions.adds.forEach(transaction => {
newRowData.unshift({
...transaction,
editStatus: EditTransactionStatus.ADDED,
edit_status: EditTransactionStatus.ADDED,
});
});
}
Expand All @@ -135,7 +139,7 @@ const BusinessesTable = (props: Props): ReactElement => {
transactions.deletes.forEach(transaction => {
rowData.forEach((row, key) => {
if (row.id === transaction.id) {
newRowData[key].editStatus = EditTransactionStatus.DELETED;
newRowData[key].edit_status = EditTransactionStatus.DELETED;
}
});
});
Expand All @@ -146,7 +150,7 @@ const BusinessesTable = (props: Props): ReactElement => {
rowData.forEach((row, key) => {
if (row.id === transaction.id) {
newRowData[key] = transaction;
newRowData[key].editStatus = EditTransactionStatus.UPDATED;
newRowData[key].edit_status = EditTransactionStatus.UPDATED;
}
});
});
Expand Down Expand Up @@ -200,14 +204,14 @@ const BusinessesTable = (props: Props): ReactElement => {
cellClass = classes.cellActions;
}
// Amendment classes
if (params.data.editStatus) {
if (params.data.editStatus === EditTransactionStatus.ADDED) {
if (params.data.edit_status) {
if (params.data.edit_status === EditTransactionStatus.ADDED) {
cellClass = classes.cellAmendmentAdded;
}
if (params.data.editStatus === EditTransactionStatus.DELETED) {
if (params.data.edit_status === EditTransactionStatus.DELETED) {
cellClass = classes.cellAmendmentDeleted;
}
if (params.data.editStatus === EditTransactionStatus.UPDATED) {
if (params.data.edit_status === EditTransactionStatus.UPDATED) {
cellClass = classes.cellAmendmentUpdated;
}
}
Expand Down Expand Up @@ -467,16 +471,13 @@ const BusinessesTable = (props: Props): ReactElement => {
* @param gridApi Grid API
*/
const handleSingleRowRestore = (row: Business, gridApi: GridOptions['api']) => {
console.log(row);
console.log(gridApi);
if (gridApi && row.id) {
const newRowData = rowData;
rowData.forEach((r, key) => {
if (r.id === row.id) {
newRowData[key].editStatus = undefined;
newRowData[key].edit_status = undefined;
}
});
console.log('new data', newRowData);
gridApi.setRowData(newRowData);

const newDeletes = transactions.deletes.filter((deletedRow) => { return deletedRow.id !== row.id; });
Expand Down Expand Up @@ -644,7 +645,7 @@ const BusinessesTable = (props: Props): ReactElement => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const actionsCellRenderer = (params: any) => {
let type: 'add' | 'restore' | 'default' = params.data.id === 'add' ? 'add' : 'default';
if (params.data.editStatus === 'deleted') {
if (params.data.edit_status === 'deleted') {
type = 'restore';
}
return (
Expand Down
20 changes: 13 additions & 7 deletions pages/businesses.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,25 +295,31 @@ const Businesses = (): ReactElement => {

const handleConfirmBusinessUpdates = () => {
if (amendId) {
clearTransactionEditStatus();
dispatch(amendBusinessEdit(amendId, transactions));
}
else {
dispatch(addBusinessEdit({ ...transactions }));
}
};

const clearTransactionEditStatus = () => {
transactions.adds.forEach(row => {
row.edit_status = undefined;
});
transactions.updates.forEach(row => {
row.edit_status = undefined;
});
transactions.deletes.forEach(row => {
row.edit_status = undefined;
});
};

const handleSaveSuccessBack = () => {
setBusinessEditingEnabled(false);
setShowSuccess(false);
};

useEffect(
() => {
console.log(transactions);
},
[transactions]
);

useEffect(
() => {
if (showConfirmation && !businessEditState.loading) {
Expand Down
1 change: 1 addition & 0 deletions store/actions/business.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export const fetchBusinessesByRegionId = (id: string): BusinessThunkResult => {
});

const data = await response.json();

dispatch(fetchBusinessesByRegionIdSuccess(
data.businesses,
data.filters,
Expand Down