@scrumble-nl/gatherer-frontend 1.1.2-beta.5 → 1.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/pick-list/pick-list.js +29 -41
- package/lib/commonjs/pick-list/pick-list.js.map +1 -1
- package/lib/commonjs/shared/api/api-urls.js +1 -1
- package/lib/commonjs/shared/api/api-urls.js.map +1 -1
- package/lib/module/pick-list/pick-list.js +30 -42
- package/lib/module/pick-list/pick-list.js.map +1 -1
- package/lib/module/shared/api/api-urls.js +1 -1
- package/lib/module/shared/api/api-urls.js.map +1 -1
- package/lib/typescript/pick-list/pick-list.d.ts +1 -0
- package/package.json +1 -1
- package/src/pick-list/pick-list.tsx +40 -38
- package/src/shared/api/api-urls.ts +1 -1
|
@@ -7,91 +7,79 @@ exports.PickList = void 0;
|
|
|
7
7
|
var _react = _interopRequireWildcard(require("react"));
|
|
8
8
|
var _reactNative = require("react-native");
|
|
9
9
|
var _reactI18next = require("react-i18next");
|
|
10
|
+
var _search = require("./partials/search");
|
|
10
11
|
var _emptyList = require("./partials/empty-list");
|
|
11
12
|
var _useGatherer = require("../hooks/use-gatherer");
|
|
12
|
-
var _apiUrls = require("../shared/api/api-urls");
|
|
13
13
|
var _pickGroupItem = require("./partials/pick-group-item");
|
|
14
|
+
var _apiUrls = require("../shared/api/api-urls");
|
|
14
15
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
15
16
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
16
17
|
const PickList = props => {
|
|
17
18
|
const {
|
|
18
19
|
renderItem,
|
|
19
|
-
onItemPress
|
|
20
|
+
onItemPress,
|
|
21
|
+
isAfterPickList,
|
|
22
|
+
shouldRefresh
|
|
20
23
|
} = props;
|
|
21
24
|
const [loading, setLoading] = (0, _react.useState)(true);
|
|
22
25
|
const [pickList, setPickList] = (0, _react.useState)([]);
|
|
23
26
|
const ignoreCurrentRequest = (0, _react.useRef)(true);
|
|
27
|
+
const isInitialRender = (0, _react.useRef)(true);
|
|
24
28
|
const {
|
|
25
29
|
instance
|
|
26
30
|
} = (0, _useGatherer.useGatherer)();
|
|
27
31
|
const {
|
|
28
32
|
t
|
|
29
33
|
} = (0, _reactI18next.useTranslation)();
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
// searchValue: searchValueParam,
|
|
41
|
-
// })
|
|
42
|
-
// .then(response => setPickList(response.data.pick_groups))
|
|
43
|
-
// .catch(error => {
|
|
44
|
-
// console.log('error picklist search', error);
|
|
45
|
-
// ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
46
|
-
// })
|
|
47
|
-
// .finally(() => setLoading(false));
|
|
48
|
-
// },
|
|
49
|
-
// [instance, isAfterPickList],
|
|
50
|
-
// );
|
|
51
|
-
|
|
34
|
+
const getPickListWithSearch = (0, _react.useCallback)((searchFieldParam, searchValueParam) => {
|
|
35
|
+
const url = isAfterPickList ? _apiUrls.GET_AFTER_PICKLIST_URL : _apiUrls.GET_PICKLIST_URL;
|
|
36
|
+
setLoading(true);
|
|
37
|
+
instance.post(url, {
|
|
38
|
+
searchField: searchFieldParam,
|
|
39
|
+
searchValue: searchValueParam
|
|
40
|
+
}).then(response => setPickList(response.data.pick_groups)).catch(error => {
|
|
41
|
+
_reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG);
|
|
42
|
+
}).finally(() => setLoading(false));
|
|
43
|
+
}, [instance, isAfterPickList]);
|
|
52
44
|
const getPickList = (0, _react.useCallback)(() => {
|
|
53
|
-
console.log(2, 'getpicklist');
|
|
54
45
|
setLoading(true);
|
|
55
46
|
instance.post(_apiUrls.GET_PICKLIST_URL).then(response => {
|
|
56
|
-
console.log(3, 'picklist then');
|
|
57
47
|
if (!ignoreCurrentRequest.current) {
|
|
58
48
|
setPickList(response.data.pick_groups);
|
|
59
49
|
}
|
|
60
|
-
}).catch(
|
|
50
|
+
}).catch(() => _reactNative.ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', _reactNative.ToastAndroid.SHORT)).finally(() => setLoading(false));
|
|
61
51
|
}, [instance]);
|
|
62
52
|
(0, _react.useEffect)(() => {
|
|
63
|
-
console.log(1, 'effect init');
|
|
64
53
|
ignoreCurrentRequest.current = false;
|
|
65
|
-
|
|
54
|
+
if (isInitialRender.current || shouldRefresh) {
|
|
55
|
+
getPickList();
|
|
56
|
+
}
|
|
57
|
+
isInitialRender.current = false;
|
|
66
58
|
return () => {
|
|
67
|
-
console.log(99, 'effect return');
|
|
68
59
|
ignoreCurrentRequest.current = true;
|
|
69
60
|
};
|
|
70
|
-
}, [getPickList, instance]);
|
|
61
|
+
}, [getPickList, instance, shouldRefresh]);
|
|
71
62
|
const renderPickGroupItem = renderProps => {
|
|
72
63
|
return /*#__PURE__*/_react.default.createElement(_pickGroupItem.PickGroupItem, {
|
|
73
64
|
onPress: onItemPress,
|
|
74
65
|
renderProps: renderProps
|
|
75
66
|
});
|
|
76
67
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
// getPickListWithSearch('', search);
|
|
81
|
-
// },
|
|
82
|
-
// [getPickListWithSearch],
|
|
83
|
-
// );
|
|
84
|
-
|
|
68
|
+
const handlePickListFromSearch = (0, _react.useCallback)(search => {
|
|
69
|
+
getPickListWithSearch('', search);
|
|
70
|
+
}, [getPickListWithSearch]);
|
|
85
71
|
return /*#__PURE__*/_react.default.createElement(_reactNative.FlatList, {
|
|
86
72
|
refreshing: loading,
|
|
87
|
-
onRefresh:
|
|
73
|
+
onRefresh: getPickListWithSearch,
|
|
88
74
|
data: pickList,
|
|
89
75
|
renderItem: renderItem ?? renderPickGroupItem,
|
|
90
76
|
keyExtractor: pickGroup => pickGroup.id.toString(),
|
|
91
77
|
ListEmptyComponent: /*#__PURE__*/_react.default.createElement(_emptyList.EmptyList, {
|
|
92
78
|
text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
|
|
79
|
+
}),
|
|
80
|
+
ListHeaderComponent: /*#__PURE__*/_react.default.createElement(_search.Search, {
|
|
81
|
+
onSearch: handlePickListFromSearch
|
|
93
82
|
})
|
|
94
|
-
// ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
|
|
95
83
|
});
|
|
96
84
|
};
|
|
97
85
|
exports.PickList = PickList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PickList","props","renderItem","onItemPress","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","instance","useGatherer","t","useTranslation","
|
|
1
|
+
{"version":3,"names":["PickList","props","renderItem","onItemPress","isAfterPickList","shouldRefresh","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","isInitialRender","instance","useGatherer","t","useTranslation","getPickListWithSearch","useCallback","searchFieldParam","searchValueParam","url","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","post","searchField","searchValue","then","response","data","pick_groups","catch","error","ToastAndroid","show","LONG","finally","getPickList","current","SHORT","useEffect","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {Search} from './partials/search';\nimport {EmptyList} from './partials/empty-list';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props<T> {\n isAfterPickList?: boolean;\n shouldRefresh?: boolean;\n renderItem?: ListRenderItem<T>;\n onItemPress?: (pickGroup: T) => void;\n}\n\nexport const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {renderItem, onItemPress, isAfterPickList, shouldRefresh} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\n const ignoreCurrentRequest = useRef(true);\n const isInitialRender = useRef(true);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n const getPickListWithSearch = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n setLoading(true);\n\n instance\n .post(url, {\n searchField: searchFieldParam,\n searchValue: searchValueParam,\n })\n .then(response => setPickList(response.data.pick_groups))\n .catch(error => {\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n })\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n const getPickList = useCallback(() => {\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(() => ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', ToastAndroid.SHORT))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (isInitialRender.current || shouldRefresh) {\n getPickList();\n }\n\n isInitialRender.current = false;\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, shouldRefresh]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n getPickListWithSearch('', search);\n },\n [getPickListWithSearch],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={getPickListWithSearch}\n data={pickList}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;
|
|
|
15
15
|
exports.SET_ITEM_PICKED_URL = SET_ITEM_PICKED_URL;
|
|
16
16
|
const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;
|
|
17
17
|
exports.PREV_PICK_ITEM_URL = PREV_PICK_ITEM_URL;
|
|
18
|
-
const GET_AFTER_PICKLIST_URL = `${BASE_URL}/
|
|
18
|
+
const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;
|
|
19
19
|
exports.GET_AFTER_PICKLIST_URL = GET_AFTER_PICKLIST_URL;
|
|
20
20
|
const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;
|
|
21
21
|
exports.SET_GROUP_PICKED_URL = SET_GROUP_PICKED_URL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BASE_URL","GET_PICKLIST_URL","NEXT_PICK_ITEM_URL","START_PICKING_URL","SET_ITEM_PICKED_URL","PREV_PICK_ITEM_URL","GET_AFTER_PICKLIST_URL","SET_GROUP_PICKED_URL"],"sources":["api-urls.ts"],"sourcesContent":["const BASE_URL = '/api/gatherer';\n\nexport const GET_PICKLIST_URL = `${BASE_URL}/picklist`;\nexport const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;\nexport const START_PICKING_URL = `${BASE_URL}/pick-group/start`;\nexport const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;\nexport const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;\nexport const GET_AFTER_PICKLIST_URL = `${BASE_URL}/
|
|
1
|
+
{"version":3,"names":["BASE_URL","GET_PICKLIST_URL","NEXT_PICK_ITEM_URL","START_PICKING_URL","SET_ITEM_PICKED_URL","PREV_PICK_ITEM_URL","GET_AFTER_PICKLIST_URL","SET_GROUP_PICKED_URL"],"sources":["api-urls.ts"],"sourcesContent":["const BASE_URL = '/api/gatherer';\n\nexport const GET_PICKLIST_URL = `${BASE_URL}/picklist`;\nexport const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;\nexport const START_PICKING_URL = `${BASE_URL}/pick-group/start`;\nexport const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;\nexport const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;\nexport const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;\nexport const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;\n"],"mappings":";;;;;;AAAA,MAAMA,QAAQ,GAAG,eAAe;AAEzB,MAAMC,gBAAgB,GAAI,GAAED,QAAS,WAAU;AAAC;AAChD,MAAME,kBAAkB,GAAI,GAAEF,QAAS,iBAAgB;AAAC;AACxD,MAAMG,iBAAiB,GAAI,GAAEH,QAAS,mBAAkB;AAAC;AACzD,MAAMI,mBAAmB,GAAI,GAAEJ,QAAS,mBAAkB;AAAC;AAC3D,MAAMK,kBAAkB,GAAI,GAAEL,QAAS,qBAAoB;AAAC;AAC5D,MAAMM,sBAAsB,GAAI,GAAEN,QAAS,yBAAwB;AAAC;AACpE,MAAMO,oBAAoB,GAAI,GAAEP,QAAS,oBAAmB;AAAC"}
|
|
@@ -1,89 +1,77 @@
|
|
|
1
1
|
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
2
|
-
import { FlatList } from 'react-native';
|
|
2
|
+
import { FlatList, ToastAndroid } from 'react-native';
|
|
3
3
|
import { useTranslation } from 'react-i18next';
|
|
4
|
+
import { Search } from './partials/search';
|
|
4
5
|
import { EmptyList } from './partials/empty-list';
|
|
5
6
|
import { useGatherer } from '../hooks/use-gatherer';
|
|
6
|
-
import { GET_PICKLIST_URL } from '../shared/api/api-urls';
|
|
7
7
|
import { PickGroupItem } from './partials/pick-group-item';
|
|
8
|
+
import { GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL } from '../shared/api/api-urls';
|
|
8
9
|
export const PickList = props => {
|
|
9
10
|
const {
|
|
10
11
|
renderItem,
|
|
11
|
-
onItemPress
|
|
12
|
+
onItemPress,
|
|
13
|
+
isAfterPickList,
|
|
14
|
+
shouldRefresh
|
|
12
15
|
} = props;
|
|
13
16
|
const [loading, setLoading] = useState(true);
|
|
14
17
|
const [pickList, setPickList] = useState([]);
|
|
15
18
|
const ignoreCurrentRequest = useRef(true);
|
|
19
|
+
const isInitialRender = useRef(true);
|
|
16
20
|
const {
|
|
17
21
|
instance
|
|
18
22
|
} = useGatherer();
|
|
19
23
|
const {
|
|
20
24
|
t
|
|
21
25
|
} = useTranslation();
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
// searchValue: searchValueParam,
|
|
33
|
-
// })
|
|
34
|
-
// .then(response => setPickList(response.data.pick_groups))
|
|
35
|
-
// .catch(error => {
|
|
36
|
-
// console.log('error picklist search', error);
|
|
37
|
-
// ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
38
|
-
// })
|
|
39
|
-
// .finally(() => setLoading(false));
|
|
40
|
-
// },
|
|
41
|
-
// [instance, isAfterPickList],
|
|
42
|
-
// );
|
|
43
|
-
|
|
26
|
+
const getPickListWithSearch = useCallback((searchFieldParam, searchValueParam) => {
|
|
27
|
+
const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
|
|
28
|
+
setLoading(true);
|
|
29
|
+
instance.post(url, {
|
|
30
|
+
searchField: searchFieldParam,
|
|
31
|
+
searchValue: searchValueParam
|
|
32
|
+
}).then(response => setPickList(response.data.pick_groups)).catch(error => {
|
|
33
|
+
ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
34
|
+
}).finally(() => setLoading(false));
|
|
35
|
+
}, [instance, isAfterPickList]);
|
|
44
36
|
const getPickList = useCallback(() => {
|
|
45
|
-
console.log(2, 'getpicklist');
|
|
46
37
|
setLoading(true);
|
|
47
38
|
instance.post(GET_PICKLIST_URL).then(response => {
|
|
48
|
-
console.log(3, 'picklist then');
|
|
49
39
|
if (!ignoreCurrentRequest.current) {
|
|
50
40
|
setPickList(response.data.pick_groups);
|
|
51
41
|
}
|
|
52
|
-
}).catch(
|
|
42
|
+
}).catch(() => ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', ToastAndroid.SHORT)).finally(() => setLoading(false));
|
|
53
43
|
}, [instance]);
|
|
54
44
|
useEffect(() => {
|
|
55
|
-
console.log(1, 'effect init');
|
|
56
45
|
ignoreCurrentRequest.current = false;
|
|
57
|
-
|
|
46
|
+
if (isInitialRender.current || shouldRefresh) {
|
|
47
|
+
getPickList();
|
|
48
|
+
}
|
|
49
|
+
isInitialRender.current = false;
|
|
58
50
|
return () => {
|
|
59
|
-
console.log(99, 'effect return');
|
|
60
51
|
ignoreCurrentRequest.current = true;
|
|
61
52
|
};
|
|
62
|
-
}, [getPickList, instance]);
|
|
53
|
+
}, [getPickList, instance, shouldRefresh]);
|
|
63
54
|
const renderPickGroupItem = renderProps => {
|
|
64
55
|
return /*#__PURE__*/React.createElement(PickGroupItem, {
|
|
65
56
|
onPress: onItemPress,
|
|
66
57
|
renderProps: renderProps
|
|
67
58
|
});
|
|
68
59
|
};
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
// getPickListWithSearch('', search);
|
|
73
|
-
// },
|
|
74
|
-
// [getPickListWithSearch],
|
|
75
|
-
// );
|
|
76
|
-
|
|
60
|
+
const handlePickListFromSearch = useCallback(search => {
|
|
61
|
+
getPickListWithSearch('', search);
|
|
62
|
+
}, [getPickListWithSearch]);
|
|
77
63
|
return /*#__PURE__*/React.createElement(FlatList, {
|
|
78
64
|
refreshing: loading,
|
|
79
|
-
onRefresh:
|
|
65
|
+
onRefresh: getPickListWithSearch,
|
|
80
66
|
data: pickList,
|
|
81
67
|
renderItem: renderItem ?? renderPickGroupItem,
|
|
82
68
|
keyExtractor: pickGroup => pickGroup.id.toString(),
|
|
83
69
|
ListEmptyComponent: /*#__PURE__*/React.createElement(EmptyList, {
|
|
84
70
|
text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
|
|
71
|
+
}),
|
|
72
|
+
ListHeaderComponent: /*#__PURE__*/React.createElement(Search, {
|
|
73
|
+
onSearch: handlePickListFromSearch
|
|
85
74
|
})
|
|
86
|
-
// ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
|
|
87
75
|
});
|
|
88
76
|
};
|
|
89
77
|
//# sourceMappingURL=pick-list.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useEffect","useRef","useState","FlatList","useTranslation","EmptyList","useGatherer","
|
|
1
|
+
{"version":3,"names":["React","useCallback","useEffect","useRef","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useGatherer","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","renderItem","onItemPress","isAfterPickList","shouldRefresh","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","isInitialRender","instance","t","getPickListWithSearch","searchFieldParam","searchValueParam","url","post","searchField","searchValue","then","response","data","pick_groups","catch","error","show","LONG","finally","getPickList","current","SHORT","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {Search} from './partials/search';\nimport {EmptyList} from './partials/empty-list';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props<T> {\n isAfterPickList?: boolean;\n shouldRefresh?: boolean;\n renderItem?: ListRenderItem<T>;\n onItemPress?: (pickGroup: T) => void;\n}\n\nexport const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {renderItem, onItemPress, isAfterPickList, shouldRefresh} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\n const ignoreCurrentRequest = useRef(true);\n const isInitialRender = useRef(true);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n const getPickListWithSearch = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n setLoading(true);\n\n instance\n .post(url, {\n searchField: searchFieldParam,\n searchValue: searchValueParam,\n })\n .then(response => setPickList(response.data.pick_groups))\n .catch(error => {\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n })\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n const getPickList = useCallback(() => {\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(() => ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', ToastAndroid.SHORT))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (isInitialRender.current || shouldRefresh) {\n getPickList();\n }\n\n isInitialRender.current = false;\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, shouldRefresh]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n getPickListWithSearch('', search);\n },\n [getPickListWithSearch],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={getPickListWithSearch}\n data={pickList}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
|
|
@@ -4,6 +4,6 @@ export const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;
|
|
|
4
4
|
export const START_PICKING_URL = `${BASE_URL}/pick-group/start`;
|
|
5
5
|
export const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;
|
|
6
6
|
export const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;
|
|
7
|
-
export const GET_AFTER_PICKLIST_URL = `${BASE_URL}/
|
|
7
|
+
export const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;
|
|
8
8
|
export const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;
|
|
9
9
|
//# sourceMappingURL=api-urls.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BASE_URL","GET_PICKLIST_URL","NEXT_PICK_ITEM_URL","START_PICKING_URL","SET_ITEM_PICKED_URL","PREV_PICK_ITEM_URL","GET_AFTER_PICKLIST_URL","SET_GROUP_PICKED_URL"],"sources":["api-urls.ts"],"sourcesContent":["const BASE_URL = '/api/gatherer';\n\nexport const GET_PICKLIST_URL = `${BASE_URL}/picklist`;\nexport const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;\nexport const START_PICKING_URL = `${BASE_URL}/pick-group/start`;\nexport const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;\nexport const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;\nexport const GET_AFTER_PICKLIST_URL = `${BASE_URL}/
|
|
1
|
+
{"version":3,"names":["BASE_URL","GET_PICKLIST_URL","NEXT_PICK_ITEM_URL","START_PICKING_URL","SET_ITEM_PICKED_URL","PREV_PICK_ITEM_URL","GET_AFTER_PICKLIST_URL","SET_GROUP_PICKED_URL"],"sources":["api-urls.ts"],"sourcesContent":["const BASE_URL = '/api/gatherer';\n\nexport const GET_PICKLIST_URL = `${BASE_URL}/picklist`;\nexport const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;\nexport const START_PICKING_URL = `${BASE_URL}/pick-group/start`;\nexport const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;\nexport const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;\nexport const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;\nexport const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;\n"],"mappings":"AAAA,MAAMA,QAAQ,GAAG,eAAe;AAEhC,OAAO,MAAMC,gBAAgB,GAAI,GAAED,QAAS,WAAU;AACtD,OAAO,MAAME,kBAAkB,GAAI,GAAEF,QAAS,iBAAgB;AAC9D,OAAO,MAAMG,iBAAiB,GAAI,GAAEH,QAAS,mBAAkB;AAC/D,OAAO,MAAMI,mBAAmB,GAAI,GAAEJ,QAAS,mBAAkB;AACjE,OAAO,MAAMK,kBAAkB,GAAI,GAAEL,QAAS,qBAAoB;AAClE,OAAO,MAAMM,sBAAsB,GAAI,GAAEN,QAAS,yBAAwB;AAC1E,OAAO,MAAMO,oBAAoB,GAAI,GAAEP,QAAS,oBAAmB"}
|
package/package.json
CHANGED
|
@@ -1,96 +1,98 @@
|
|
|
1
1
|
import React, {useCallback, useEffect, useRef, useState} from 'react';
|
|
2
|
-
import {FlatList, ListRenderItem, ListRenderItemInfo} from 'react-native';
|
|
2
|
+
import {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';
|
|
3
3
|
|
|
4
4
|
import {useTranslation} from 'react-i18next';
|
|
5
5
|
|
|
6
|
+
import {Search} from './partials/search';
|
|
6
7
|
import {EmptyList} from './partials/empty-list';
|
|
7
8
|
import {useGatherer} from '../hooks/use-gatherer';
|
|
8
|
-
import {GET_PICKLIST_URL} from '../shared/api/api-urls';
|
|
9
9
|
import {PickGroupItem} from './partials/pick-group-item';
|
|
10
|
+
import {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';
|
|
10
11
|
|
|
11
12
|
interface props<T> {
|
|
12
13
|
isAfterPickList?: boolean;
|
|
14
|
+
shouldRefresh?: boolean;
|
|
13
15
|
renderItem?: ListRenderItem<T>;
|
|
14
16
|
onItemPress?: (pickGroup: T) => void;
|
|
15
17
|
}
|
|
16
18
|
|
|
17
19
|
export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
|
|
18
|
-
const {renderItem, onItemPress} = props;
|
|
20
|
+
const {renderItem, onItemPress, isAfterPickList, shouldRefresh} = props;
|
|
19
21
|
const [loading, setLoading] = useState<boolean>(true);
|
|
20
22
|
const [pickList, setPickList] = useState<T[]>([]);
|
|
21
23
|
const ignoreCurrentRequest = useRef(true);
|
|
24
|
+
const isInitialRender = useRef(true);
|
|
22
25
|
const {instance} = useGatherer();
|
|
23
26
|
const {t} = useTranslation();
|
|
24
27
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
// );
|
|
28
|
+
const getPickListWithSearch = useCallback(
|
|
29
|
+
(searchFieldParam?: string, searchValueParam?: string): void => {
|
|
30
|
+
const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
|
|
31
|
+
|
|
32
|
+
setLoading(true);
|
|
33
|
+
|
|
34
|
+
instance
|
|
35
|
+
.post(url, {
|
|
36
|
+
searchField: searchFieldParam,
|
|
37
|
+
searchValue: searchValueParam,
|
|
38
|
+
})
|
|
39
|
+
.then(response => setPickList(response.data.pick_groups))
|
|
40
|
+
.catch(error => {
|
|
41
|
+
ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
42
|
+
})
|
|
43
|
+
.finally(() => setLoading(false));
|
|
44
|
+
},
|
|
45
|
+
[instance, isAfterPickList],
|
|
46
|
+
);
|
|
45
47
|
|
|
46
48
|
const getPickList = useCallback(() => {
|
|
47
|
-
console.log(2, 'getpicklist');
|
|
48
49
|
setLoading(true);
|
|
49
50
|
|
|
50
51
|
instance
|
|
51
52
|
.post(GET_PICKLIST_URL)
|
|
52
53
|
.then(response => {
|
|
53
|
-
console.log(3, 'picklist then');
|
|
54
54
|
if (!ignoreCurrentRequest.current) {
|
|
55
55
|
setPickList(response.data.pick_groups);
|
|
56
56
|
}
|
|
57
57
|
})
|
|
58
|
-
.catch(
|
|
58
|
+
.catch(() => ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', ToastAndroid.SHORT))
|
|
59
59
|
.finally(() => setLoading(false));
|
|
60
60
|
}, [instance]);
|
|
61
61
|
|
|
62
62
|
useEffect(() => {
|
|
63
|
-
console.log(1, 'effect init');
|
|
64
63
|
ignoreCurrentRequest.current = false;
|
|
65
64
|
|
|
66
|
-
|
|
65
|
+
if (isInitialRender.current || shouldRefresh) {
|
|
66
|
+
getPickList();
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
isInitialRender.current = false;
|
|
67
70
|
|
|
68
71
|
return () => {
|
|
69
|
-
console.log(99, 'effect return');
|
|
70
72
|
ignoreCurrentRequest.current = true;
|
|
71
73
|
};
|
|
72
|
-
}, [getPickList, instance]);
|
|
74
|
+
}, [getPickList, instance, shouldRefresh]);
|
|
73
75
|
|
|
74
76
|
const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {
|
|
75
77
|
return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;
|
|
76
78
|
};
|
|
77
79
|
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
80
|
+
const handlePickListFromSearch = useCallback(
|
|
81
|
+
(search: string): void => {
|
|
82
|
+
getPickListWithSearch('', search);
|
|
83
|
+
},
|
|
84
|
+
[getPickListWithSearch],
|
|
85
|
+
);
|
|
84
86
|
|
|
85
87
|
return (
|
|
86
88
|
<FlatList
|
|
87
89
|
refreshing={loading}
|
|
88
|
-
onRefresh={
|
|
90
|
+
onRefresh={getPickListWithSearch}
|
|
89
91
|
data={pickList}
|
|
90
92
|
renderItem={renderItem ?? renderPickGroupItem}
|
|
91
93
|
keyExtractor={pickGroup => pickGroup.id.toString()}
|
|
92
94
|
ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}
|
|
93
|
-
|
|
95
|
+
ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
|
|
94
96
|
/>
|
|
95
97
|
);
|
|
96
98
|
};
|
|
@@ -5,5 +5,5 @@ export const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;
|
|
|
5
5
|
export const START_PICKING_URL = `${BASE_URL}/pick-group/start`;
|
|
6
6
|
export const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;
|
|
7
7
|
export const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;
|
|
8
|
-
export const GET_AFTER_PICKLIST_URL = `${BASE_URL}/
|
|
8
|
+
export const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;
|
|
9
9
|
export const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;
|