@scrumble-nl/gatherer-frontend 1.1.2-beta.3 → 1.1.2-beta.5

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.
@@ -16,19 +16,17 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
16
16
  const PickList = props => {
17
17
  const {
18
18
  renderItem,
19
- onItemPress,
20
- shouldRefresh
19
+ onItemPress
21
20
  } = props;
22
21
  const [loading, setLoading] = (0, _react.useState)(true);
23
22
  const [pickList, setPickList] = (0, _react.useState)([]);
24
- const ignoreCurrentRequest = (0, _react.useRef)(false);
23
+ const ignoreCurrentRequest = (0, _react.useRef)(true);
25
24
  const {
26
25
  instance
27
26
  } = (0, _useGatherer.useGatherer)();
28
27
  const {
29
28
  t
30
29
  } = (0, _reactI18next.useTranslation)();
31
- console.log('picklist', pickList);
32
30
 
33
31
  // const getPickListWithSearch = useCallback(
34
32
  // (searchFieldParam?: string, searchValueParam?: string): void => {
@@ -52,26 +50,21 @@ const PickList = props => {
52
50
  // );
53
51
 
54
52
  const getPickList = (0, _react.useCallback)(() => {
53
+ console.log(2, 'getpicklist');
55
54
  setLoading(true);
56
55
  instance.post(_apiUrls.GET_PICKLIST_URL).then(response => {
56
+ console.log(3, 'picklist then');
57
57
  if (!ignoreCurrentRequest.current) {
58
58
  setPickList(response.data.pick_groups);
59
59
  }
60
- }).finally(() => setLoading(false));
60
+ }).catch(error => console.log(4, 'picklist error', error)).finally(() => setLoading(false));
61
61
  }, [instance]);
62
62
  (0, _react.useEffect)(() => {
63
- ignoreCurrentRequest.current = false;
64
- if (shouldRefresh) {
65
- getPickList();
66
- }
67
- return () => {
68
- ignoreCurrentRequest.current = true;
69
- };
70
- }, [getPickList, shouldRefresh]);
71
- (0, _react.useEffect)(() => {
63
+ console.log(1, 'effect init');
72
64
  ignoreCurrentRequest.current = false;
73
65
  getPickList();
74
66
  return () => {
67
+ console.log(99, 'effect return');
75
68
  ignoreCurrentRequest.current = true;
76
69
  };
77
70
  }, [getPickList, instance]);
