@scrumble-nl/gatherer-frontend 0.1.0 → 0.1.1

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.
@@ -10,7 +10,6 @@ var _reactI18next = require("react-i18next");
10
10
  var _search = require("./partials/search");
11
11
  var _emptyList = require("./partials/empty-list");
12
12
  var _useInstance = require("../hooks/use-instance");
13
- var _useDebounce = require("../hooks/use-debounce");
14
13
  var _pickGroupItem = require("./partials/pick-group-item");
15
14
  var _apiUrls = require("../shared/api/api-urls");
16
15
  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); }
@@ -24,36 +23,38 @@ const PickList = props => {
24
23
  } = props;
25
24
  const [loading, setLoading] = (0, _react.useState)(true);
26
25
  const [pickList, setPickList] = (0, _react.useState)([]);
27
- const ignoreCurrentRequest = (0, _react.useRef)(false);
28
26
  const {
29
27
  t
30
28
  } = (0, _reactI18next.useTranslation)();
31
29
  const instance = (0, _useInstance.useInstance)();
32
- const searchField = (0, _useDebounce.useDebounce)(searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchField, 500);
33
- const searchValue = (0, _useDebounce.useDebounce)(searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchValue, 500);
34
- const getPickList = (0, _react.useCallback)((searchFieldParam, searchValueParam) => {
30
+ const getPickListWithSearch = (0, _react.useCallback)((searchFieldParam, searchValueParam) => {
35
31
  const url = isAfterPickList ? _apiUrls.GET_AFTER_PICKLIST_URL : _apiUrls.GET_PICKLIST_URL;
36
32
  setLoading(true);
37
33
  instance.post(url, {
38
34
  searchField: searchFieldParam ?? null,
39
35
  searchValue: searchValueParam ?? null
40
36
  }).then(response => {
41
- if (!ignoreCurrentRequest.current) {
42
- setPickList(response.data.pick_groups);
43
- }
37
+ setPickList(response.data.pick_groups);
44
38
  }).catch(error => _reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG)).finally(() => setLoading(false));
45
39
  }, [instance, isAfterPickList]);
46
40
  const handleRefresh = (0, _react.useCallback)(() => {
47
- ignoreCurrentRequest.current = false;
48
- getPickList();
49
- }, [getPickList]);
41
+ getPickListWithSearch();
42
+ }, [getPickListWithSearch]);
50
43
  (0, _react.useEffect)(() => {
51
- ignoreCurrentRequest.current = false;
52
- getPickList(searchField, searchValue);
44
+ let ignoreCurrentRequest = false;
45
+ setLoading(true);
46
+ instance.post(_apiUrls.GET_PICKLIST_URL, {
47
+ searchField: null,
48
+ searchValue: null
49
+ }).then(response => {
50
+ if (!ignoreCurrentRequest) {
51
+ setPickList(response.data.pick_groups);
52
+ }
53
+ }).catch(error => _reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG)).finally(() => setLoading(false));
53
54
  return () => {
54
- ignoreCurrentRequest.current = true;
55
+ ignoreCurrentRequest = true;
55
56
  };
56
- }, [getPickList, instance, searchField, searchValue]);
57
+ }, [instance]);
57
58
  const renderPickGroupItem = renderProps => {
58
59
  return /*#__PURE__*/_react.default.createElement(_pickGroupItem.PickGroupItem, {
59
60
  onPress: onItemPress,
@@ -61,9 +62,8 @@ const PickList = props => {
61
62
  });
62
63
  };
63
64
  const handlePickListFromSearch = (0, _react.useCallback)(search => {
64
- ignoreCurrentRequest.current = false;
65
- getPickList('', search);
66
- }, [getPickList]);
65
+ getPickListWithSearch('', search);
66
+ }, [getPickListWithSearch]);
67
67
  return /*#__PURE__*/_react.default.createElement(_reactNative.FlatList, {
68
68
  refreshing: loading,
69
69
  onRefresh: handleRefresh,
@@ -1 +1 @@
1
- {"version":3,"names":["PickList","props","isAfterPickList","renderItem","searchParams","onItemPress","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","t","useTranslation","instance","useInstance","searchField","useDebounce","searchValue","getPickList","useCallback","searchFieldParam","searchValueParam","url","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","post","then","response","current","data","pick_groups","catch","error","ToastAndroid","show","LONG","finally","handleRefresh","useEffect","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString","undefined"],"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 {useInstance} from '../hooks/use-instance';\nimport {useDebounce} from '../hooks/use-debounce';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props {\n isAfterPickList?: boolean;\n renderItem?: ListRenderItem<PickGroup>;\n searchParams?: SearchParams;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, searchParams, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<PickGroup[]>([]);\n const ignoreCurrentRequest = useRef<boolean>(false);\n const {t} = useTranslation();\n const instance = useInstance();\n const searchField = useDebounce(searchParams?.searchField, 500);\n const searchValue = useDebounce(searchParams?.searchValue, 500);\n\n const getPickList = 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 ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n const handleRefresh = useCallback(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList();\n }, [getPickList]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList(searchField, searchValue);\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, searchField, searchValue]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n ignoreCurrentRequest.current = false;\n\n getPickList('', search);\n },\n [getPickList],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={handleRefresh}\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={searchParams ? undefined : <Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
1
+ {"version":3,"names":["PickList","props","isAfterPickList","renderItem","searchParams","onItemPress","loading","setLoading","useState","pickList","setPickList","t","useTranslation","instance","useInstance","getPickListWithSearch","useCallback","searchFieldParam","searchValueParam","url","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","post","searchField","searchValue","then","response","data","pick_groups","catch","error","ToastAndroid","show","LONG","finally","handleRefresh","useEffect","ignoreCurrentRequest","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString","undefined"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, 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 {useInstance} from '../hooks/use-instance';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props {\n isAfterPickList?: boolean;\n renderItem?: ListRenderItem<PickGroup>;\n searchParams?: SearchParams;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, searchParams, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<PickGroup[]>([]);\n const {t} = useTranslation();\n const instance = useInstance();\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 ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n setPickList(response.data.pick_groups);\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n const handleRefresh = useCallback(() => {\n getPickListWithSearch();\n }, [getPickListWithSearch]);\n\n useEffect(() => {\n let ignoreCurrentRequest = false;\n\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL, {\n searchField: null,\n searchValue: null,\n })\n .then(response => {\n if (!ignoreCurrentRequest) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n\n return () => {\n ignoreCurrentRequest = true;\n };\n }, [instance]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): 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={handleRefresh}\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={searchParams ? undefined : <Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
@@ -1,10 +1,9 @@
1
- import React, { useCallback, useEffect, useRef, useState } from 'react';
1
+ import React, { useCallback, useEffect, useState } from 'react';
2
2
  import { FlatList, ToastAndroid } from 'react-native';
3
3
  import { useTranslation } from 'react-i18next';
4
4
  import { Search } from './partials/search';
5
5
  import { EmptyList } from './partials/empty-list';
6
6
  import { useInstance } from '../hooks/use-instance';
7
- import { useDebounce } from '../hooks/use-debounce';
8
7
  import { PickGroupItem } from './partials/pick-group-item';
9
8
  import { GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL } from '../shared/api/api-urls';
10
9
  export const PickList = props => {
@@ -16,36 +15,38 @@ export const PickList = props => {
16
15
  } = props;
17
16
  const [loading, setLoading] = useState(true);
18
17
  const [pickList, setPickList] = useState([]);
19
- const ignoreCurrentRequest = useRef(false);
20
18
  const {
21
19
  t
22
20
  } = useTranslation();
23
21
  const instance = useInstance();
24
- const searchField = useDebounce(searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchField, 500);
25
- const searchValue = useDebounce(searchParams === null || searchParams === void 0 ? void 0 : searchParams.searchValue, 500);
26
- const getPickList = useCallback((searchFieldParam, searchValueParam) => {
22
+ const getPickListWithSearch = useCallback((searchFieldParam, searchValueParam) => {
27
23
  const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
28
24
  setLoading(true);
29
25
  instance.post(url, {
30
26
  searchField: searchFieldParam ?? null,
31
27
  searchValue: searchValueParam ?? null
32
28
  }).then(response => {
33
- if (!ignoreCurrentRequest.current) {
34
- setPickList(response.data.pick_groups);
35
- }
29
+ setPickList(response.data.pick_groups);
36
30
  }).catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG)).finally(() => setLoading(false));
37
31
  }, [instance, isAfterPickList]);
38
32
  const handleRefresh = useCallback(() => {
39
- ignoreCurrentRequest.current = false;
40
- getPickList();
41
- }, [getPickList]);
33
+ getPickListWithSearch();
34
+ }, [getPickListWithSearch]);
42
35
  useEffect(() => {
43
- ignoreCurrentRequest.current = false;
44
- getPickList(searchField, searchValue);
36
+ let ignoreCurrentRequest = false;
37
+ setLoading(true);
38
+ instance.post(GET_PICKLIST_URL, {
39
+ searchField: null,
40
+ searchValue: null
41
+ }).then(response => {
42
+ if (!ignoreCurrentRequest) {
43
+ setPickList(response.data.pick_groups);
44
+ }
45
+ }).catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG)).finally(() => setLoading(false));
45
46
  return () => {
46
- ignoreCurrentRequest.current = true;
47
+ ignoreCurrentRequest = true;
47
48
  };
48
- }, [getPickList, instance, searchField, searchValue]);
49
+ }, [instance]);
49
50
  const renderPickGroupItem = renderProps => {
50
51
  return /*#__PURE__*/React.createElement(PickGroupItem, {
51
52
  onPress: onItemPress,
@@ -53,9 +54,8 @@ export const PickList = props => {
53
54
  });
54
55
  };
55
56
  const handlePickListFromSearch = useCallback(search => {
56
- ignoreCurrentRequest.current = false;
57
- getPickList('', search);
58
- }, [getPickList]);
57
+ getPickListWithSearch('', search);
58
+ }, [getPickListWithSearch]);
59
59
  return /*#__PURE__*/React.createElement(FlatList, {
60
60
  refreshing: loading,
61
61
  onRefresh: handleRefresh,
@@ -1 +1 @@
1
- {"version":3,"names":["React","useCallback","useEffect","useRef","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useInstance","useDebounce","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","searchParams","onItemPress","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","t","instance","searchField","searchValue","getPickList","searchFieldParam","searchValueParam","url","post","then","response","current","data","pick_groups","catch","error","show","LONG","finally","handleRefresh","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString","undefined"],"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 {useInstance} from '../hooks/use-instance';\nimport {useDebounce} from '../hooks/use-debounce';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props {\n isAfterPickList?: boolean;\n renderItem?: ListRenderItem<PickGroup>;\n searchParams?: SearchParams;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, searchParams, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<PickGroup[]>([]);\n const ignoreCurrentRequest = useRef<boolean>(false);\n const {t} = useTranslation();\n const instance = useInstance();\n const searchField = useDebounce(searchParams?.searchField, 500);\n const searchValue = useDebounce(searchParams?.searchValue, 500);\n\n const getPickList = 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 ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n const handleRefresh = useCallback(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList();\n }, [getPickList]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n getPickList(searchField, searchValue);\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, searchField, searchValue]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n ignoreCurrentRequest.current = false;\n\n getPickList('', search);\n },\n [getPickList],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={handleRefresh}\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={searchParams ? undefined : <Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
1
+ {"version":3,"names":["React","useCallback","useEffect","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useInstance","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","searchParams","onItemPress","loading","setLoading","pickList","setPickList","t","instance","getPickListWithSearch","searchFieldParam","searchValueParam","url","post","searchField","searchValue","then","response","data","pick_groups","catch","error","show","LONG","finally","handleRefresh","ignoreCurrentRequest","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString","undefined"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, 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 {useInstance} from '../hooks/use-instance';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props {\n isAfterPickList?: boolean;\n renderItem?: ListRenderItem<PickGroup>;\n searchParams?: SearchParams;\n onItemPress?: (pickGroup: PickGroup) => void;\n}\n\nexport const PickList = (props: props): JSX.Element => {\n const {isAfterPickList, renderItem, searchParams, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<PickGroup[]>([]);\n const {t} = useTranslation();\n const instance = useInstance();\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 ?? null,\n searchValue: searchValueParam ?? null,\n })\n .then(response => {\n setPickList(response.data.pick_groups);\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n const handleRefresh = useCallback(() => {\n getPickListWithSearch();\n }, [getPickListWithSearch]);\n\n useEffect(() => {\n let ignoreCurrentRequest = false;\n\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL, {\n searchField: null,\n searchValue: null,\n })\n .then(response => {\n if (!ignoreCurrentRequest) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n\n return () => {\n ignoreCurrentRequest = true;\n };\n }, [instance]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): 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={handleRefresh}\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={searchParams ? undefined : <Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrumble-nl/gatherer-frontend",
3
- "version": "0.1.0",
3
+ "version": "0.1.1",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -1,4 +1,4 @@
1
- import React, {useCallback, useEffect, useRef, useState} from 'react';
1
+ import React, {useCallback, useEffect, useState} from 'react';
2
2
  import {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';
3
3
 
4
4
  import {useTranslation} from 'react-i18next';
@@ -6,7 +6,6 @@ import {useTranslation} from 'react-i18next';
6
6
  import {Search} from './partials/search';
7
7
  import {EmptyList} from './partials/empty-list';
8
8
  import {useInstance} from '../hooks/use-instance';
9
- import {useDebounce} from '../hooks/use-debounce';
10
9
  import {PickGroupItem} from './partials/pick-group-item';
11
10
  import {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';
12
11
 
@@ -21,13 +20,10 @@ export const PickList = (props: props): JSX.Element => {
21
20
  const {isAfterPickList, renderItem, searchParams, onItemPress} = props;
22
21
  const [loading, setLoading] = useState<boolean>(true);
23
22
  const [pickList, setPickList] = useState<PickGroup[]>([]);
24
- const ignoreCurrentRequest = useRef<boolean>(false);
25
23
  const {t} = useTranslation();
26
24
  const instance = useInstance();
27
- const searchField = useDebounce(searchParams?.searchField, 500);
28
- const searchValue = useDebounce(searchParams?.searchValue, 500);
29
25
 
30
- const getPickList = useCallback(
26
+ const getPickListWithSearch = useCallback(
31
27
  (searchFieldParam?: string, searchValueParam?: string): void => {
32
28
  const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
33
29
 
@@ -39,9 +35,7 @@ export const PickList = (props: props): JSX.Element => {
39
35
  searchValue: searchValueParam ?? null,
40
36
  })
41
37
  .then(response => {
42
- if (!ignoreCurrentRequest.current) {
43
- setPickList(response.data.pick_groups);
44
- }
38
+ setPickList(response.data.pick_groups);
45
39
  })
46
40
  .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))
47
41
  .finally(() => setLoading(false));
@@ -50,20 +44,31 @@ export const PickList = (props: props): JSX.Element => {
50
44
  );
51
45
 
52
46
  const handleRefresh = useCallback(() => {
53
- ignoreCurrentRequest.current = false;
54
-
55
- getPickList();
56
- }, [getPickList]);
47
+ getPickListWithSearch();
48
+ }, [getPickListWithSearch]);
57
49
 
58
50
  useEffect(() => {
59
- ignoreCurrentRequest.current = false;
60
-
61
- getPickList(searchField, searchValue);
51
+ let ignoreCurrentRequest = false;
52
+
53
+ setLoading(true);
54
+
55
+ instance
56
+ .post(GET_PICKLIST_URL, {
57
+ searchField: null,
58
+ searchValue: null,
59
+ })
60
+ .then(response => {
61
+ if (!ignoreCurrentRequest) {
62
+ setPickList(response.data.pick_groups);
63
+ }
64
+ })
65
+ .catch(error => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))
66
+ .finally(() => setLoading(false));
62
67
 
63
68
  return () => {
64
- ignoreCurrentRequest.current = true;
69
+ ignoreCurrentRequest = true;
65
70
  };
66
- }, [getPickList, instance, searchField, searchValue]);
71
+ }, [instance]);
67
72
 
68
73
  const renderPickGroupItem = (renderProps: ListRenderItemInfo<PickGroup>): JSX.Element => {
69
74
  return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;
@@ -71,11 +76,9 @@ export const PickList = (props: props): JSX.Element => {
71
76
 
72
77
  const handlePickListFromSearch = useCallback(
73
78
  (search: string): void => {
74
- ignoreCurrentRequest.current = false;
75
-
76
- getPickList('', search);
79
+ getPickListWithSearch('', search);
77
80
  },
78
- [getPickList],
81
+ [getPickListWithSearch],
79
82
  );
80
83
 
81
84
  return (