@scrumble-nl/gatherer-frontend 1.1.1 → 1.1.2-beta.0
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 +27 -7
- package/lib/commonjs/pick-list/pick-list.js.map +1 -1
- package/lib/module/pick-list/pick-list.js +28 -8
- 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 +33 -9
|
@@ -18,10 +18,12 @@ const PickList = props => {
|
|
|
18
18
|
const {
|
|
19
19
|
isAfterPickList,
|
|
20
20
|
renderItem,
|
|
21
|
-
onItemPress
|
|
21
|
+
onItemPress,
|
|
22
|
+
shouldRefresh
|
|
22
23
|
} = props;
|
|
23
24
|
const [loading, setLoading] = (0, _react.useState)(true);
|
|
24
25
|
const [pickList, setPickList] = (0, _react.useState)([]);
|
|
26
|
+
const ignoreCurrentRequest = (0, _react.useRef)(false);
|
|
25
27
|
const {
|
|
26
28
|
instance
|
|
27
29
|
} = (0, _useGatherer.useGatherer)();
|
|
@@ -34,20 +36,38 @@ const PickList = props => {
|
|
|
34
36
|
instance.post(url, {
|
|
35
37
|
searchField: searchFieldParam,
|
|
36
38
|
searchValue: searchValueParam
|
|
37
|
-
}).then(response => setPickList(response.data.pick_groups)).catch(error =>
|
|
39
|
+
}).then(response => setPickList(response.data.pick_groups)).catch(error => {
|
|
40
|
+
console.log('error picklist search', error);
|
|
41
|
+
_reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG);
|
|
42
|
+
}).finally(() => setLoading(false));
|
|
38
43
|
}, [instance, isAfterPickList]);
|
|
39
|
-
(0, _react.
|
|
40
|
-
let ignoreCurrentRequest = false;
|
|
44
|
+
const getPickList = (0, _react.useCallback)(() => {
|
|
41
45
|
setLoading(true);
|
|
42
46
|
instance.post(_apiUrls.GET_PICKLIST_URL).then(response => {
|
|
43
47
|
if (!ignoreCurrentRequest) {
|
|
44
48
|
setPickList(response.data.pick_groups);
|
|
45
49
|
}
|
|
46
|
-
}).catch(error =>
|
|
50
|
+
}).catch(error => {
|
|
51
|
+
console.log('error picklist initial', error);
|
|
52
|
+
_reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG);
|
|
53
|
+
}).finally(() => setLoading(false));
|
|
54
|
+
}, []);
|
|
55
|
+
(0, _react.useEffect)(() => {
|
|
56
|
+
ignoreCurrentRequest.current = false;
|
|
57
|
+
if (shouldRefresh) {
|
|
58
|
+
getPickList();
|
|
59
|
+
}
|
|
60
|
+
return () => {
|
|
61
|
+
ignoreCurrentRequest.current = true;
|
|
62
|
+
};
|
|
63
|
+
}, [getPickList, shouldRefresh]);
|
|
64
|
+
(0, _react.useEffect)(() => {
|
|
65
|
+
ignoreCurrentRequest.current = false;
|
|
66
|
+
getPickList();
|
|
47
67
|
return () => {
|
|
48
|
-
ignoreCurrentRequest = true;
|
|
68
|
+
ignoreCurrentRequest.current = true;
|
|
49
69
|
};
|
|
50
|
-
}, [instance]);
|
|
70
|
+
}, [getPickList, instance]);
|
|
51
71
|
const renderPickGroupItem = renderProps => {
|
|
52
72
|
return /*#__PURE__*/_react.default.createElement(_pickGroupItem.PickGroupItem, {
|
|
53
73
|
onPress: onItemPress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PickList","props","isAfterPickList","renderItem","onItemPress","loading","setLoading","useState","pickList","setPickList","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","useEffect","
|
|
1
|
+
{"version":3,"names":["PickList","props","isAfterPickList","renderItem","onItemPress","shouldRefresh","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","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","console","log","ToastAndroid","show","LONG","finally","getPickList","useEffect","current","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 {isAfterPickList, 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 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 }, []);\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={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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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
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
4
|
import { Search } from './partials/search';
|
|
@@ -10,10 +10,12 @@ export const PickList = props => {
|
|
|
10
10
|
const {
|
|
11
11
|
isAfterPickList,
|
|
12
12
|
renderItem,
|
|
13
|
-
onItemPress
|
|
13
|
+
onItemPress,
|
|
14
|
+
shouldRefresh
|
|
14
15
|
} = props;
|
|
15
16
|
const [loading, setLoading] = useState(true);
|
|
16
17
|
const [pickList, setPickList] = useState([]);
|
|
18
|
+
const ignoreCurrentRequest = useRef(false);
|
|
17
19
|
const {
|
|
18
20
|
instance
|
|
19
21
|
} = useGatherer();
|
|
@@ -26,20 +28,38 @@ export const PickList = props => {
|
|
|
26
28
|
instance.post(url, {
|
|
27
29
|
searchField: searchFieldParam,
|
|
28
30
|
searchValue: searchValueParam
|
|
29
|
-
}).then(response => setPickList(response.data.pick_groups)).catch(error =>
|
|
31
|
+
}).then(response => setPickList(response.data.pick_groups)).catch(error => {
|
|
32
|
+
console.log('error picklist search', error);
|
|
33
|
+
ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
34
|
+
}).finally(() => setLoading(false));
|
|
30
35
|
}, [instance, isAfterPickList]);
|
|
31
|
-
|
|
32
|
-
let ignoreCurrentRequest = false;
|
|
36
|
+
const getPickList = useCallback(() => {
|
|
33
37
|
setLoading(true);
|
|
34
38
|
instance.post(GET_PICKLIST_URL).then(response => {
|
|
35
39
|
if (!ignoreCurrentRequest) {
|
|
36
40
|
setPickList(response.data.pick_groups);
|
|
37
41
|
}
|
|
38
|
-
}).catch(error =>
|
|
42
|
+
}).catch(error => {
|
|
43
|
+
console.log('error picklist initial', error);
|
|
44
|
+
ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
45
|
+
}).finally(() => setLoading(false));
|
|
46
|
+
}, []);
|
|
47
|
+
useEffect(() => {
|
|
48
|
+
ignoreCurrentRequest.current = false;
|
|
49
|
+
if (shouldRefresh) {
|
|
50
|
+
getPickList();
|
|
51
|
+
}
|
|
52
|
+
return () => {
|
|
53
|
+
ignoreCurrentRequest.current = true;
|
|
54
|
+
};
|
|
55
|
+
}, [getPickList, shouldRefresh]);
|
|
56
|
+
useEffect(() => {
|
|
57
|
+
ignoreCurrentRequest.current = false;
|
|
58
|
+
getPickList();
|
|
39
59
|
return () => {
|
|
40
|
-
ignoreCurrentRequest = true;
|
|
60
|
+
ignoreCurrentRequest.current = true;
|
|
41
61
|
};
|
|
42
|
-
}, [instance]);
|
|
62
|
+
}, [getPickList, instance]);
|
|
43
63
|
const renderPickGroupItem = renderProps => {
|
|
44
64
|
return /*#__PURE__*/React.createElement(PickGroupItem, {
|
|
45
65
|
onPress: onItemPress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useEffect","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useGatherer","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","onItemPress","loading","setLoading","pickList","setPickList","instance","t","getPickListWithSearch","searchFieldParam","searchValueParam","url","post","searchField","searchValue","then","response","data","pick_groups","catch","error","show","LONG","finally","
|
|
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","isAfterPickList","renderItem","onItemPress","shouldRefresh","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","instance","t","getPickListWithSearch","searchFieldParam","searchValueParam","url","post","searchField","searchValue","then","response","data","pick_groups","catch","error","console","log","show","LONG","finally","getPickList","current","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 {isAfterPickList, 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 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 }, []);\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={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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"}
|
package/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
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';
|
|
@@ -11,14 +11,16 @@ import {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';
|
|
|
11
11
|
|
|
12
12
|
interface props<T> {
|
|
13
13
|
isAfterPickList?: boolean;
|
|
14
|
+
shouldRefresh?: boolean;
|
|
14
15
|
renderItem?: ListRenderItem<T>;
|
|
15
16
|
onItemPress?: (pickGroup: T) => void;
|
|
16
17
|
}
|
|
17
18
|
|
|
18
19
|
export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
|
|
19
|
-
const {isAfterPickList, renderItem, onItemPress} = props;
|
|
20
|
+
const {isAfterPickList, renderItem, onItemPress, shouldRefresh} = props;
|
|
20
21
|
const [loading, setLoading] = useState<boolean>(true);
|
|
21
22
|
const [pickList, setPickList] = useState<T[]>([]);
|
|
23
|
+
const ignoreCurrentRequest = useRef(false);
|
|
22
24
|
const {instance} = useGatherer();
|
|
23
25
|
const {t} = useTranslation();
|
|
24
26
|
|
|
@@ -34,15 +36,16 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
|
|
|
34
36
|
searchValue: searchValueParam,
|
|
35
37
|
})
|
|
36
38
|
.then(response => setPickList(response.data.pick_groups))
|
|
37
|
-
.catch(error =>
|
|
39
|
+
.catch(error => {
|
|
40
|
+
console.log('error picklist search', error);
|
|
41
|
+
ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
42
|
+
})
|
|
38
43
|
.finally(() => setLoading(false));
|
|
39
44
|
},
|
|
40
45
|
[instance, isAfterPickList],
|
|
41
46
|
);
|
|
42
47
|
|
|
43
|
-
|
|
44
|
-
let ignoreCurrentRequest = false;
|
|
45
|
-
|
|
48
|
+
const getPickList = useCallback(() => {
|
|
46
49
|
setLoading(true);
|
|
47
50
|
|
|
48
51
|
instance
|
|
@@ -52,13 +55,34 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
|
|
|
52
55
|
setPickList(response.data.pick_groups);
|
|
53
56
|
}
|
|
54
57
|
})
|
|
55
|
-
.catch(error =>
|
|
58
|
+
.catch(error => {
|
|
59
|
+
console.log('error picklist initial', error);
|
|
60
|
+
ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
|
|
61
|
+
})
|
|
56
62
|
.finally(() => setLoading(false));
|
|
63
|
+
}, []);
|
|
64
|
+
|
|
65
|
+
useEffect(() => {
|
|
66
|
+
ignoreCurrentRequest.current = false;
|
|
67
|
+
|
|
68
|
+
if (shouldRefresh) {
|
|
69
|
+
getPickList();
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
return () => {
|
|
73
|
+
ignoreCurrentRequest.current = true;
|
|
74
|
+
};
|
|
75
|
+
}, [getPickList, shouldRefresh]);
|
|
76
|
+
|
|
77
|
+
useEffect(() => {
|
|
78
|
+
ignoreCurrentRequest.current = false;
|
|
79
|
+
|
|
80
|
+
getPickList();
|
|
57
81
|
|
|
58
82
|
return () => {
|
|
59
|
-
ignoreCurrentRequest = true;
|
|
83
|
+
ignoreCurrentRequest.current = true;
|
|
60
84
|
};
|
|
61
|
-
}, [instance]);
|
|
85
|
+
}, [getPickList, instance]);
|
|
62
86
|
|
|
63
87
|
const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {
|
|
64
88
|
return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;
|