@scrumble-nl/gatherer-frontend 1.1.2-beta.4 → 1.1.2-beta.6

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,11 +16,13 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
16
16
  const PickList = props => {
17
17
  const {
18
18
  renderItem,
19
- onItemPress
19
+ onItemPress,
20
+ shouldRefresh
20
21
  } = props;
21
22
  const [loading, setLoading] = (0, _react.useState)(true);
22
23
  const [pickList, setPickList] = (0, _react.useState)([]);
23
24
  const ignoreCurrentRequest = (0, _react.useRef)(true);
25
+ const isInitialRender = (0, _react.useRef)(true);
24
26
  const {
25
27
  instance
26
28
  } = (0, _useGatherer.useGatherer)();
@@ -50,20 +52,25 @@ const PickList = props => {
50
52
  // );
51
53
 
52
54
  const getPickList = (0, _react.useCallback)(() => {
55
+ console.log(1, 'getpicklist');
53
56
  setLoading(true);
54
57
  instance.post(_apiUrls.GET_PICKLIST_URL).then(response => {
58
+ console.log(2, 'picklist then');
55
59
  if (!ignoreCurrentRequest.current) {
56
60
  setPickList(response.data.pick_groups);
57
61
  }
58
- }).finally(() => setLoading(false));
62
+ }).catch(error => console.log(3, 'picklist error', error)).finally(() => setLoading(false));
59
63
  }, [instance]);
