QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 13:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/_tasks'

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-07-01 15:01:08 +02:00
parent 4718f63c94 aac138aa18
commit c226788b09
30 changed files with 533 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/store/customers/customers.actions.js
View File

@@ -107,3 +107,19 @@ export const deleteCustomer = ({ id }) => {
});
};
export const deleteBulkCustomers = ({ ids }) => {
return (dispatch) =>
new Promise((resolve, reject) => {
ApiService.delete('customers', { params: { ids } })
.then((response) => {
dispatch({
type: t.CUSTOMERS_BULK_DELETE,
payload: { ids },
});
resolve(response);
})
.catch((error) => {
reject(error.response.data.errors || []);
});
});
};

11
client/src/store/customers/customers.reducer.js
View File

@@ -40,6 +40,17 @@ const customersReducer = createReducer(initialState, {
const { loading } = action.payload;
state.loading = !!loading;
},
[t.CUSTOMERS_BULK_DELETE]: (state, action) => {
const { ids } = action.payload;
const items = { ...state.items };
ids.forEach((id) => {
if (typeof items[id] !== 'undefined') {
delete items[id];
}
});
state.items = items;
},
});
export default createTableQueryReducers('customers', customersReducer);

3
client/src/store/customers/customers.type.js
View File

@@ -4,5 +4,6 @@ export default {
CUSTOMERS_PAGE_SET: 'CUSTOMERS_PAGE_SET',
CUSTOMERS_TABLE_LOADING: 'CUSTOMERS_TABLE_LOADING',
CUSTOMERS_TABLE_QUERIES_ADD: 'CUSTOMERS_TABLE_QUERIES_ADD',
CUSTOMER_DELETE:'CUSTOMER_DELETE'
CUSTOMER_DELETE:'CUSTOMER_DELETE',
CUSTOMERS_BULK_DELETE:'CUSTOMERS_BULK_DELETE'
};

2
client/src/store/expenses/expenses.actions.js
View File

