@scrumble-nl/gatherer-frontend 1.1.2-beta.0 → 1.1.2-beta.2

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.
@@ -7,19 +7,16 @@ 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,
22
- shouldRefresh
19
+ onItemPress
23
20
  } = props;
24
21
  const [loading, setLoading] = (0, _react.useState)(true);
25
22
  const [pickList, setPickList] = (0, _react.useState)([]);
@@ -30,37 +27,40 @@ const PickList = props => {
30
27
  const {
31
28
  t
32
29
  } = (0, _reactI18next.useTranslation)();
33
- const getPickListWithSearch = (0, _react.useCallback)((searchFieldParam, searchValueParam) => {
34
- const url = isAfterPickList ? _apiUrls.GET_AFTER_PICKLIST_URL : _apiUrls.GET_PICKLIST_URL;
35
- setLoading(true);
36
- instance.post(url, {
37
- searchField: searchFieldParam,
38
- searchValue: searchValueParam
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));
43
- }, [instance, isAfterPickList]);
30
+ console.log('picklist', pickList);
31
+
32
+ // const getPickListWithSearch = useCallback(
33
+ // (searchFieldParam?: string, searchValueParam?: string): void => {
34
+ // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
35
+ //
36
+ // setLoading(true);
37
+ //
38
+ // instance
39
+ // .post(url, {
40
+ // searchField: searchFieldParam,
41
+ // searchValue: searchValueParam,
42
+ // })
43
+ // .then(response => setPickList(response.data.pick_groups))
44
+ // .catch(error => {
45
+ // console.log('error picklist search', error);
46
+ // ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
47
+ // })
48
+ // .finally(() => setLoading(false));
49
+ // },
50
+ // [instance, isAfterPickList],
51
+ // );
52
+
44
53
  const getPickList = (0, _react.useCallback)(() => {
45
54
  setLoading(true);
46
55
  instance.post(_apiUrls.GET_PICKLIST_URL).then(response => {
47
- if (!ignoreCurrentRequest) {
56
+ if (!ignoreCurrentRequest.current) {
48
57
  setPickList(response.data.pick_groups);
49
58
  }
50
59
  }).catch(error => {
51
60
  console.log('error picklist initial', error);
52
61
  _reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG);
53
62
  }).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]);
63
+ }, [instance]);
64
64
  (0, _react.useEffect)(() => {
65
65
  ignoreCurrentRequest.current = false;
66
66
  getPickList();
@@ -74,21 +74,24 @@ const PickList = props => {
74
74
  renderProps: renderProps
75
75
  });
76
76
  };
77
- const handlePickListFromSearch = (0, _react.useCallback)(search => {
78
- getPickListWithSearch('', search);
79
- }, [getPickListWithSearch]);
77
+
78
+ // const handlePickListFromSearch = useCallback(
79
+ // (search: string): void => {
80
+ // getPickListWithSearch('', search);
81
+ // },
82
+ // [getPickListWithSearch],
83
+ // );
84
+
80
85
  return /*#__PURE__*/_react.default.createElement(_reactNative.FlatList, {
81
86
  refreshing: loading,
82
- onRefresh: getPickListWithSearch,
87
+ onRefresh: getPickList,
83
88
  data: pickList,
84
89
  renderItem: renderItem ?? renderPickGroupItem,
85
90
  keyExtractor: pickGroup => pickGroup.id.toString(),
86
91
  ListEmptyComponent: /*#__PURE__*/_react.default.createElement(_emptyList.EmptyList, {
87
92
  text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
88
- }),
89
- ListHeaderComponent: /*#__PURE__*/_react.default.createElement(_search.Search, {
90
- onSearch: handlePickListFromSearch
91
93
  })
94
+ // ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
92
95
  });
93
96
  };
94
97
  exports.PickList = PickList;