60
64
  (0, _react.useEffect)(() => {
61
65
  ignoreCurrentRequest.current = false;
62
- getPickList();
66
+ if (isInitialRender.current || shouldRefresh) {
67
+ getPickList();
68
+ }
69
+ isInitialRender.current = false;
63
70
  return () => {
64
71
  ignoreCurrentRequest.current = true;
65
72
  };
66
- }, [getPickList, instance]);
73
+ }, [getPickList, instance, shouldRefresh]);
67
74
  const renderPickGroupItem = renderProps => {
68
75
  return /*#__PURE__*/_react.default.createElement(_pickGroupItem.PickGroupItem, {
69
76
  onPress: onItemPress,
@@ -1 +1 @@
1
- {"version":3,"names":["PickList","props","renderItem","onItemPress","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","instance","useGatherer","t","useTranslation","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 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 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 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,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;IAClCX,UAAU,CAAC,IAAI,CAAC;IAEhBM,QAAQ,CACHM,IAAI,CAACC,yBAAgB,CAAC,CACtBC,IAAI,CAACC,QAAQ,IAAI;MACd,IAAI,CAACX,oBAAoB,CAACY,OAAO,EAAE;QAC/Bb,WAAW,CAACY,QAAQ,CAACE,IAAI,CAACC,WAAW,CAAC;MAC1C;IACJ,CAAC,CAAC,CACDC,OAAO,CAAC,MAAMnB,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACM,QAAQ,CAAC,CAAC;EAEd,IAAAc,gBAAS,EAAC,MAAM;IACZhB,oBAAoB,CAACY,OAAO,GAAG,KAAK;IAEpCN,WAAW,EAAE;IAEb,OAAO,MAAM;MACTN,oBAAoB,CAACY,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACN,WAAW,EAAEJ,QAAQ,CAAC,CAAC;EAE3B,MAAMe,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,6BAAC,4BAAa;MAAC,OAAO,EAAExB,WAAY;MAAC,WAAW,EAAEwB;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,6BAAC,qBAAQ;IACL,UAAU,EAAEvB,OAAQ;IACpB,SAAS,EAAEW,WAAY;IACvB,IAAI,EAAER,QAAS;IACf,UAAU,EAAEL,UAAU,IAAIwB,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,6BAAC,oBAAS;MAAC,IAAI,EAAEjB,CAAC,CAAE,wBAAuBT,OAAO,GAAG,SAAS,GAAG,WAAY,EAAC;IAAE;IACpG;EAAA,EACF;AAEV,CAAC;AAAC"}
1
+ {"version":3,"names":["PickList","props","renderItem","onItemPress","shouldRefresh","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","isInitialRender","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 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(true);\n const isInitialRender = useRef(true);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n // const getPickListWithSearch = useCallback(\n // (searchFieldParam?: string, searchValueParam?: string): void => {\n // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n //\n // setLoading(true);\n //\n // instance\n // .post(url, {\n // searchField: searchFieldParam,\n // searchValue: searchValueParam,\n // })\n // .then(response => setPickList(response.data.pick_groups))\n // .catch(error => {\n // 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(1, 'getpicklist');\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n console.log(2, 'picklist then');\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => console.log(3, 'picklist error', error))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (isInitialRender.current || shouldRefresh) {\n getPickList();\n }\n\n isInitialRender.current = false;\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, shouldRefresh]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n // const handlePickListFromSearch = useCallback(\n // (search: string): void => {\n // getPickListWithSearch('', search);\n // },\n // [getPickListWithSearch],\n // );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={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,IAAI,CAAC;EACzC,MAAMC,eAAe,GAAG,IAAAD,aAAM,EAAC,IAAI,CAAC;EACpC,MAAM;IAACE;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;IAC7Bd,UAAU,CAAC,IAAI,CAAC;IAEhBO,QAAQ,CACHQ,IAAI,CAACC,yBAAgB,CAAC,CACtBC,IAAI,CAACC,QAAQ,IAAI;MACdL,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,eAAe,CAAC;MAC/B,IAAI,CAACV,oBAAoB,CAACe,OAAO,EAAE;QAC/BhB,WAAW,CAACe,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,MAAMxB,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACO,QAAQ,CAAC,CAAC;EAEd,IAAAkB,gBAAS,EAAC,MAAM;IACZrB,oBAAoB,CAACe,OAAO,GAAG,KAAK;IAEpC,IAAIb,eAAe,CAACa,OAAO,IAAIrB,aAAa,EAAE;MAC1Ca,WAAW,EAAE;IACjB;IAEAL,eAAe,CAACa,OAAO,GAAG,KAAK;IAE/B,OAAO,MAAM;MACTf,oBAAoB,CAACe,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACR,WAAW,EAAEJ,QAAQ,EAAET,aAAa,CAAC,CAAC;EAE1C,MAAM4B,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,6BAAC,4BAAa;MAAC,OAAO,EAAE9B,WAAY;MAAC,WAAW,EAAE8B;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,6BAAC,qBAAQ;IACL,UAAU,EAAE5B,OAAQ;IACpB,SAAS,EAAEY,WAAY;IACvB,IAAI,EAAET,QAAS;IACf,UAAU,EAAEN,UAAU,IAAI8B,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,6BAAC,oBAAS;MAAC,IAAI,EAAErB,CAAC,CAAE,wBAAuBV,OAAO,GAAG,SAAS,GAAG,WAAY,EAAC;IAAE;IACpG;EAAA,EACF;AAEV,CAAC;AAAC"}
@@ -8,11 +8,13 @@ import { PickGroupItem } from './partials/pick-group-item';
8
8
  export const PickList = props => {
9
9
  const {
10
10
  renderItem,
11
- onItemPress
11
+ onItemPress,
12
+ shouldRefresh
12
13
  } = props;
13
14
  const [loading, setLoading] = useState(true);
14
15
  const [pickList, setPickList] = useState([]);
15
16
  const ignoreCurrentRequest = useRef(true);
17
+ const isInitialRender = useRef(true);
16
18
  const {
17
19
  instance
18
20
  } = useGatherer();
@@ -42,20 +44,25 @@ export const PickList = props => {
42
44
  // );
43
45
 
44
46
  const getPickList = useCallback(() => {
47
+ console.log(1, 'getpicklist');
45
48
  setLoading(true);
46
49
  instance.post(GET_PICKLIST_URL).then(response => {
50
+ console.log(2, 'picklist then');
47
51
  if (!ignoreCurrentRequest.current) {
48
52
  setPickList(response.data.pick_groups);
49
53
  }
50
- }).finally(() => setLoading(false));
54
+ }).catch(error => console.log(3, 'picklist error', error)).finally(() => setLoading(false));
51
55
  }, [instance]);
52
56
  useEffect(() => {
53
57
  ignoreCurrentRequest.current = false;
54
- getPickList();
58
+ if (isInitialRender.current || shouldRefresh) {
59
+ getPickList();
60
+ }
61
+ isInitialRender.current = false;
55
62
  return () => {
56
63
  ignoreCurrentRequest.current = true;
57
64
  };
58
- }, [getPickList, instance]);
65
+ }, [getPickList, instance, shouldRefresh]);
59
66
  const renderPickGroupItem = renderProps => {
60
67
  return /*#__PURE__*/React.createElement(PickGroupItem, {
61
68
  onPress: onItemPress,
@@ -1 +1 @@
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","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 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 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 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;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;IAClCe,UAAU,CAAC,IAAI,CAAC;IAEhBI,QAAQ,CACHG,IAAI,CAACd,gBAAgB,CAAC,CACtBe,IAAI,CAACC,QAAQ,IAAI;MACd,IAAI,CAACN,oBAAoB,CAACO,OAAO,EAAE;QAC/BR,WAAW,CAACO,QAAQ,CAACE,IAAI,CAACC,WAAW,CAAC;MAC1C;IACJ,CAAC,CAAC,CACDC,OAAO,CAAC,MAAMb,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACI,QAAQ,CAAC,CAAC;EAEdlB,SAAS,CAAC,MAAM;IACZiB,oBAAoB,CAACO,OAAO,GAAG,KAAK;IAEpCJ,WAAW,EAAE;IAEb,OAAO,MAAM;MACTH,oBAAoB,CAACO,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACJ,WAAW,EAAEF,QAAQ,CAAC,CAAC;EAE3B,MAAMU,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,oBAAC,aAAa;MAAC,OAAO,EAAEjB,WAAY;MAAC,WAAW,EAAEiB;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,oBAAC,QAAQ;IACL,UAAU,EAAEhB,OAAQ;IACpB,SAAS,EAAEO,WAAY;IACvB,IAAI,EAAEL,QAAS;IACf,UAAU,EAAEJ,UAAU,IAAIiB,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,oBAAC,SAAS;MAAC,IAAI,EAAEb,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","shouldRefresh","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","isInitialRender","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 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(true);\n const isInitialRender = useRef(true);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n // const getPickListWithSearch = useCallback(\n // (searchFieldParam?: string, searchValueParam?: string): void => {\n // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n //\n // setLoading(true);\n //\n // instance\n // .post(url, {\n // searchField: searchFieldParam,\n // searchValue: searchValueParam,\n // })\n // .then(response => setPickList(response.data.pick_groups))\n // .catch(error => {\n // 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(1, 'getpicklist');\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n console.log(2, 'picklist then');\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => console.log(3, 'picklist error', error))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (isInitialRender.current || shouldRefresh) {\n getPickList();\n }\n\n isInitialRender.current = false;\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, shouldRefresh]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n // const handlePickListFromSearch = useCallback(\n // (search: string): void => {\n // getPickListWithSearch('', search);\n // },\n // [getPickListWithSearch],\n // );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={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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"}
@@ -1,6 +1,7 @@
1
1
  import { ListRenderItem } from 'react-native';
2
2
  interface props<T> {
3
3
  isAfterPickList?: boolean;
4
+ shouldRefresh?: boolean;
4
5
  renderItem?: ListRenderItem<T>;
5
6
  onItemPress?: (pickGroup: T) => void;
6
7
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrumble-nl/gatherer-frontend",
3
- "version": "1.1.2-beta.4",
3
+ "version": "1.1.2-beta.6",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -10,15 +10,17 @@ import {PickGroupItem} from './partials/pick-group-item';
10
10
 
11
11
  interface props<T> {
12
12
  isAfterPickList?: boolean;
13
+ shouldRefresh?: boolean;
13
14
  renderItem?: ListRenderItem<T>;
14
15
  onItemPress?: (pickGroup: T) => void;
15
16
  }
16
17
 
17
18
  export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
18
- const {renderItem, onItemPress} = props;
19
+ const {renderItem, onItemPress, shouldRefresh} = props;
19
20
  const [loading, setLoading] = useState<boolean>(true);
20
21
  const [pickList, setPickList] = useState<T[]>([]);
21
22
  const ignoreCurrentRequest = useRef(true);
23
+ const isInitialRender = useRef(true);
22
24
  const {instance} = useGatherer();
23
25
  const {t} = useTranslation();
24
26
 
@@ -44,27 +46,34 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
44
46
  // );
45
47
 
46
48
  const getPickList = useCallback(() => {
49
+ console.log(1, 'getpicklist');
47
50
  setLoading(true);
48
51
 
49
52
  instance
50
53
  .post(GET_PICKLIST_URL)
51
54
  .then(response => {
55
+ console.log(2, 'picklist then');
52
56
  if (!ignoreCurrentRequest.current) {
53
57
  setPickList(response.data.pick_groups);
54
58
  }
55
59
  })
60
+ .catch(error => console.log(3, 'picklist error', error))
56
61
  .finally(() => setLoading(false));
57
62
  }, [instance]);
58
63
 
59
64
  useEffect(() => {
60
65
  ignoreCurrentRequest.current = false;
61
66
 
62
- getPickList();
67
+ if (isInitialRender.current || shouldRefresh) {
68
+ getPickList();
69
+ }
70
+
71
+ isInitialRender.current = false;
63
72
 
64
73
  return () => {
65
74
  ignoreCurrentRequest.current = true;
66
75
  };
67
- }, [getPickList, instance]);
76
+ }, [getPickList, instance, shouldRefresh]);
68
77
 
69
78
  const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {
70
79
  return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;