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

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,7 +16,8 @@ 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)([]);
@@ -56,11 +57,17 @@ const PickList = props => {
56
57
  if (!ignoreCurrentRequest.current) {
57
58
  setPickList(response.data.pick_groups);
58
59
  }
59
- }).catch(error => {
60
- console.log('error picklist initial', error);
61
- _reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG);
62
60
  }).finally(() => setLoading(false));
63
61
  }, [instance]);
62
+ (0, _react.useEffect)(() => {
63
+ ignoreCurrentRequest.current = false;
64
+ if (shouldRefresh) {
65
+ getPickList();
66
+ }
67
+ return () => {
68
+ ignoreCurrentRequest.current = true;
69
+ };
70
+ }, [getPickList, shouldRefresh]);
64
71
  (0, _react.useEffect)(() => {
65
72
  ignoreCurrentRequest.current = false;
66
73
  getPickList();
@@ -1 +1 @@
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
+ {"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,5 +1,5 @@
1
1
  import React, { useCallback, useEffect, useRef, useState } from 'react';
2
- import { FlatList, ToastAndroid } from 'react-native';
2
+ import { FlatList } from 'react-native';
3
3
  import { useTranslation } from 'react-i18next';
4
4
  import { EmptyList } from './partials/empty-list';
5
5
  import { useGatherer } from '../hooks/use-gatherer';
@@ -8,7 +8,8 @@ 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([]);
@@ -48,11 +49,17 @@ export const PickList = props => {
48
49
  if (!ignoreCurrentRequest.current) {
49
50
  setPickList(response.data.pick_groups);
50
51
  }
51
- }).catch(error => {
52
- console.log('error picklist initial', error);
53
- ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
54
52
  }).finally(() => setLoading(false));
55
53
  }, [instance]);
54
+ useEffect(() => {
55
+ ignoreCurrentRequest.current = false;
56
+ if (shouldRefresh) {
57
+ getPickList();
58
+ }
59
+ return () => {
60
+ ignoreCurrentRequest.current = true;
61
+ };
62
+ }, [getPickList, shouldRefresh]);
56
63
  useEffect(() => {
57
64
  ignoreCurrentRequest.current = false;
58
65
  getPickList();
@@ -1 +1 @@
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
+ {"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,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.2",
3
+ "version": "1.1.2-beta.3",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -1,5 +1,5 @@
1
1
  import React, {useCallback, useEffect, useRef, useState} from 'react';
2
- import {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';
2
+ import {FlatList, ListRenderItem, ListRenderItemInfo} from 'react-native';
3
3
 
4
4
  import {useTranslation} from 'react-i18next';
5
5
 
@@ -10,12 +10,13 @@ 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(false);
@@ -55,13 +56,21 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
55
56
  setPickList(response.data.pick_groups);
56
57
  }
57
58
  })
58
- .catch(error => {
59
- console.log('error picklist initial', error);
60
- ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
61
- })
62
59
  .finally(() => setLoading(false));
63
60
  }, [instance]);
64
61
 
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
+
65
74
  useEffect(() => {
66
75
  ignoreCurrentRequest.current = false;
67
76