@@ -1 +1 @@
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
+ {"version":3,"names":["PickList","props","renderItem","onItemPress","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","instance","useGatherer","t","useTranslation","console","log","getPickList","useCallback","post","GET_PICKLIST_URL","then","response","current","data","pick_groups","catch","error","ToastAndroid","show","LONG","finally","useEffect","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 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} = 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', 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.current) {\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 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;AAQlD,MAAMA,QAAQ,GAAyBC,KAAe,IAAkB;EAC3E,MAAM;IAACC,UAAU;IAAEC;EAAW,CAAC,GAAGF,KAAK;EACvC,MAAM,CAACG,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,CAAC,UAAU,EAAET,QAAQ,CAAC;;EAEjC;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,CAACc,OAAO,EAAE;QAC/Bf,WAAW,CAACc,QAAQ,CAACE,IAAI,CAACC,WAAW,CAAC;MAC1C;IACJ,CAAC,CAAC,CACDC,KAAK,CAACC,KAAK,IAAI;MACZZ,OAAO,CAACC,GAAG,CAAC,wBAAwB,EAAEW,KAAK,CAAC;MAC5CC,yBAAY,CAACC,IAAI,CAACF,KAAK,CAACL,QAAQ,CAACE,IAAI,CAACG,KAAK,EAAEC,yBAAY,CAACE,IAAI,CAAC;IACnE,CAAC,CAAC,CACDC,OAAO,CAAC,MAAM1B,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACM,QAAQ,CAAC,CAAC;EAEd,IAAAqB,gBAAS,EAAC,MAAM;IACZvB,oBAAoB,CAACc,OAAO,GAAG,KAAK;IAEpCN,WAAW,EAAE;IAEb,OAAO,MAAM;MACTR,oBAAoB,CAACc,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACN,WAAW,EAAEN,QAAQ,CAAC,CAAC;EAE3B,MAAMsB,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,6BAAC,4BAAa;MAAC,OAAO,EAAE/B,WAAY;MAAC,WAAW,EAAE+B;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,EAAEL,UAAU,IAAI+B,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,17 +1,14 @@
1
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,
14
- shouldRefresh
11
+ onItemPress
15
12
  } = props;
16
13
  const [loading, setLoading] = useState(true);
17
14
  const [pickList, setPickList] = useState([]);
@@ -22,37 +19,40 @@ export const PickList = props => {
22
19
  const {
23
20
  t
24
21
  } = useTranslation();
25
- const getPickListWithSearch = useCallback((searchFieldParam, searchValueParam) => {
26
- const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
27
- setLoading(true);
28
- instance.post(url, {
29
- searchField: searchFieldParam,
30
- searchValue: searchValueParam
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));
35
- }, [instance, isAfterPickList]);
22
+ console.log('picklist', pickList);
23
+
24
+ // const getPickListWithSearch = useCallback(
25
+ // (searchFieldParam?: string, searchValueParam?: string): void => {
26
+ // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
27
+ //
28
+ // setLoading(true);
29
+ //
30
+ // instance
31
+ // .post(url, {
32
+ // searchField: searchFieldParam,
33
+ // searchValue: searchValueParam,
34
+ // })
35
+ // .then(response => setPickList(response.data.pick_groups))
36
+ // .catch(error => {
37
+ // console.log('error picklist search', error);
38
+ // ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
39
+ // })
40
+ // .finally(() => setLoading(false));
41
+ // },
42
+ // [instance, isAfterPickList],
43
+ // );
44
+
36
45
  const getPickList = useCallback(() => {
37
46
  setLoading(true);
38
47
  instance.post(GET_PICKLIST_URL).then(response => {
39
- if (!ignoreCurrentRequest) {
48
+ if (!ignoreCurrentRequest.current) {
40
49
  setPickList(response.data.pick_groups);
41
50
  }
42
51
  }).catch(error => {
43
52
  console.log('error picklist initial', error);
44
53
  ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
45
54
  }).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]);
55
+ }, [instance]);
56
56
  useEffect(() => {
57
57
  ignoreCurrentRequest.current = false;
58
58
  getPickList();
@@ -66,21 +66,24 @@ export const PickList = props => {
66
66
  renderProps: renderProps
67
67
  });
68
68
  };
69
- const handlePickListFromSearch = useCallback(search => {
70
- getPickListWithSearch('', search);
71
- }, [getPickListWithSearch]);
69
+
70
+ // const handlePickListFromSearch = useCallback(
71
+ // (search: string): void => {
72
+ // getPickListWithSearch('', search);
73
+ // },
74
+ // [getPickListWithSearch],
75
+ // );
76
+
72
77
  return /*#__PURE__*/React.createElement(FlatList, {
73
78
  refreshing: loading,
74
- onRefresh: getPickListWithSearch,
79
+ onRefresh: getPickList,
75
80
  data: pickList,
76
81
  renderItem: renderItem ?? renderPickGroupItem,
77
82
  keyExtractor: pickGroup => pickGroup.id.toString(),
78
83
  ListEmptyComponent: /*#__PURE__*/React.createElement(EmptyList, {
79
84
  text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
80
- }),
81
- ListHeaderComponent: /*#__PURE__*/React.createElement(Search, {
82
- onSearch: handlePickListFromSearch
83
85
  })
86
+ // ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
84
87
  });
85
88
  };