@@ -122,7 +122,7 @@ export const deleteExpense = ({ id }) => {
export const deleteBulkExpenses = ({ ids }) => {
return (dispatch) =>
new Promise((resolve, reject) => {
ApiService.delete('expenses/bulk', { params: { ids } })
ApiService.delete('expenses', { params: { ids } })
.then((response) => {
dispatch({
type: t.EXPENSES_BULK_DELETE,

120
client/src/store/items/items.actions.js
View File

@@ -2,93 +2,101 @@ import ApiService from 'services/ApiService';
import t from 'store/types';
export const submitItem = ({ form }) => {
return dispatch => ApiService.post(`items`, form);
return (dispatch) => ApiService.post(`items`, form);
};
export const editItem = ({ id, form }) => {
return dispatch => ApiService.post(`items/${id}`, form);
return (dispatch) => ApiService.post(`items/${id}`, form);
};
export const fetchItems = ({ query }) => {
return (dispatch, getState) => new Promise((resolve, reject) => {
const pageQuery = getState().items.tableQuery;
return (dispatch, getState) =>
new Promise((resolve, reject) => {
const pageQuery = getState().items.tableQuery;
dispatch({
type: t.ITEMS_TABLE_LOADING,
payload: { loading: true },
});
dispatch({
type: t.SET_DASHBOARD_REQUEST_LOADING,
});
ApiService.get(`items`, { params: { ...pageQuery, ...query } }).then(response => {
dispatch({
type: t.ITEMS_SET,
items: response.data.items.results,
});
dispatch({
type: t.ITEMS_PAGE_SET,
items: response.data.items.results,
customViewId: response.data.customViewId,
paginationMeta: response.data.items.pagination,
});
dispatch({
type: t.ITEMS_TABLE_LOADING,
payload: { loading: false },
payload: { loading: true },
});
dispatch({
type: t.SET_DASHBOARD_REQUEST_COMPLETED,
type: t.SET_DASHBOARD_REQUEST_LOADING,
});
resolve(response);
}).catch((error) => {
dispatch({
type: t.SET_DASHBOARD_REQUEST_COMPLETED,
});
reject(error);
ApiService.get(`items`, { params: { ...pageQuery, ...query } })
.then((response) => {
dispatch({
type: t.ITEMS_SET,
items: response.data.items.results,
});
dispatch({
type: t.ITEMS_PAGE_SET,
items: response.data.items.results,
customViewId: response.data.customViewId,
paginationMeta: response.data.items.pagination,
});
dispatch({
type: t.ITEMS_TABLE_LOADING,
payload: { loading: false },
});
dispatch({
type: t.SET_DASHBOARD_REQUEST_COMPLETED,
});
resolve(response);
})
.catch((error) => {
dispatch({
type: t.SET_DASHBOARD_REQUEST_COMPLETED,
});
reject(error);
});
});
});
};
export const fetchItem = ({ id }) => {
return dispatch =>
return (dispatch) =>
new Promise((resolve, reject) => {
ApiService.get(`items/${id}`)
.then(response => {
.then((response) => {
dispatch({
type: t.ITEM_SET,
item: response.data.item
item: response.data.item,
});
})
.catch(error => {
.catch((error) => {
reject(error);
});
});
};
export const deleteItem = ({ id }) => {
return dispatch => new Promise((resolve, reject) => {
ApiService.delete(`items/${id}`)
.then((response) => {
dispatch({
type: t.ITEM_DELETE,
payload: { id },
return (dispatch) =>
new Promise((resolve, reject) => {
ApiService.delete(`items/${id}`)
.then((response) => {
dispatch({
type: t.ITEM_DELETE,
payload: { id },
});
resolve(response);
})
.catch((error) => {
reject(error);
});
resolve(response);
}).catch((error) => { reject(error); });
});
});
};
export const deleteBulkItems = ({ ids }) => {
return dispatch => new Promise((resolve, reject) => {
ApiService.delete(`items`, { params: { ids }}).then((response) => {
dispatch({
type: t.ITEMS_BULK_DELETE,
payload: { ids }
});
resolve(response);
}).catch((error) => {
reject(error);
return (dispatch) =>
new Promise((resolve, reject) => {
ApiService.delete('items', { params: { ids } })
.then((response) => {
dispatch({
type: t.ITEMS_BULK_DELETE,
payload: { ids },
});
resolve(response);
})
.catch((error) => {
reject(error.response.data.errors || []);
});
});
});
};

30
client/src/store/items/items.reducer.js
View File

@@ -1,8 +1,6 @@
import t from 'store/types';
import { createReducer } from '@reduxjs/toolkit';
import {
getItemsViewPages,
} from 'store/items/items.selectors';
import { getItemsViewPages } from 'store/items/items.selectors';
import { createTableQueryReducers } from 'store/queryReducers';
const initialState = {
@@ -20,7 +18,7 @@ const itemsReducer = createReducer(initialState, {
[t.ITEMS_SET]: (state, action) => {
const _items = {};
action.items.forEach(item => {
action.items.forEach((item) => {
_items[item.id] = item;
});
state.items = {
@@ -43,11 +41,11 @@ const itemsReducer = createReducer(initialState, {
if (typeof itemRelation === 'undefined') {
state.itemsRelation[item.id] = [];
}
const filteredRelation = state.itemsRelation[item.id]
.filter((relation) => (
const filteredRelation = state.itemsRelation[item.id].filter(
(relation) => (
relation.viewId === viewId &&
relation.pageNumber === paginationMeta.page
));
));
filteredRelation.push({
viewId,
@@ -61,10 +59,10 @@ const itemsReducer = createReducer(initialState, {
pages: {
...viewPages,
[paginationMeta.page]: {
ids: items.map(i => i.id),
ids: items.map((i) => i.id),
meta: paginationMeta,
},
},
},
};
},
@@ -93,9 +91,21 @@ const itemsReducer = createReducer(initialState, {
state.loading = !!loading;
},
[t.ITEMS_SET_CURRENT_VIEW]: (state, action) => {
[t.ITEMS_SET_CURRENT_VIEW]: (state, action) => {
state.currentViewId = action.currentViewId;
},
[t.ITEMS_BULK_DELETE]: (state, action) => {
const { ids } = action.payload;
const items = { ...state.items };
ids.forEach((id) => {
if (typeof items[id] !== 'undefined') {
delete items[id];
}
});
state.items = items;
},
});
export default createTableQueryReducers('items', itemsReducer);