fix: Remove not used files and notes.

This commit is contained in:
Ahmed Bouhuolia
2020-06-13 19:12:24 +02:00
parent a849b9a945
commit ac9c360629
15 changed files with 57 additions and 519 deletions

View File

@@ -5,12 +5,11 @@ export const fetchExpensesTable = ({ query } = {}) => {
return (dispatch, getState) =>
new Promise((resolve, reject) => {
const pageQuery = getState().expenses.tableQuery;
dispatch({
type: t.SET_DASHBOARD_REQUEST_LOADING,
});
dispatch({
type: t.EXPENSES_TABLE_LOADING,
loading: true,
payload: {
loading: true,
},
});
ApiService.get('expenses', {
params: { ...pageQuery, ...query },
@@ -18,19 +17,22 @@ export const fetchExpensesTable = ({ query } = {}) => {
.then((response) => {
dispatch({
type: t.EXPENSES_PAGE_SET,
expenses: response.data.expenses.results,
customViewId: response.data.customViewId || -1,
payload: {
expenses: response.data.expenses.results,
customViewId: response.data.customViewId || -1,
},
});
dispatch({
type: t.EXPENSES_ITEMS_SET,
expenses: response.data.expenses.results,
payload: {
expenses: response.data.expenses.results,
}
});
dispatch({
type: t.EXPENSES_TABLE_LOADING,
loading: false,
});
dispatch({
type: t.SET_DASHBOARD_REQUEST_COMPLETED,
payload: {
loading: false,
},
});
resolve(response);
})

View File

@@ -18,7 +18,9 @@ const defaultExpense = {
const reducer = createReducer(initialState, {
[t.EXPENSE_SET]: (state, action) => {
const { id, expense } = action.payload;
state.items[id] = { ...defaultExpense, ...expense };
const oldExpense = state.items[id] || {};
state.items[id] = { ...defaultExpense, ...oldExpense, ...expense };
},
[t.EXPENSE_PUBLISH]: (state, action) => {
@@ -29,9 +31,10 @@ const reducer = createReducer(initialState, {
},
[t.EXPENSES_ITEMS_SET]: (state, action) => {
const { expenses } = action.payload;
const _expenses = {};
action.expenses.forEach((expense) => {
expenses.forEach((expense) => {
_expenses[expense.id] = {
...defaultExpense,
...expense,
@@ -44,17 +47,19 @@ const reducer = createReducer(initialState, {
},
[t.EXPENSES_PAGE_SET]: (state, action) => {
const viewId = action.customViewId || -1;
const { customViewId, expenses } = action.payload;
const viewId = customViewId || -1;
const view = state.views[viewId] || {};
state.views[viewId] = {
...view,
ids: action.expenses.map((i) => i.id),
ids: expenses.map((i) => i.id),
};
},
[t.EXPENSES_TABLE_LOADING]: (state, action) => {
state.loading = action.loading;
const { loading } = action.payload;
state.loading = loading;
},
[t.EXPENSES_SET_CURRENT_VIEW]: (state, action) => {
@@ -63,7 +68,6 @@ const reducer = createReducer(initialState, {
[t.EXPENSE_DELETE]: (state, action) => {
const { id } = action.payload;
// state.items = omit(state.items, [id]);
if (typeof state.items[id] !== 'undefined') {
delete state.items[id];