@scrumble-nl/gatherer-frontend 1.1.1 → 1.1.2-beta.1
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 +57 -24
- package/lib/commonjs/pick-list/pick-list.js.map +1 -1
- package/lib/module/pick-list/pick-list.js +58 -25
- package/lib/module/pick-list/pick-list.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 +59 -34
|
@@ -7,68 +7,101 @@ 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");
|
|
11
10
|
var _emptyList = require("./partials/empty-list");
|
|
12
11
|
var _useGatherer = require("../hooks/use-gatherer");
|
|
13
|
-
var _pickGroupItem = require("./partials/pick-group-item");
|
|
14
12
|
var _apiUrls = require("../shared/api/api-urls");
|
|
13
|
+
var _pickGroupItem = require("./partials/pick-group-item");
|
|
15
14
|
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); }
|
|
16
15
|
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; }
|
|
17
16
|
const PickList = props => {
|
|
18
17
|
const {
|
|
19
|
-
isAfterPickList,
|
|
20
18
|
renderItem,
|
|
21
|
-
onItemPress
|
|
19
|
+
onItemPress,
|
|
20
|
+
shouldRefresh
|
|
22
21
|
} = props;
|
|
23
22
|
const [loading, setLoading] = (0, _react.useState)(true);
|
|
24
23
|
const [pickList, setPickList] = (0, _react.useState)([]);
|
|
24
|
+
const ignoreCurrentRequest = (0, _react.useRef)(false);
|
|
25
25
|
const {
|
|
26
26
|
instance
|
|
27
27
|
} = (0, _useGatherer.useGatherer)();
|
|
28
28
|
const {
|
|
29
29
|
t
|
|
30
30
|
} = (0, _reactI18next.useTranslation)();
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
31
|
+
console.log(pickList);
|
|
32
|
+
|
|
33
|
+
// const getPickListWithSearch = useCallback(
|
|
34
|
+
// (searchFieldParam?: string, searchValueParam?: string): void => {
|
|
35
|
+
// const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
|
|
36
|
+
//
|
|
37
|
+
// setLoading(true);
|
|
38
|
+
//
|
|
39
|
+
// instance
|
|
40
|
+
// .post(url, {
|
|
41
|
+
// searchField: searchFieldParam,
|
|
42
|
+
// searchValue: searchValueParam,
|
|
43
|
+
// })
|
|
44
|
+
// .then(response => setPickList(response.data.pick_groups))
|
|
45
|
+
// .catch(error => {
|
|
46
|
+
// console.log('error picklist search', error);
|
|
47
|
+
// ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
48
|
+
// })
|
|
49
|
+
// .finally(() => setLoading(false));
|
|
50
|
+
// },
|
|
51
|
+
// [instance, isAfterPickList],
|
|
52
|
+
// );
|
|
53
|
+
|
|
54
|
+
const getPickList = (0, _react.useCallback)(() => {
|
|
41
55
|
setLoading(true);
|
|
42
56
|
instance.post(_apiUrls.GET_PICKLIST_URL).then(response => {
|
|
43
57
|
if (!ignoreCurrentRequest) {
|
|
44
58
|
setPickList(response.data.pick_groups);
|
|
45
59
|
}
|
|
46
|
-
}).catch(error =>
|
|
60
|
+
}).catch(error => {
|
|
61
|
+
console.log('error picklist initial', error);
|
|
62
|
+
_reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG);
|
|
63
|
+
}).finally(() => setLoading(false));
|
|
64
|
+
}, [instance]);
|
|
65
|
+
(0, _react.useEffect)(() => {
|
|
66
|
+
ignoreCurrentRequest.current = false;
|
|
67
|
+
if (shouldRefresh) {
|
|
68
|
+
getPickList();
|
|
69
|
+
}
|
|
47
70
|
return () => {
|
|
48
|
-
ignoreCurrentRequest = true;
|
|
71
|
+
ignoreCurrentRequest.current = true;
|
|
49
72
|
};
|
|
50
|
-
}, [
|
|
73
|
+
}, [getPickList, shouldRefresh]);
|
|
74
|
+
(0, _react.useEffect)(() => {
|
|
75
|
+
ignoreCurrentRequest.current = false;
|
|
76
|
+
getPickList();
|
|
77
|
+
return () => {
|
|
78
|
+
ignoreCurrentRequest.current = true;
|
|
79
|
+
};
|
|
80
|
+
}, [getPickList, instance]);
|
|
51
81
|
const renderPickGroupItem = renderProps => {
|
|
52
82
|
return /*#__PURE__*/_react.default.createElement(_pickGroupItem.PickGroupItem, {
|
|
53
83
|
onPress: onItemPress,
|
|
54
84
|
renderProps: renderProps
|
|
55
85
|
});
|
|
56
86
|
};
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
87
|
+
|
|
88
|
+
// const handlePickListFromSearch = useCallback(
|
|
89
|
+
// (search: string): void => {
|
|
90
|
+
// getPickListWithSearch('', search);
|
|
91
|
+
// },
|
|
92
|
+
// [getPickListWithSearch],
|
|
93
|
+
// );
|
|
94
|
+
|
|
60
95
|
return /*#__PURE__*/_react.default.createElement(_reactNative.FlatList, {
|
|
61
96
|
refreshing: loading,
|
|
62
|
-
onRefresh:
|
|
97
|
+
onRefresh: getPickList,
|
|
63
98
|
data: pickList,
|
|
64
99
|
renderItem: renderItem ?? renderPickGroupItem,
|
|
65
100
|
keyExtractor: pickGroup => pickGroup.id.toString(),
|
|
66
101
|
ListEmptyComponent: /*#__PURE__*/_react.default.createElement(_emptyList.EmptyList, {
|
|
67
102
|
text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
|
|
68
|
-
}),
|
|
69
|
-
ListHeaderComponent: /*#__PURE__*/_react.default.createElement(_search.Search, {
|
|
70
|
-
onSearch: handlePickListFromSearch
|
|
71
103
|
})
|
|
104
|
+
// ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
|
|
72
105
|
});
|
|
73
106
|
};
|
|
74
107
|
exports.PickList = PickList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PickList","props","
|
|
1
|
+
{"version":3,"names":["PickList","props","renderItem","onItemPress","shouldRefresh","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","instance","useGatherer","t","useTranslation","console","log","getPickList","useCallback","post","GET_PICKLIST_URL","then","response","data","pick_groups","catch","error","ToastAndroid","show","LONG","finally","useEffect","current","renderPickGroupItem","renderProps","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 {EmptyList} from './partials/empty-list';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {GET_PICKLIST_URL} from '../shared/api/api-urls';\nimport {PickGroupItem} from './partials/pick-group-item';\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, shouldRefresh} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\n const ignoreCurrentRequest = useRef(false);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n console.log(pickList);\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 // console.log('error picklist search', 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) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => {\n console.log('error picklist initial', error);\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n })\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (shouldRefresh) {\n getPickList();\n }\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, shouldRefresh]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList();\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance]);\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={getPickList}\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":";;;;;;AAAA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAAyD;AAAA;AASlD,MAAMA,QAAQ,GAAyBC,KAAe,IAAkB;EAC3E,MAAM;IAACC,UAAU;IAAEC,WAAW;IAAEC;EAAa,CAAC,GAAGH,KAAK;EACtD,MAAM,CAACI,OAAO,EAAEC,UAAU,CAAC,GAAG,IAAAC,eAAQ,EAAU,IAAI,CAAC;EACrD,MAAM,CAACC,QAAQ,EAAEC,WAAW,CAAC,GAAG,IAAAF,eAAQ,EAAM,EAAE,CAAC;EACjD,MAAMG,oBAAoB,GAAG,IAAAC,aAAM,EAAC,KAAK,CAAC;EAC1C,MAAM;IAACC;EAAQ,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAChC,MAAM;IAACC;EAAC,CAAC,GAAG,IAAAC,4BAAc,GAAE;EAE5BC,OAAO,CAACC,GAAG,CAACT,QAAQ,CAAC;;EAErB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;EAEA,MAAMU,WAAW,GAAG,IAAAC,kBAAW,EAAC,MAAM;IAClCb,UAAU,CAAC,IAAI,CAAC;IAEhBM,QAAQ,CACHQ,IAAI,CAACC,yBAAgB,CAAC,CACtBC,IAAI,CAACC,QAAQ,IAAI;MACd,IAAI,CAACb,oBAAoB,EAAE;QACvBD,WAAW,CAACc,QAAQ,CAACC,IAAI,CAACC,WAAW,CAAC;MAC1C;IACJ,CAAC,CAAC,CACDC,KAAK,CAACC,KAAK,IAAI;MACZX,OAAO,CAACC,GAAG,CAAC,wBAAwB,EAAEU,KAAK,CAAC;MAC5CC,yBAAY,CAACC,IAAI,CAACF,KAAK,CAACJ,QAAQ,CAACC,IAAI,CAACG,KAAK,EAAEC,yBAAY,CAACE,IAAI,CAAC;IACnE,CAAC,CAAC,CACDC,OAAO,CAAC,MAAMzB,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACM,QAAQ,CAAC,CAAC;EAEd,IAAAoB,gBAAS,EAAC,MAAM;IACZtB,oBAAoB,CAACuB,OAAO,GAAG,KAAK;IAEpC,IAAI7B,aAAa,EAAE;MACfc,WAAW,EAAE;IACjB;IAEA,OAAO,MAAM;MACTR,oBAAoB,CAACuB,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACf,WAAW,EAAEd,aAAa,CAAC,CAAC;EAEhC,IAAA4B,gBAAS,EAAC,MAAM;IACZtB,oBAAoB,CAACuB,OAAO,GAAG,KAAK;IAEpCf,WAAW,EAAE;IAEb,OAAO,MAAM;MACTR,oBAAoB,CAACuB,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACf,WAAW,EAAEN,QAAQ,CAAC,CAAC;EAE3B,MAAMsB,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,6BAAC,4BAAa;MAAC,OAAO,EAAEhC,WAAY;MAAC,WAAW,EAAEgC;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,6BAAC,qBAAQ;IACL,UAAU,EAAE9B,OAAQ;IACpB,SAAS,EAAEa,WAAY;IACvB,IAAI,EAAEV,QAAS;IACf,UAAU,EAAEN,UAAU,IAAIgC,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,6BAAC,oBAAS;MAAC,IAAI,EAAExB,CAAC,CAAE,wBAAuBT,OAAO,GAAG,SAAS,GAAG,WAAY,EAAC;IAAE;IACpG;EAAA,EACF;AAEV,CAAC;AAAC"}
|
|
@@ -1,66 +1,99 @@
|
|
|
1
|
-
import React, { useCallback, useEffect, useState } from 'react';
|
|
1
|
+
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
2
2
|
import { FlatList, ToastAndroid } from 'react-native';
|
|
3
3
|
import { useTranslation } from 'react-i18next';
|
|
4
|
-
import { Search } from './partials/search';
|
|
5
4
|
import { EmptyList } from './partials/empty-list';
|
|
6
5
|
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';
|
|
9
8
|
export const PickList = props => {
|
|
10
9
|
const {
|
|
11
|
-
isAfterPickList,
|
|
12
10
|
renderItem,
|
|
13
|
-
onItemPress
|
|
11
|
+
onItemPress,
|
|
12
|
+
shouldRefresh
|
|
14
13
|
} = props;
|
|
15
14
|
const [loading, setLoading] = useState(true);
|
|
16
15
|
const [pickList, setPickList] = useState([]);
|
|
16
|
+
const ignoreCurrentRequest = useRef(false);
|
|
17
17
|
const {
|
|
18
18
|
instance
|
|
19
19
|
} = useGatherer();
|
|
20
20
|
const {
|
|
21
21
|
t
|
|
22
22
|
} = useTranslation();
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
23
|
+
console.log(pickList);
|
|
24
|
+
|
|
25
|
+
// const getPickListWithSearch = useCallback(
|
|
26
|
+
// (searchFieldParam?: string, searchValueParam?: string): void => {
|
|
27
|
+
// const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
|
|
28
|
+
//
|
|
29
|
+
// setLoading(true);
|
|
30
|
+
//
|
|
31
|
+
// instance
|
|
32
|
+
// .post(url, {
|
|
33
|
+
// searchField: searchFieldParam,
|
|
34
|
+
// searchValue: searchValueParam,
|
|
35
|
+
// })
|
|
36
|
+
// .then(response => setPickList(response.data.pick_groups))
|
|
37
|
+
// .catch(error => {
|
|
38
|
+
// console.log('error picklist search', error);
|
|
39
|
+
// ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
40
|
+
// })
|
|
41
|
+
// .finally(() => setLoading(false));
|
|
42
|
+
// },
|
|
43
|
+
// [instance, isAfterPickList],
|
|
44
|
+
// );
|
|
45
|
+
|
|
46
|
+
const getPickList = useCallback(() => {
|
|
33
47
|
setLoading(true);
|
|
34
48
|
instance.post(GET_PICKLIST_URL).then(response => {
|
|
35
49
|
if (!ignoreCurrentRequest) {
|
|
36
50
|
setPickList(response.data.pick_groups);
|
|
37
51
|
}
|
|
38
|
-
}).catch(error =>
|
|
52
|
+
}).catch(error => {
|
|
53
|
+
console.log('error picklist initial', error);
|
|
54
|
+
ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
55
|
+
}).finally(() => setLoading(false));
|
|
56
|
+
}, [instance]);
|
|
57
|
+
useEffect(() => {
|
|
58
|
+
ignoreCurrentRequest.current = false;
|
|
59
|
+
if (shouldRefresh) {
|
|
60
|
+
getPickList();
|
|
61
|
+
}
|
|
39
62
|
return () => {
|
|
40
|
-
ignoreCurrentRequest = true;
|
|
63
|
+
ignoreCurrentRequest.current = true;
|
|
41
64
|
};
|
|
42
|
-
}, [
|
|
65
|
+
}, [getPickList, shouldRefresh]);
|
|
66
|
+
useEffect(() => {
|
|
67
|
+
ignoreCurrentRequest.current = false;
|
|
68
|
+
getPickList();
|
|
69
|
+
return () => {
|
|
70
|
+
ignoreCurrentRequest.current = true;
|
|
71
|
+
};
|
|
72
|
+
}, [getPickList, instance]);
|
|
43
73
|
const renderPickGroupItem = renderProps => {
|
|
44
74
|
return /*#__PURE__*/React.createElement(PickGroupItem, {
|
|
45
75
|
onPress: onItemPress,
|
|
46
76
|
renderProps: renderProps
|
|
47
77
|
});
|
|
48
78
|
};
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
79
|
+
|
|
80
|
+
// const handlePickListFromSearch = useCallback(
|
|
81
|
+
// (search: string): void => {
|
|
82
|
+
// getPickListWithSearch('', search);
|
|
83
|
+
// },
|
|
84
|
+
// [getPickListWithSearch],
|
|
85
|
+
// );
|
|
86
|
+
|
|
52
87
|
return /*#__PURE__*/React.createElement(FlatList, {
|
|
53
88
|
refreshing: loading,
|
|
54
|
-
onRefresh:
|
|
89
|
+
onRefresh: getPickList,
|
|
55
90
|
data: pickList,
|
|
56
91
|
renderItem: renderItem ?? renderPickGroupItem,
|
|
57
92
|
keyExtractor: pickGroup => pickGroup.id.toString(),
|
|
58
93
|
ListEmptyComponent: /*#__PURE__*/React.createElement(EmptyList, {
|
|
59
94
|
text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
|
|
60
|
-
}),
|
|
61
|
-
ListHeaderComponent: /*#__PURE__*/React.createElement(Search, {
|
|
62
|
-
onSearch: handlePickListFromSearch
|
|
63
95
|
})
|
|
96
|
+
// ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
|
|
64
97
|
});
|
|
65
98
|
};
|
|
66
99
|
//# sourceMappingURL=pick-list.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useEffect","useState","FlatList","ToastAndroid","useTranslation","
|
|
1
|
+
{"version":3,"names":["React","useCallback","useEffect","useRef","useState","FlatList","ToastAndroid","useTranslation","EmptyList","useGatherer","GET_PICKLIST_URL","PickGroupItem","PickList","props","renderItem","onItemPress","shouldRefresh","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","instance","t","console","log","getPickList","post","then","response","data","pick_groups","catch","error","show","LONG","finally","current","renderPickGroupItem","renderProps","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 {EmptyList} from './partials/empty-list';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {GET_PICKLIST_URL} from '../shared/api/api-urls';\nimport {PickGroupItem} from './partials/pick-group-item';\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, shouldRefresh} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\n const ignoreCurrentRequest = useRef(false);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n console.log(pickList);\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 // console.log('error picklist search', 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) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => {\n console.log('error picklist initial', error);\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n })\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (shouldRefresh) {\n getPickList();\n }\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, shouldRefresh]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList();\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance]);\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={getPickList}\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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"}
|
package/package.json
CHANGED
|
@@ -1,48 +1,52 @@
|
|
|
1
|
-
import React, {useCallback, useEffect, useState} from 'react';
|
|
1
|
+
import React, {useCallback, useEffect, useRef, useState} from 'react';
|
|
2
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';
|
|
7
6
|
import {EmptyList} from './partials/empty-list';
|
|
8
7
|
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';
|
|
11
10
|
|
|
12
11
|
interface props<T> {
|
|
13
12
|
isAfterPickList?: boolean;
|
|
13
|
+
shouldRefresh?: boolean;
|
|
14
14
|
renderItem?: ListRenderItem<T>;
|
|
15
15
|
onItemPress?: (pickGroup: T) => void;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
|
|
19
|
-
const {
|
|
19
|
+
const {renderItem, onItemPress, shouldRefresh} = props;
|
|
20
20
|
const [loading, setLoading] = useState<boolean>(true);
|
|
21
21
|
const [pickList, setPickList] = useState<T[]>([]);
|
|
22
|
+
const ignoreCurrentRequest = useRef(false);
|
|
22
23
|
const {instance} = useGatherer();
|
|
23
24
|
const {t} = useTranslation();
|
|
24
25
|
|
|
25
|
-
|
|
26
|
-
(searchFieldParam?: string, searchValueParam?: string): void => {
|
|
27
|
-
const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
|
|
28
|
-
|
|
29
|
-
setLoading(true);
|
|
30
|
-
|
|
31
|
-
instance
|
|
32
|
-
.post(url, {
|
|
33
|
-
searchField: searchFieldParam,
|
|
34
|
-
searchValue: searchValueParam,
|
|
35
|
-
})
|
|
36
|
-
.then(response => setPickList(response.data.pick_groups))
|
|
37
|
-
.catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))
|
|
38
|
-
.finally(() => setLoading(false));
|
|
39
|
-
},
|
|
40
|
-
[instance, isAfterPickList],
|
|
41
|
-
);
|
|
26
|
+
console.log(pickList);
|
|
42
27
|
|
|
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
|
+
// console.log('error picklist search', error);
|
|
42
|
+
// ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
43
|
+
// })
|
|
44
|
+
// .finally(() => setLoading(false));
|
|
45
|
+
// },
|
|
46
|
+
// [instance, isAfterPickList],
|
|
47
|
+
// );
|
|
45
48
|
|
|
49
|
+
const getPickList = useCallback(() => {
|
|
46
50
|
setLoading(true);
|
|
47
51
|
|
|
48
52
|
instance
|
|
@@ -52,34 +56,55 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
|
|
|
52
56
|
setPickList(response.data.pick_groups);
|
|
53
57
|
}
|
|
54
58
|
})
|
|
55
|
-
.catch(error =>
|
|
59
|
+
.catch(error => {
|
|
60
|
+
console.log('error picklist initial', error);
|
|
61
|
+
ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
62
|
+
})
|
|
56
63
|
.finally(() => setLoading(false));
|
|
64
|
+
}, [instance]);
|
|
65
|
+
|
|
66
|
+
useEffect(() => {
|
|
67
|
+
ignoreCurrentRequest.current = false;
|
|
68
|
+
|
|
69
|
+
if (shouldRefresh) {
|
|
70
|
+
getPickList();
|
|
71
|
+
}
|
|
57
72
|
|
|
58
73
|
return () => {
|
|
59
|
-
ignoreCurrentRequest = true;
|
|
74
|
+
ignoreCurrentRequest.current = true;
|
|
60
75
|
};
|
|
61
|
-
}, [
|
|
76
|
+
}, [getPickList, shouldRefresh]);
|
|
77
|
+
|
|
78
|
+
useEffect(() => {
|
|
79
|
+
ignoreCurrentRequest.current = false;
|
|
80
|
+
|
|
81
|
+
getPickList();
|
|
82
|
+
|
|
83
|
+
return () => {
|
|
84
|
+
ignoreCurrentRequest.current = true;
|
|
85
|
+
};
|
|
86
|
+
}, [getPickList, instance]);
|
|
62
87
|
|
|
63
88
|
const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {
|
|
64
89
|
return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;
|
|
65
90
|
};
|
|
66
91
|
|
|
67
|
-
const handlePickListFromSearch = useCallback(
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
);
|
|
92
|
+
// const handlePickListFromSearch = useCallback(
|
|
93
|
+
// (search: string): void => {
|
|
94
|
+
// getPickListWithSearch('', search);
|
|
95
|
+
// },
|
|
96
|
+
// [getPickListWithSearch],
|
|
97
|
+
// );
|
|
73
98
|
|
|
74
99
|
return (
|
|
75
100
|
<FlatList
|
|
76
101
|
refreshing={loading}
|
|
77
|
-
onRefresh={
|
|
102
|
+
onRefresh={getPickList}
|
|
78
103
|
data={pickList}
|
|
79
104
|
renderItem={renderItem ?? renderPickGroupItem}
|
|
80
105
|
keyExtractor={pickGroup => pickGroup.id.toString()}
|
|
81
106
|
ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}
|
|
82
|
-
ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
|
|
107
|
+
// ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
|
|
83
108
|
/>
|
|
84
109
|
);
|
|
85
110
|
};
|