@@ -1 +1 @@
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","current","data","pick_groups","finally","useEffect","renderPickGroupItem","renderProps","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo} 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', 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 .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,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,OAAO,CAAC,MAAMrB,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACM,QAAQ,CAAC,CAAC;EAEd,IAAAgB,gBAAS,EAAC,MAAM;IACZlB,oBAAoB,CAACc,OAAO,GAAG,KAAK;IAEpC,IAAIpB,aAAa,EAAE;MACfc,WAAW,EAAE;IACjB;IAEA,OAAO,MAAM;MACTR,oBAAoB,CAACc,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACN,WAAW,EAAEd,aAAa,CAAC,CAAC;EAEhC,IAAAwB,gBAAS,EAAC,MAAM;IACZlB,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,MAAMiB,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,6BAAC,4BAAa;MAAC,OAAO,EAAE3B,WAAY;MAAC,WAAW,EAAE2B;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,6BAAC,qBAAQ;IACL,UAAU,EAAEzB,OAAQ;IACpB,SAAS,EAAEa,WAAY;IACvB,IAAI,EAAEV,QAAS;IACf,UAAU,EAAEN,UAAU,IAAI2B,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,6BAAC,oBAAS;MAAC,IAAI,EAAEnB,CAAC,CAAE,wBAAuBT,OAAO,GAAG,SAAS,GAAG,WAAY,EAAC;IAAE;IACpG;EAAA,EACF;AAEV,CAAC;AAAC"}
1
+ {"version":3,"names":["PickList","props","renderItem","onItemPress","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","instance","useGatherer","t","useTranslation","getPickList","useCallback","console","log","post","GET_PICKLIST_URL","then","response","current","data","pick_groups","catch","error","finally","useEffect","renderPickGroupItem","renderProps","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo} 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(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 // 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 console.log(2, 'getpicklist');\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n console.log(3, 'picklist then');\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => console.log(4, 'picklist error', error))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n console.log(1, 'effect init');\n ignoreCurrentRequest.current = false;\n\n getPickList();\n\n return () => {\n console.log(99, 'effect 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,IAAI,CAAC;EACzC,MAAM;IAACC;EAAQ,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAChC,MAAM;IAACC;EAAC,CAAC,GAAG,IAAAC,4BAAc,GAAE;;EAE5B;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;EAEA,MAAMC,WAAW,GAAG,IAAAC,kBAAW,EAAC,MAAM;IAClCC,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,aAAa,CAAC;IAC7Bb,UAAU,CAAC,IAAI,CAAC;IAEhBM,QAAQ,CACHQ,IAAI,CAACC,yBAAgB,CAAC,CACtBC,IAAI,CAACC,QAAQ,IAAI;MACdL,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,eAAe,CAAC;MAC/B,IAAI,CAACT,oBAAoB,CAACc,OAAO,EAAE;QAC/Bf,WAAW,CAACc,QAAQ,CAACE,IAAI,CAACC,WAAW,CAAC;MAC1C;IACJ,CAAC,CAAC,CACDC,KAAK,CAACC,KAAK,IAAIV,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,gBAAgB,EAAES,KAAK,CAAC,CAAC,CACvDC,OAAO,CAAC,MAAMvB,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACM,QAAQ,CAAC,CAAC;EAEd,IAAAkB,gBAAS,EAAC,MAAM;IACZZ,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,aAAa,CAAC;IAC7BT,oBAAoB,CAACc,OAAO,GAAG,KAAK;IAEpCR,WAAW,EAAE;IAEb,OAAO,MAAM;MACTE,OAAO,CAACC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC;MAChCT,oBAAoB,CAACc,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACR,WAAW,EAAEJ,QAAQ,CAAC,CAAC;EAE3B,MAAMmB,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,6BAAC,4BAAa;MAAC,OAAO,EAAE5B,WAAY;MAAC,WAAW,EAAE4B;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,6BAAC,qBAAQ;IACL,UAAU,EAAE3B,OAAQ;IACpB,SAAS,EAAEW,WAAY;IACvB,IAAI,EAAER,QAAS;IACf,UAAU,EAAEL,UAAU,IAAI4B,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,6BAAC,oBAAS;MAAC,IAAI,EAAErB,CAAC,CAAE,wBAAuBT,OAAO,GAAG,SAAS,GAAG,WAAY,EAAC;IAAE;IACpG;EAAA,EACF;AAEV,CAAC;AAAC"}
@@ -8,19 +8,17 @@ import { PickGroupItem } from './partials/pick-group-item';
8
8
  export const PickList = props => {
9
9
  const {
10
10
  renderItem,
11
- onItemPress,
12
- shouldRefresh
11
+ onItemPress
13
12
  } = props;
14
13
  const [loading, setLoading] = useState(true);
15
14
  const [pickList, setPickList] = useState([]);
16
- const ignoreCurrentRequest = useRef(false);
15
+ const ignoreCurrentRequest = useRef(true);
17
16
  const {
18
17
  instance
19
18
  } = useGatherer();
20
19
  const {
21
20
  t
22
21
  } = useTranslation();
23
- console.log('picklist', pickList);
24
22
 
25
23
  // const getPickListWithSearch = useCallback(
26
24
  // (searchFieldParam?: string, searchValueParam?: string): void => {
@@ -44,26 +42,21 @@ export const PickList = props => {
44
42
  // );
45
43
 
46
44
  const getPickList = useCallback(() => {
45
+ console.log(2, 'getpicklist');
47
46
  setLoading(true);
48
47
  instance.post(GET_PICKLIST_URL).then(response => {
48
+ console.log(3, 'picklist then');
49
49
  if (!ignoreCurrentRequest.current) {
50
50
  setPickList(response.data.pick_groups);
51
51
  }
52
- }).finally(() => setLoading(false));
52
+ }).catch(error => console.log(4, 'picklist error', error)).finally(() => setLoading(false));
53
53
  }, [instance]);
54
54
  useEffect(() => {
55
- ignoreCurrentRequest.current = false;
56
- if (shouldRefresh) {
57
- getPickList();
58
- }
59
- return () => {
60
- ignoreCurrentRequest.current = true;
61
- };
62
- }, [getPickList, shouldRefresh]);
63
- useEffect(() => {
55
+ console.log(1, 'effect init');
64
56
  ignoreCurrentRequest.current = false;
65
57
  getPickList();
66
58
  return () => {
59
+ console.log(99, 'effect return');
67
60
  ignoreCurrentRequest.current = true;
68
61
  };
69
62
  }, [getPickList, instance]);
@@ -1 +1 @@
1
- {"version":3,"names":["React","useCallback","useEffect","useRef","useState","FlatList","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","current","data","pick_groups","finally","renderPickGroupItem","renderProps","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo} 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', 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 .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,OAAOA,KAAK,IAAGC,WAAW,EAAEC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAO,OAAO;AACrE,SAAQC,QAAQ,QAA2C,cAAc;AAEzE,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;AASxD,OAAO,MAAMC,QAAQ,GAAyBC,KAAe,IAAkB;EAC3E,MAAM;IAACC,UAAU;IAAEC,WAAW;IAAEC;EAAa,CAAC,GAAGH,KAAK;EACtD,MAAM,CAACI,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,GAAGb,WAAW,EAAE;EAChC,MAAM;IAACc;EAAC,CAAC,GAAGhB,cAAc,EAAE;EAE5BiB,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,CAACjB,gBAAgB,CAAC,CACtBkB,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,OAAO,CAAC,MAAMf,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACI,QAAQ,CAAC,CAAC;EAEdnB,SAAS,CAAC,MAAM;IACZkB,oBAAoB,CAACS,OAAO,GAAG,KAAK;IAEpC,IAAId,aAAa,EAAE;MACfU,WAAW,EAAE;IACjB;IAEA,OAAO,MAAM;MACTL,oBAAoB,CAACS,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACJ,WAAW,EAAEV,aAAa,CAAC,CAAC;EAEhCb,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,MAAMY,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,oBAAC,aAAa;MAAC,OAAO,EAAEpB,WAAY;MAAC,WAAW,EAAEoB;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,oBAAC,QAAQ;IACL,UAAU,EAAElB,OAAQ;IACpB,SAAS,EAAES,WAAY;IACvB,IAAI,EAAEP,QAAS;IACf,UAAU,EAAEL,UAAU,IAAIoB,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,oBAAC,SAAS;MAAC,IAAI,EAAEf,CAAC,CAAE,wBAAuBN,OAAO,GAAG,SAAS,GAAG,WAAY,EAAC;IAAE;IACpG;EAAA,EACF;AAEV,CAAC"}
1
+ {"version":3,"names":["React","useCallback","useEffect","useRef","useState","FlatList","useTranslation","EmptyList","useGatherer","GET_PICKLIST_URL","PickGroupItem","PickList","props","renderItem","onItemPress","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","instance","t","getPickList","console","log","post","then","response","current","data","pick_groups","catch","error","finally","renderPickGroupItem","renderProps","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo} 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(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 // 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 console.log(2, 'getpicklist');\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n console.log(3, 'picklist then');\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => console.log(4, 'picklist error', error))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n console.log(1, 'effect init');\n ignoreCurrentRequest.current = false;\n\n getPickList();\n\n return () => {\n console.log(99, 'effect 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,QAA2C,cAAc;AAEzE,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,GAAGZ,QAAQ,CAAU,IAAI,CAAC;EACrD,MAAM,CAACa,QAAQ,EAAEC,WAAW,CAAC,GAAGd,QAAQ,CAAM,EAAE,CAAC;EACjD,MAAMe,oBAAoB,GAAGhB,MAAM,CAAC,IAAI,CAAC;EACzC,MAAM;IAACiB;EAAQ,CAAC,GAAGZ,WAAW,EAAE;EAChC,MAAM;IAACa;EAAC,CAAC,GAAGf,cAAc,EAAE;;EAE5B;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;EAEA,MAAMgB,WAAW,GAAGrB,WAAW,CAAC,MAAM;IAClCsB,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,aAAa,CAAC;IAC7BR,UAAU,CAAC,IAAI,CAAC;IAEhBI,QAAQ,CACHK,IAAI,CAAChB,gBAAgB,CAAC,CACtBiB,IAAI,CAACC,QAAQ,IAAI;MACdJ,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,eAAe,CAAC;MAC/B,IAAI,CAACL,oBAAoB,CAACS,OAAO,EAAE;QAC/BV,WAAW,CAACS,QAAQ,CAACE,IAAI,CAACC,WAAW,CAAC;MAC1C;IACJ,CAAC,CAAC,CACDC,KAAK,CAACC,KAAK,IAAIT,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,gBAAgB,EAAEQ,KAAK,CAAC,CAAC,CACvDC,OAAO,CAAC,MAAMjB,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACI,QAAQ,CAAC,CAAC;EAEdlB,SAAS,CAAC,MAAM;IACZqB,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,aAAa,CAAC;IAC7BL,oBAAoB,CAACS,OAAO,GAAG,KAAK;IAEpCN,WAAW,EAAE;IAEb,OAAO,MAAM;MACTC,OAAO,CAACC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC;MAChCL,oBAAoB,CAACS,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACN,WAAW,EAAEF,QAAQ,CAAC,CAAC;EAE3B,MAAMc,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,oBAAC,aAAa;MAAC,OAAO,EAAErB,WAAY;MAAC,WAAW,EAAEqB;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,oBAAC,QAAQ;IACL,UAAU,EAAEpB,OAAQ;IACpB,SAAS,EAAEO,WAAY;IACvB,IAAI,EAAEL,QAAS;IACf,UAAU,EAAEJ,UAAU,IAAIqB,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,oBAAC,SAAS;MAAC,IAAI,EAAEjB,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.3",
3
+ "version": "1.1.2-beta.5",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -10,21 +10,18 @@ import {PickGroupItem} from './partials/pick-group-item';
10
10
 
11
11
  interface props<T> {
12
12
  isAfterPickList?: boolean;
13
- shouldRefresh?: boolean;
14
13
  renderItem?: ListRenderItem<T>;
15
14
  onItemPress?: (pickGroup: T) => void;
16
15
  }
17
16
 
18
17
  export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
19
- const {renderItem, onItemPress, shouldRefresh} = props;
18
+ const {renderItem, onItemPress} = props;
20
19
  const [loading, setLoading] = useState<boolean>(true);
21
20
  const [pickList, setPickList] = useState<T[]>([]);
22
- const ignoreCurrentRequest = useRef(false);
21
+ const ignoreCurrentRequest = useRef(true);
23
22
  const {instance} = useGatherer();
24
23
  const {t} = useTranslation();
25
24
 
26
- console.log('picklist', pickList);
27
-
28
25
  // const getPickListWithSearch = useCallback(
29
26
  // (searchFieldParam?: string, searchValueParam?: string): void => {
30
27
  // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
@@ -47,36 +44,29 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
47
44
  // );
48
45
 
49
46
  const getPickList = useCallback(() => {
47
+ console.log(2, 'getpicklist');
50
48
  setLoading(true);
51
49
 
52
50
  instance
53
51
  .post(GET_PICKLIST_URL)
54
52
  .then(response => {
53
+ console.log(3, 'picklist then');
55
54
  if (!ignoreCurrentRequest.current) {
56
55
  setPickList(response.data.pick_groups);
57
56
  }
58
57
  })
58
+ .catch(error => console.log(4, 'picklist error', error))
59
59
  .finally(() => setLoading(false));
60
60
  }, [instance]);
61
61
 
62
62
  useEffect(() => {
63
- ignoreCurrentRequest.current = false;
64
-
65
- if (shouldRefresh) {
66
- getPickList();
67
- }
68
-
69
- return () => {
70
- ignoreCurrentRequest.current = true;
71
- };
72
- }, [getPickList, shouldRefresh]);
73
-
74
- useEffect(() => {
63
+ console.log(1, 'effect init');
75
64
  ignoreCurrentRequest.current = false;
76
65
 
77
66
  getPickList();
78
67
 
79
68
  return () => {
69
+ console.log(99, 'effect return');
80
70
  ignoreCurrentRequest.current = true;
81
71
  };
82
72
  }, [getPickList, instance]);