86
89
  //# sourceMappingURL=pick-list.js.map
@@ -1 +1 @@
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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"}
1
+ {"version":3,"names":["React","useCallback","useEffect","useRef","useState","FlatList","ToastAndroid","useTranslation","EmptyList","useGatherer","GET_PICKLIST_URL","PickGroupItem","PickList","props","renderItem","onItemPress","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","instance","t","console","log","getPickList","post","then","response","current","data","pick_groups","catch","error","show","LONG","finally","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 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} = 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', 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.current) {\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 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,OAAOA,KAAK,IAAGC,WAAW,EAAEC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAO,OAAO;AACrE,SAAQC,QAAQ,EAAsCC,YAAY,QAAO,cAAc;AAEvF,SAAQC,cAAc,QAAO,eAAe;AAE5C,SAAQC,SAAS,QAAO,uBAAuB;AAC/C,SAAQC,WAAW,QAAO,uBAAuB;AACjD,SAAQC,gBAAgB,QAAO,wBAAwB;AACvD,SAAQC,aAAa,QAAO,4BAA4B;AAQxD,OAAO,MAAMC,QAAQ,GAAyBC,KAAe,IAAkB;EAC3E,MAAM;IAACC,UAAU;IAAEC;EAAW,CAAC,GAAGF,KAAK;EACvC,MAAM,CAACG,OAAO,EAAEC,UAAU,CAAC,GAAGb,QAAQ,CAAU,IAAI,CAAC;EACrD,MAAM,CAACc,QAAQ,EAAEC,WAAW,CAAC,GAAGf,QAAQ,CAAM,EAAE,CAAC;EACjD,MAAMgB,oBAAoB,GAAGjB,MAAM,CAAC,KAAK,CAAC;EAC1C,MAAM;IAACkB;EAAQ,CAAC,GAAGZ,WAAW,EAAE;EAChC,MAAM;IAACa;EAAC,CAAC,GAAGf,cAAc,EAAE;EAE5BgB,OAAO,CAACC,GAAG,CAAC,UAAU,EAAEN,QAAQ,CAAC;;EAEjC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;EAEA,MAAMO,WAAW,GAAGxB,WAAW,CAAC,MAAM;IAClCgB,UAAU,CAAC,IAAI,CAAC;IAEhBI,QAAQ,CACHK,IAAI,CAAChB,gBAAgB,CAAC,CACtBiB,IAAI,CAACC,QAAQ,IAAI;MACd,IAAI,CAACR,oBAAoB,CAACS,OAAO,EAAE;QAC/BV,WAAW,CAACS,QAAQ,CAACE,IAAI,CAACC,WAAW,CAAC;MAC1C;IACJ,CAAC,CAAC,CACDC,KAAK,CAACC,KAAK,IAAI;MACZV,OAAO,CAACC,GAAG,CAAC,wBAAwB,EAAES,KAAK,CAAC;MAC5C3B,YAAY,CAAC4B,IAAI,CAACD,KAAK,CAACL,QAAQ,CAACE,IAAI,CAACG,KAAK,EAAE3B,YAAY,CAAC6B,IAAI,CAAC;IACnE,CAAC,CAAC,CACDC,OAAO,CAAC,MAAMnB,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACI,QAAQ,CAAC,CAAC;EAEdnB,SAAS,CAAC,MAAM;IACZkB,oBAAoB,CAACS,OAAO,GAAG,KAAK;IAEpCJ,WAAW,EAAE;IAEb,OAAO,MAAM;MACTL,oBAAoB,CAACS,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACJ,WAAW,EAAEJ,QAAQ,CAAC,CAAC;EAE3B,MAAMgB,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,oBAAC,aAAa;MAAC,OAAO,EAAEvB,WAAY;MAAC,WAAW,EAAEuB;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,oBAAC,QAAQ;IACL,UAAU,EAAEtB,OAAQ;IACpB,SAAS,EAAES,WAAY;IACvB,IAAI,EAAEP,QAAS;IACf,UAAU,EAAEJ,UAAU,IAAIuB,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,oBAAC,SAAS;MAAC,IAAI,EAAEnB,CAAC,CAAE,wBAAuBN,OAAO,GAAG,SAAS,GAAG,WAAY,EAAC;IAAE;IACpG;EAAA,EACF;AAEV,CAAC"}
@@ -1,7 +1,6 @@
1
1
  import { ListRenderItem } from 'react-native';
2
2
  interface props<T> {
3
3
  isAfterPickList?: boolean;
4
- shouldRefresh?: boolean;
5
4
  renderItem?: ListRenderItem<T>;
6
5
  onItemPress?: (pickGroup: T) => void;
7
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrumble-nl/gatherer-frontend",
3
- "version": "1.1.2-beta.0",
3
+ "version": "1.1.2-beta.2",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -3,47 +3,47 @@ import {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-
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;
14
- shouldRefresh?: boolean;
15
13
  renderItem?: ListRenderItem<T>;
16
14
  onItemPress?: (pickGroup: T) => void;
17
15
  }
18
16
 
19
17
  export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
20
- const {isAfterPickList, renderItem, onItemPress, shouldRefresh} = props;
18
+ const {renderItem, onItemPress} = props;
21
19
  const [loading, setLoading] = useState<boolean>(true);
22
20
  const [pickList, setPickList] = useState<T[]>([]);
23
21
  const ignoreCurrentRequest = useRef(false);
24
22
  const {instance} = useGatherer();
25
23
  const {t} = useTranslation();
26
24
 
27
- const getPickListWithSearch = useCallback(
28
- (searchFieldParam?: string, searchValueParam?: string): void => {
29
- const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
30
-
31
- setLoading(true);
32
-
33
- instance
34
- .post(url, {
35
- searchField: searchFieldParam,
36
- searchValue: searchValueParam,
37
- })
38
- .then(response => setPickList(response.data.pick_groups))
39
- .catch(error => {
40
- console.log('error picklist search', error);
41
- ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
42
- })
43
- .finally(() => setLoading(false));
44
- },
45
- [instance, isAfterPickList],
46
- );
25
+ console.log('picklist', pickList);
26
+
27
+ // const getPickListWithSearch = useCallback(
28
+ // (searchFieldParam?: string, searchValueParam?: string): void => {
29
+ // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
30
+ //
31
+ // setLoading(true);
32
+ //
33
+ // instance
34
+ // .post(url, {
35
+ // searchField: searchFieldParam,
36
+ // searchValue: searchValueParam,
37
+ // })
38
+ // .then(response => setPickList(response.data.pick_groups))
39
+ // .catch(error => {
40
+ // console.log('error picklist search', error);
41
+ // ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
42
+ // })
43
+ // .finally(() => setLoading(false));
44
+ // },
45
+ // [instance, isAfterPickList],
46
+ // );
47
47
 
48
48
  const getPickList = useCallback(() => {
49
49
  setLoading(true);
@@ -51,7 +51,7 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
51
51
  instance
52
52
  .post(GET_PICKLIST_URL)
53
53
  .then(response => {
54
- if (!ignoreCurrentRequest) {
54
+ if (!ignoreCurrentRequest.current) {
55
55
  setPickList(response.data.pick_groups);
56
56
  }
57
57
  })
@@ -60,19 +60,7 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
60
60
  ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
61
61
  })
62
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]);
63
+ }, [instance]);
76
64
 
77
65
  useEffect(() => {
78
66
  ignoreCurrentRequest.current = false;
@@ -88,22 +76,22 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
88
76
  return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;
89
77
  };
90
78
 
91
- const handlePickListFromSearch = useCallback(
92
- (search: string): void => {
93
- getPickListWithSearch('', search);
94
- },
95
- [getPickListWithSearch],
96
- );
79
+ // const handlePickListFromSearch = useCallback(
80
+ // (search: string): void => {
81
+ // getPickListWithSearch('', search);
82
+ // },
83
+ // [getPickListWithSearch],
84
+ // );
97
85
 
98
86
  return (
99
87
  <FlatList
100
88
  refreshing={loading}
101
- onRefresh={getPickListWithSearch}
89
+ onRefresh={getPickList}
102
90
  data={pickList}
103
91
  renderItem={renderItem ?? renderPickGroupItem}
104
92
  keyExtractor={pickGroup => pickGroup.id.toString()}
105
93
  ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}
106
- ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
94
+ // ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
107
95
  />
108
96
  );
109
97
  };