@scrumble-nl/gatherer-frontend 1.0.15 → 1.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.
- package/lib/commonjs/context/gatherer-context.js +1 -10
- package/lib/commonjs/context/gatherer-context.js.map +1 -1
- package/lib/commonjs/hooks/use-pick-item-switch.js +3 -5
- package/lib/commonjs/hooks/use-pick-item-switch.js.map +1 -1
- package/lib/commonjs/pick-list/pick-list.js +0 -1
- package/lib/commonjs/pick-list/pick-list.js.map +1 -1
- package/lib/module/context/gatherer-context.js +2 -11
- package/lib/module/context/gatherer-context.js.map +1 -1
- package/lib/module/hooks/use-pick-item-switch.js +3 -5
- package/lib/module/hooks/use-pick-item-switch.js.map +1 -1
- package/lib/module/pick-list/pick-list.js +0 -1
- package/lib/module/pick-list/pick-list.js.map +1 -1
- package/lib/typescript/context/gatherer-context.d.ts +1 -2
- package/package.json +1 -1
- package/src/context/gatherer-context.tsx +2 -15
- package/src/hooks/use-pick-item-switch.tsx +3 -7
- package/src/pick-list/pick-list.tsx +0 -2
|
@@ -19,7 +19,6 @@ const GathererContext = /*#__PURE__*/(0, _react.createContext)({
|
|
|
19
19
|
instance: _axios.default.create(),
|
|
20
20
|
pickItem: _defaultPickGroupItem.defaultPickGroupItem,
|
|
21
21
|
savePickGroupData: () => undefined,
|
|
22
|
-
setPickGroupPicked: () => new Promise(() => undefined),
|
|
23
22
|
startPicking: () => new Promise(() => undefined),
|
|
24
23
|
switchPickItem: () => new Promise(() => undefined)
|
|
25
24
|
});
|
|
@@ -40,13 +39,6 @@ const GathererContextProvider = props => {
|
|
|
40
39
|
const savePickGroupData = (0, _react.useCallback)(data => {
|
|
41
40
|
setPickItem(data);
|
|
42
41
|
}, []);
|
|
43
|
-
const setPickGroupPicked = (0, _react.useCallback)(async pickGroupId => {
|
|
44
|
-
return new Promise((resolve, reject) => {
|
|
45
|
-
instance.patch(_apiUrls.SET_GROUP_PICKED_URL, {
|
|
46
|
-
pick_group_id: pickGroupId
|
|
47
|
-
}).then(resolve).catch(reject);
|
|
48
|
-
});
|
|
49
|
-
}, [instance]);
|
|
50
42
|
const startPicking = (0, _react.useCallback)(async pickGroupId => {
|
|
51
43
|
return new Promise((resolve, reject) => {
|
|
52
44
|
instance.post(_apiUrls.START_PICKING_URL, {
|
|
@@ -92,9 +84,8 @@ const GathererContextProvider = props => {
|
|
|
92
84
|
switchPickItem,
|
|
93
85
|
savePickGroupData,
|
|
94
86
|
scanImplementation,
|
|
95
|
-
setPickGroupPicked,
|
|
96
87
|
currentPickGroupId: currentPickGroupId.current
|
|
97
|
-
}), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation,
|
|
88
|
+
}), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
|
|
98
89
|
return /*#__PURE__*/_react.default.createElement(GathererContext.Provider, {
|
|
99
90
|
value: context
|
|
100
91
|
}, /*#__PURE__*/_react.default.createElement(_scanContext.ScanContextProvider, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["GathererContext","createContext","currentPickGroupId","onLastPick","undefined","instance","axios","create","pickItem","defaultPickGroupItem","savePickGroupData","
|
|
1
|
+
{"version":3,"names":["GathererContext","createContext","currentPickGroupId","onLastPick","undefined","instance","axios","create","pickItem","defaultPickGroupItem","savePickGroupData","startPicking","Promise","switchPickItem","GathererContextProvider","props","scanImplementation","language","config","setPickItem","useState","useRef","useEffect","registerEventListener","useCallback","data","pickGroupId","resolve","reject","post","START_PICKING_URL","pick_group_id","then","response","current","catch","dir","url","PREV_PICK_ITEM_URL","NEXT_PICK_ITEM_URL","prevState","previous","next","pick_item_id","id","i18n","changeLanguage","context","useMemo","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport axios, {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n}\n\ninterface props {\n children: ReactNode;\n config: GathererConfig;\n}\n\nexport const GathererContext = createContext<IGathererContext<any>>({\n currentPickGroupId: 0,\n onLastPick: () => undefined,\n instance: axios.create(),\n pickItem: defaultPickGroupItem,\n savePickGroupData: () => undefined,\n startPicking: () => new Promise(() => undefined),\n switchPickItem: () => new Promise(() => undefined),\n});\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language} = props.config;\n const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);\n const currentPickGroupId = useRef<number>(0);\n\n useEffect(() => {\n scanImplementation.registerEventListener?.();\n }, [scanImplementation]);\n\n const savePickGroupData = useCallback((data: PickItem<T>): void => {\n setPickItem(data);\n }, []);\n\n const startPicking = useCallback(\n async (pickGroupId: number): Promise<PickItem<T>> => {\n return new Promise((resolve, reject) => {\n instance\n .post(START_PICKING_URL, {pick_group_id: pickGroupId})\n .then(response => {\n currentPickGroupId.current = pickGroupId;\n savePickGroupData(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, savePickGroupData],\n );\n\n const switchPickItem = useCallback(\n async (dir: ControlDir): Promise<PickItem<T>> => {\n const url = dir === 'prev' ? PREV_PICK_ITEM_URL : NEXT_PICK_ITEM_URL;\n\n setPickItem(prevState => {\n if (dir === 'prev' && prevState.previous) {\n return prevState.previous;\n }\n\n if (dir === 'next' && prevState.next) {\n return prevState.next;\n }\n\n return prevState;\n });\n\n return new Promise((resolve, reject) => {\n instance\n .post(url, {\n pick_group_id: currentPickGroupId.current,\n pick_item_id: pickItem.pickItem.id,\n })\n .then(response => {\n setPickItem(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, pickItem.pickItem.id],\n );\n\n useEffect(() => {\n if (language) {\n i18n.changeLanguage(language);\n }\n }, [language]);\n\n const context = useMemo(\n () => ({\n pickItem,\n instance,\n onLastPick,\n startPicking,\n switchPickItem,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [\n instance,\n onLastPick,\n pickItem,\n savePickGroupData,\n scanImplementation,\n startPicking,\n switchPickItem,\n ],\n );\n\n return (\n <GathererContext.Provider value={context}>\n <ScanContextProvider scanner={props.config.scanImplementation}>{props.children}</ScanContextProvider>\n </GathererContext.Provider>\n );\n};\n"],"mappings":"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"}
|
|
@@ -14,8 +14,7 @@ const usePickItemSwitch = () => {
|
|
|
14
14
|
savePickGroupData,
|
|
15
15
|
switchPickItem,
|
|
16
16
|
onLastPick,
|
|
17
|
-
instance
|
|
18
|
-
setPickGroupPicked
|
|
17
|
+
instance
|
|
19
18
|
} = (0, _useGatherer.useGatherer)();
|
|
20
19
|
const retrieveNextPickItem = (0, _react.useCallback)(() => {
|
|
21
20
|
switchPickItem('next');
|
|
@@ -27,13 +26,12 @@ const usePickItemSwitch = () => {
|
|
|
27
26
|
pick_item_id: pickItem.pickItem.id,
|
|
28
27
|
metadata: metaData
|
|
29
28
|
}).then(response => {
|
|
30
|
-
console.log('pick group finished', response);
|
|
31
29
|
if (response.data.content === 'Pick group finished') {
|
|
32
|
-
|
|
30
|
+
onLastPick();
|
|
33
31
|
} else {
|
|
34
32
|
savePickGroupData(response.data);
|
|
35
33
|
}
|
|
36
|
-
})
|
|
34
|
+
});
|
|
37
35
|
}, [currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData]);
|
|
38
36
|
const nextPickItem = (0, _react.useCallback)((isSkip, quantityPicked, metaData) => {
|
|
39
37
|
if (isSkip) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["usePickItemSwitch","pickItem","currentPickGroupId","savePickGroupData","switchPickItem","onLastPick","instance","
|
|
1
|
+
{"version":3,"names":["usePickItemSwitch","pickItem","currentPickGroupId","savePickGroupData","switchPickItem","onLastPick","instance","useGatherer","retrieveNextPickItem","useCallback","setItemToPicked","quantityPicked","metaData","patch","SET_ITEM_PICKED_URL","quantity_picked","pick_group_id","pick_item_id","id","metadata","then","response","data","content","nextPickItem","isSkip","previousPickItem"],"sources":["use-pick-item-switch.tsx"],"sourcesContent":["import {useCallback} from 'react';\n\nimport {useGatherer} from './use-gatherer';\nimport {SET_ITEM_PICKED_URL} from '../shared/api/api-urls';\n\nexport const usePickItemSwitch = (): ProductSwitch => {\n const {pickItem, currentPickGroupId, savePickGroupData, switchPickItem, onLastPick, instance} = useGatherer();\n\n const retrieveNextPickItem = useCallback((): void => {\n switchPickItem('next');\n }, [switchPickItem]);\n\n const setItemToPicked = useCallback(\n (quantityPicked?: number, metaData?: any): void => {\n instance\n .patch(SET_ITEM_PICKED_URL, {\n quantity_picked: quantityPicked,\n pick_group_id: currentPickGroupId,\n pick_item_id: pickItem.pickItem.id,\n metadata: metaData,\n })\n .then(response => {\n if (response.data.content === 'Pick group finished') {\n onLastPick();\n } else {\n savePickGroupData(response.data);\n }\n });\n },\n [currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData],\n );\n\n const nextPickItem = useCallback(\n (isSkip: boolean, quantityPicked?: number, metaData?: any): void => {\n if (isSkip) {\n retrieveNextPickItem();\n return;\n }\n\n setItemToPicked(quantityPicked, metaData);\n },\n [retrieveNextPickItem, setItemToPicked],\n );\n\n const previousPickItem = useCallback((): void => {\n switchPickItem('prev');\n }, [switchPickItem]);\n\n return {\n nextPickItem,\n previousPickItem,\n };\n};\n"],"mappings":";;;;;;AAAA;AAEA;AACA;AAEO,MAAMA,iBAAiB,GAAG,MAAqB;EAClD,MAAM;IAACC,QAAQ;IAAEC,kBAAkB;IAAEC,iBAAiB;IAAEC,cAAc;IAAEC,UAAU;IAAEC;EAAQ,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAE7G,MAAMC,oBAAoB,GAAG,IAAAC,kBAAW,EAAC,MAAY;IACjDL,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,MAAMM,eAAe,GAAG,IAAAD,kBAAW,EAC/B,CAACE,cAAuB,EAAEC,QAAc,KAAW;IAC/CN,QAAQ,CACHO,KAAK,CAACC,4BAAmB,EAAE;MACxBC,eAAe,EAAEJ,cAAc;MAC/BK,aAAa,EAAEd,kBAAkB;MACjCe,YAAY,EAAEhB,QAAQ,CAACA,QAAQ,CAACiB,EAAE;MAClCC,QAAQ,EAAEP;IACd,CAAC,CAAC,CACDQ,IAAI,CAACC,QAAQ,IAAI;MACd,IAAIA,QAAQ,CAACC,IAAI,CAACC,OAAO,KAAK,qBAAqB,EAAE;QACjDlB,UAAU,EAAE;MAChB,CAAC,MAAM;QACHF,iBAAiB,CAACkB,QAAQ,CAACC,IAAI,CAAC;MACpC;IACJ,CAAC,CAAC;EACV,CAAC,EACD,CAACpB,kBAAkB,EAAEI,QAAQ,EAAED,UAAU,EAAEJ,QAAQ,CAACA,QAAQ,CAACiB,EAAE,EAAEf,iBAAiB,CAAC,CACtF;EAED,MAAMqB,YAAY,GAAG,IAAAf,kBAAW,EAC5B,CAACgB,MAAe,EAAEd,cAAuB,EAAEC,QAAc,KAAW;IAChE,IAAIa,MAAM,EAAE;MACRjB,oBAAoB,EAAE;MACtB;IACJ;IAEAE,eAAe,CAACC,cAAc,EAAEC,QAAQ,CAAC;EAC7C,CAAC,EACD,CAACJ,oBAAoB,EAAEE,eAAe,CAAC,CAC1C;EAED,MAAMgB,gBAAgB,GAAG,IAAAjB,kBAAW,EAAC,MAAY;IAC7CL,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,OAAO;IACHoB,YAAY;IACZE;EACJ,CAAC;AACL,CAAC;AAAC"}
|
|
@@ -28,7 +28,6 @@ const PickList = props => {
|
|
|
28
28
|
const {
|
|
29
29
|
t
|
|
30
30
|
} = (0, _reactI18next.useTranslation)();
|
|
31
|
-
console.log('pickList', pickList);
|
|
32
31
|
const getPickListWithSearch = (0, _react.useCallback)((searchFieldParam, searchValueParam) => {
|
|
33
32
|
const url = isAfterPickList ? _apiUrls.GET_AFTER_PICKLIST_URL : _apiUrls.GET_PICKLIST_URL;
|
|
34
33
|
setLoading(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["PickList","props","isAfterPickList","renderItem","onItemPress","loading","setLoading","useState","pickList","setPickList","instance","useGatherer","t","useTranslation","
|
|
1
|
+
{"version":3,"names":["PickList","props","isAfterPickList","renderItem","onItemPress","loading","setLoading","useState","pickList","setPickList","instance","useGatherer","t","useTranslation","getPickListWithSearch","useCallback","searchFieldParam","searchValueParam","url","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","post","searchField","searchValue","then","response","data","pick_groups","catch","error","ToastAndroid","show","LONG","finally","useEffect","ignoreCurrentRequest","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString"],"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 {useGatherer} from '../hooks/use-gatherer';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props<T> {\n isAfterPickList?: boolean;\n renderItem?: ListRenderItem<T>;\n onItemPress?: (pickGroup: T) => void;\n}\n\nexport const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {isAfterPickList, renderItem, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\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 => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n useEffect(() => {\n let ignoreCurrentRequest = false;\n\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n if (!ignoreCurrentRequest) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => 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<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n getPickListWithSearch('', search);\n },\n [getPickListWithSearch],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={getPickListWithSearch}\n data={pickList}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
|
|
@@ -3,14 +3,13 @@ import axios from 'axios';
|
|
|
3
3
|
import i18n from '../lang/i18n';
|
|
4
4
|
import { ScanContextProvider } from './scan-context';
|
|
5
5
|
import { defaultPickGroupItem } from '../shared/default-pick-group-item';
|
|
6
|
-
import { NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL,
|
|
6
|
+
import { NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL } from '../shared/api/api-urls';
|
|
7
7
|
export const GathererContext = /*#__PURE__*/createContext({
|
|
8
8
|
currentPickGroupId: 0,
|
|
9
9
|
onLastPick: () => undefined,
|
|
10
10
|
instance: axios.create(),
|
|
11
11
|
pickItem: defaultPickGroupItem,
|
|
12
12
|
savePickGroupData: () => undefined,
|
|
13
|
-
setPickGroupPicked: () => new Promise(() => undefined),
|
|
14
13
|
startPicking: () => new Promise(() => undefined),
|
|
15
14
|
switchPickItem: () => new Promise(() => undefined)
|
|
16
15
|
});
|
|
@@ -30,13 +29,6 @@ export const GathererContextProvider = props => {
|
|
|
30
29
|
const savePickGroupData = useCallback(data => {
|
|
31
30
|
setPickItem(data);
|
|
32
31
|
}, []);
|
|
33
|
-
const setPickGroupPicked = useCallback(async pickGroupId => {
|
|
34
|
-
return new Promise((resolve, reject) => {
|
|
35
|
-
instance.patch(SET_GROUP_PICKED_URL, {
|
|
36
|
-
pick_group_id: pickGroupId
|
|
37
|
-
}).then(resolve).catch(reject);
|
|
38
|
-
});
|
|
39
|
-
}, [instance]);
|
|
40
32
|
const startPicking = useCallback(async pickGroupId => {
|
|
41
33
|
return new Promise((resolve, reject) => {
|
|
42
34
|
instance.post(START_PICKING_URL, {
|
|
@@ -82,9 +74,8 @@ export const GathererContextProvider = props => {
|
|
|
82
74
|
switchPickItem,
|
|
83
75
|
savePickGroupData,
|
|
84
76
|
scanImplementation,
|
|
85
|
-
setPickGroupPicked,
|
|
86
77
|
currentPickGroupId: currentPickGroupId.current
|
|
87
|
-
}), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation,
|
|
78
|
+
}), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
|
|
88
79
|
return /*#__PURE__*/React.createElement(GathererContext.Provider, {
|
|
89
80
|
value: context
|
|
90
81
|
}, /*#__PURE__*/React.createElement(ScanContextProvider, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","createContext","useCallback","useEffect","useMemo","useRef","useState","axios","i18n","ScanContextProvider","defaultPickGroupItem","NEXT_PICK_ITEM_URL","PREV_PICK_ITEM_URL","
|
|
1
|
+
{"version":3,"names":["React","createContext","useCallback","useEffect","useMemo","useRef","useState","axios","i18n","ScanContextProvider","defaultPickGroupItem","NEXT_PICK_ITEM_URL","PREV_PICK_ITEM_URL","START_PICKING_URL","GathererContext","currentPickGroupId","onLastPick","undefined","instance","create","pickItem","savePickGroupData","startPicking","Promise","switchPickItem","GathererContextProvider","props","scanImplementation","language","config","setPickItem","registerEventListener","data","pickGroupId","resolve","reject","post","pick_group_id","then","response","current","catch","dir","url","prevState","previous","next","pick_item_id","id","changeLanguage","context","children"],"sources":["gatherer-context.tsx"],"sourcesContent":["import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';\n\nimport axios, {AxiosInstance} from 'axios';\n\nimport i18n from '../lang/i18n';\nimport {ScanContextProvider} from './scan-context';\nimport {defaultPickGroupItem} from '../shared/default-pick-group-item';\nimport {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';\n\nexport interface IGathererContext<T extends DefaultPickItem> {\n pickItem: PickItem<T>;\n currentPickGroupId: number;\n onLastPick: () => void;\n instance: AxiosInstance;\n savePickGroupData: (data: PickItem<T>) => void;\n startPicking: (pickGroupId: number) => Promise<PickItem<T>>;\n switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;\n}\n\ninterface props {\n children: ReactNode;\n config: GathererConfig;\n}\n\nexport const GathererContext = createContext<IGathererContext<any>>({\n currentPickGroupId: 0,\n onLastPick: () => undefined,\n instance: axios.create(),\n pickItem: defaultPickGroupItem,\n savePickGroupData: () => undefined,\n startPicking: () => new Promise(() => undefined),\n switchPickItem: () => new Promise(() => undefined),\n});\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language} = props.config;\n const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);\n const currentPickGroupId = useRef<number>(0);\n\n useEffect(() => {\n scanImplementation.registerEventListener?.();\n }, [scanImplementation]);\n\n const savePickGroupData = useCallback((data: PickItem<T>): void => {\n setPickItem(data);\n }, []);\n\n const startPicking = useCallback(\n async (pickGroupId: number): Promise<PickItem<T>> => {\n return new Promise((resolve, reject) => {\n instance\n .post(START_PICKING_URL, {pick_group_id: pickGroupId})\n .then(response => {\n currentPickGroupId.current = pickGroupId;\n savePickGroupData(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, savePickGroupData],\n );\n\n const switchPickItem = useCallback(\n async (dir: ControlDir): Promise<PickItem<T>> => {\n const url = dir === 'prev' ? PREV_PICK_ITEM_URL : NEXT_PICK_ITEM_URL;\n\n setPickItem(prevState => {\n if (dir === 'prev' && prevState.previous) {\n return prevState.previous;\n }\n\n if (dir === 'next' && prevState.next) {\n return prevState.next;\n }\n\n return prevState;\n });\n\n return new Promise((resolve, reject) => {\n instance\n .post(url, {\n pick_group_id: currentPickGroupId.current,\n pick_item_id: pickItem.pickItem.id,\n })\n .then(response => {\n setPickItem(response.data);\n resolve(response.data);\n })\n .catch(reject);\n });\n },\n [instance, pickItem.pickItem.id],\n );\n\n useEffect(() => {\n if (language) {\n i18n.changeLanguage(language);\n }\n }, [language]);\n\n const context = useMemo(\n () => ({\n pickItem,\n instance,\n onLastPick,\n startPicking,\n switchPickItem,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [\n instance,\n onLastPick,\n pickItem,\n savePickGroupData,\n scanImplementation,\n startPicking,\n switchPickItem,\n ],\n );\n\n return (\n <GathererContext.Provider value={context}>\n <ScanContextProvider scanner={props.config.scanImplementation}>{props.children}</ScanContextProvider>\n </GathererContext.Provider>\n );\n};\n"],"mappings":"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"}
|
|
@@ -8,8 +8,7 @@ export const usePickItemSwitch = () => {
|
|
|
8
8
|
savePickGroupData,
|
|
9
9
|
switchPickItem,
|
|
10
10
|
onLastPick,
|
|
11
|
-
instance
|
|
12
|
-
setPickGroupPicked
|
|
11
|
+
instance
|
|
13
12
|
} = useGatherer();
|
|
14
13
|
const retrieveNextPickItem = useCallback(() => {
|
|
15
14
|
switchPickItem('next');
|
|
@@ -21,13 +20,12 @@ export const usePickItemSwitch = () => {
|
|
|
21
20
|
pick_item_id: pickItem.pickItem.id,
|
|
22
21
|
metadata: metaData
|
|
23
22
|
}).then(response => {
|
|
24
|
-
console.log('pick group finished', response);
|
|
25
23
|
if (response.data.content === 'Pick group finished') {
|
|
26
|
-
|
|
24
|
+
onLastPick();
|
|
27
25
|
} else {
|
|
28
26
|
savePickGroupData(response.data);
|
|
29
27
|
}
|
|
30
|
-
})
|
|
28
|
+
});
|
|
31
29
|
}, [currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData]);
|
|
32
30
|
const nextPickItem = useCallback((isSkip, quantityPicked, metaData) => {
|
|
33
31
|
if (isSkip) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useGatherer","SET_ITEM_PICKED_URL","usePickItemSwitch","pickItem","currentPickGroupId","savePickGroupData","switchPickItem","onLastPick","instance","
|
|
1
|
+
{"version":3,"names":["useCallback","useGatherer","SET_ITEM_PICKED_URL","usePickItemSwitch","pickItem","currentPickGroupId","savePickGroupData","switchPickItem","onLastPick","instance","retrieveNextPickItem","setItemToPicked","quantityPicked","metaData","patch","quantity_picked","pick_group_id","pick_item_id","id","metadata","then","response","data","content","nextPickItem","isSkip","previousPickItem"],"sources":["use-pick-item-switch.tsx"],"sourcesContent":["import {useCallback} from 'react';\n\nimport {useGatherer} from './use-gatherer';\nimport {SET_ITEM_PICKED_URL} from '../shared/api/api-urls';\n\nexport const usePickItemSwitch = (): ProductSwitch => {\n const {pickItem, currentPickGroupId, savePickGroupData, switchPickItem, onLastPick, instance} = useGatherer();\n\n const retrieveNextPickItem = useCallback((): void => {\n switchPickItem('next');\n }, [switchPickItem]);\n\n const setItemToPicked = useCallback(\n (quantityPicked?: number, metaData?: any): void => {\n instance\n .patch(SET_ITEM_PICKED_URL, {\n quantity_picked: quantityPicked,\n pick_group_id: currentPickGroupId,\n pick_item_id: pickItem.pickItem.id,\n metadata: metaData,\n })\n .then(response => {\n if (response.data.content === 'Pick group finished') {\n onLastPick();\n } else {\n savePickGroupData(response.data);\n }\n });\n },\n [currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData],\n );\n\n const nextPickItem = useCallback(\n (isSkip: boolean, quantityPicked?: number, metaData?: any): void => {\n if (isSkip) {\n retrieveNextPickItem();\n return;\n }\n\n setItemToPicked(quantityPicked, metaData);\n },\n [retrieveNextPickItem, setItemToPicked],\n );\n\n const previousPickItem = useCallback((): void => {\n switchPickItem('prev');\n }, [switchPickItem]);\n\n return {\n nextPickItem,\n previousPickItem,\n };\n};\n"],"mappings":"AAAA,SAAQA,WAAW,QAAO,OAAO;AAEjC,SAAQC,WAAW,QAAO,gBAAgB;AAC1C,SAAQC,mBAAmB,QAAO,wBAAwB;AAE1D,OAAO,MAAMC,iBAAiB,GAAG,MAAqB;EAClD,MAAM;IAACC,QAAQ;IAAEC,kBAAkB;IAAEC,iBAAiB;IAAEC,cAAc;IAAEC,UAAU;IAAEC;EAAQ,CAAC,GAAGR,WAAW,EAAE;EAE7G,MAAMS,oBAAoB,GAAGV,WAAW,CAAC,MAAY;IACjDO,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,MAAMI,eAAe,GAAGX,WAAW,CAC/B,CAACY,cAAuB,EAAEC,QAAc,KAAW;IAC/CJ,QAAQ,CACHK,KAAK,CAACZ,mBAAmB,EAAE;MACxBa,eAAe,EAAEH,cAAc;MAC/BI,aAAa,EAAEX,kBAAkB;MACjCY,YAAY,EAAEb,QAAQ,CAACA,QAAQ,CAACc,EAAE;MAClCC,QAAQ,EAAEN;IACd,CAAC,CAAC,CACDO,IAAI,CAACC,QAAQ,IAAI;MACd,IAAIA,QAAQ,CAACC,IAAI,CAACC,OAAO,KAAK,qBAAqB,EAAE;QACjDf,UAAU,EAAE;MAChB,CAAC,MAAM;QACHF,iBAAiB,CAACe,QAAQ,CAACC,IAAI,CAAC;MACpC;IACJ,CAAC,CAAC;EACV,CAAC,EACD,CAACjB,kBAAkB,EAAEI,QAAQ,EAAED,UAAU,EAAEJ,QAAQ,CAACA,QAAQ,CAACc,EAAE,EAAEZ,iBAAiB,CAAC,CACtF;EAED,MAAMkB,YAAY,GAAGxB,WAAW,CAC5B,CAACyB,MAAe,EAAEb,cAAuB,EAAEC,QAAc,KAAW;IAChE,IAAIY,MAAM,EAAE;MACRf,oBAAoB,EAAE;MACtB;IACJ;IAEAC,eAAe,CAACC,cAAc,EAAEC,QAAQ,CAAC;EAC7C,CAAC,EACD,CAACH,oBAAoB,EAAEC,eAAe,CAAC,CAC1C;EAED,MAAMe,gBAAgB,GAAG1B,WAAW,CAAC,MAAY;IAC7CO,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,OAAO;IACHiB,YAAY;IACZE;EACJ,CAAC;AACL,CAAC"}
|
|
@@ -20,7 +20,6 @@ export const PickList = props => {
|
|
|
20
20
|
const {
|
|
21
21
|
t
|
|
22
22
|
} = useTranslation();
|
|
23
|
-
console.log('pickList', pickList);
|
|
24
23
|
const getPickListWithSearch = useCallback((searchFieldParam, searchValueParam) => {
|
|
25
24
|
const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
|
|
26
25
|
setLoading(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useCallback","useEffect","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useGatherer","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","onItemPress","loading","setLoading","pickList","setPickList","instance","t","
|
|
1
|
+
{"version":3,"names":["React","useCallback","useEffect","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useGatherer","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","isAfterPickList","renderItem","onItemPress","loading","setLoading","pickList","setPickList","instance","t","getPickListWithSearch","searchFieldParam","searchValueParam","url","post","searchField","searchValue","then","response","data","pick_groups","catch","error","show","LONG","finally","ignoreCurrentRequest","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString"],"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 {useGatherer} from '../hooks/use-gatherer';\nimport {PickGroupItem} from './partials/pick-group-item';\nimport {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';\n\ninterface props<T> {\n isAfterPickList?: boolean;\n renderItem?: ListRenderItem<T>;\n onItemPress?: (pickGroup: T) => void;\n}\n\nexport const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {isAfterPickList, renderItem, onItemPress} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\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 => ToastAndroid.show(error.response.data.error, ToastAndroid.LONG))\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n useEffect(() => {\n let ignoreCurrentRequest = false;\n\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n if (!ignoreCurrentRequest) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => 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<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n getPickListWithSearch('', search);\n },\n [getPickListWithSearch],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={getPickListWithSearch}\n data={pickList}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAGC,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAO,OAAO;AAC7D,SAAQC,QAAQ,EAAsCC,YAAY,QAAO,cAAc;AAEvF,SAAQC,cAAc,QAAO,eAAe;AAE5C,SAAQC,MAAM,QAAO,mBAAmB;AACxC,SAAQC,SAAS,QAAO,uBAAuB;AAC/C,SAAQC,WAAW,QAAO,uBAAuB;AACjD,SAAQC,aAAa,QAAO,4BAA4B;AACxD,SAAQC,sBAAsB,EAAEC,gBAAgB,QAAO,wBAAwB;AAQ/E,OAAO,MAAMC,QAAQ,GAAyBC,KAAe,IAAkB;EAC3E,MAAM;IAACC,eAAe;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,KAAK;EACxD,MAAM,CAACI,OAAO,EAAEC,UAAU,CAAC,GAAGhB,QAAQ,CAAU,IAAI,CAAC;EACrD,MAAM,CAACiB,QAAQ,EAAEC,WAAW,CAAC,GAAGlB,QAAQ,CAAM,EAAE,CAAC;EACjD,MAAM;IAACmB;EAAQ,CAAC,GAAGb,WAAW,EAAE;EAChC,MAAM;IAACc;EAAC,CAAC,GAAGjB,cAAc,EAAE;EAE5B,MAAMkB,qBAAqB,GAAGvB,WAAW,CACrC,CAACwB,gBAAyB,EAAEC,gBAAyB,KAAW;IAC5D,MAAMC,GAAG,GAAGZ,eAAe,GAAGJ,sBAAsB,GAAGC,gBAAgB;IAEvEO,UAAU,CAAC,IAAI,CAAC;IAEhBG,QAAQ,CACHM,IAAI,CAACD,GAAG,EAAE;MACPE,WAAW,EAAEJ,gBAAgB;MAC7BK,WAAW,EAAEJ;IACjB,CAAC,CAAC,CACDK,IAAI,CAACC,QAAQ,IAAIX,WAAW,CAACW,QAAQ,CAACC,IAAI,CAACC,WAAW,CAAC,CAAC,CACxDC,KAAK,CAACC,KAAK,IAAI/B,YAAY,CAACgC,IAAI,CAACD,KAAK,CAACJ,QAAQ,CAACC,IAAI,CAACG,KAAK,EAAE/B,YAAY,CAACiC,IAAI,CAAC,CAAC,CAC/EC,OAAO,CAAC,MAAMpB,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EACD,CAACG,QAAQ,EAAEP,eAAe,CAAC,CAC9B;EAEDb,SAAS,CAAC,MAAM;IACZ,IAAIsC,oBAAoB,GAAG,KAAK;IAEhCrB,UAAU,CAAC,IAAI,CAAC;IAEhBG,QAAQ,CACHM,IAAI,CAAChB,gBAAgB,CAAC,CACtBmB,IAAI,CAACC,QAAQ,IAAI;MACd,IAAI,CAACQ,oBAAoB,EAAE;QACvBnB,WAAW,CAACW,QAAQ,CAACC,IAAI,CAACC,WAAW,CAAC;MAC1C;IACJ,CAAC,CAAC,CACDC,KAAK,CAACC,KAAK,IAAI/B,YAAY,CAACgC,IAAI,CAACD,KAAK,CAACJ,QAAQ,CAACC,IAAI,CAACG,KAAK,EAAE/B,YAAY,CAACiC,IAAI,CAAC,CAAC,CAC/EC,OAAO,CAAC,MAAMpB,UAAU,CAAC,KAAK,CAAC,CAAC;IAErC,OAAO,MAAM;MACTqB,oBAAoB,GAAG,IAAI;IAC/B,CAAC;EACL,CAAC,EAAE,CAAClB,QAAQ,CAAC,CAAC;EAEd,MAAMmB,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,oBAAC,aAAa;MAAC,OAAO,EAAEzB,WAAY;MAAC,WAAW,EAAEyB;IAAY,EAAG;EAC5E,CAAC;EAED,MAAMC,wBAAwB,GAAG1C,WAAW,CACvC2C,MAAc,IAAW;IACtBpB,qBAAqB,CAAC,EAAE,EAAEoB,MAAM,CAAC;EACrC,CAAC,EACD,CAACpB,qBAAqB,CAAC,CAC1B;EAED,oBACI,oBAAC,QAAQ;IACL,UAAU,EAAEN,OAAQ;IACpB,SAAS,EAAEM,qBAAsB;IACjC,IAAI,EAAEJ,QAAS;IACf,UAAU,EAAEJ,UAAU,IAAIyB,mBAAoB;IAC9C,YAAY,EAAEI,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,oBAAC,SAAS;MAAC,IAAI,EAAExB,CAAC,CAAE,wBAAuBL,OAAO,GAAG,SAAS,GAAG,WAAY,EAAC;IAAE,EAAI;IACxG,mBAAmB,eAAE,oBAAC,MAAM;MAAC,QAAQ,EAAEyB;IAAyB;EAAI,EACtE;AAEV,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { ReactNode } from 'react';
|
|
2
|
-
import { AxiosInstance
|
|
2
|
+
import { AxiosInstance } from 'axios';
|
|
3
3
|
export interface IGathererContext<T extends DefaultPickItem> {
|
|
4
4
|
pickItem: PickItem<T>;
|
|
5
5
|
currentPickGroupId: number;
|
|
@@ -8,7 +8,6 @@ export interface IGathererContext<T extends DefaultPickItem> {
|
|
|
8
8
|
savePickGroupData: (data: PickItem<T>) => void;
|
|
9
9
|
startPicking: (pickGroupId: number) => Promise<PickItem<T>>;
|
|
10
10
|
switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;
|
|
11
|
-
setPickGroupPicked: (pickGroupId: number) => Promise<AxiosResponse>;
|
|
12
11
|
}
|
|
13
12
|
interface props {
|
|
14
13
|
children: ReactNode;
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import React, {createContext, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';
|
|
2
2
|
|
|
3
|
-
import axios, {AxiosInstance
|
|
3
|
+
import axios, {AxiosInstance} from 'axios';
|
|
4
4
|
|
|
5
5
|
import i18n from '../lang/i18n';
|
|
6
6
|
import {ScanContextProvider} from './scan-context';
|
|
7
7
|
import {defaultPickGroupItem} from '../shared/default-pick-group-item';
|
|
8
|
-
import {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL,
|
|
8
|
+
import {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, START_PICKING_URL} from '../shared/api/api-urls';
|
|
9
9
|
|
|
10
10
|
export interface IGathererContext<T extends DefaultPickItem> {
|
|
11
11
|
pickItem: PickItem<T>;
|
|
@@ -15,7 +15,6 @@ export interface IGathererContext<T extends DefaultPickItem> {
|
|
|
15
15
|
savePickGroupData: (data: PickItem<T>) => void;
|
|
16
16
|
startPicking: (pickGroupId: number) => Promise<PickItem<T>>;
|
|
17
17
|
switchPickItem: (dir: ControlDir) => Promise<PickItem<T>>;
|
|
18
|
-
setPickGroupPicked: (pickGroupId: number) => Promise<AxiosResponse>;
|
|
19
18
|
}
|
|
20
19
|
|
|
21
20
|
interface props {
|
|
@@ -29,7 +28,6 @@ export const GathererContext = createContext<IGathererContext<any>>({
|
|
|
29
28
|
instance: axios.create(),
|
|
30
29
|
pickItem: defaultPickGroupItem,
|
|
31
30
|
savePickGroupData: () => undefined,
|
|
32
|
-
setPickGroupPicked: () => new Promise(() => undefined),
|
|
33
31
|
startPicking: () => new Promise(() => undefined),
|
|
34
32
|
switchPickItem: () => new Promise(() => undefined),
|
|
35
33
|
});
|
|
@@ -47,15 +45,6 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
|
|
|
47
45
|
setPickItem(data);
|
|
48
46
|
}, []);
|
|
49
47
|
|
|
50
|
-
const setPickGroupPicked = useCallback(
|
|
51
|
-
async (pickGroupId: number): Promise<AxiosResponse> => {
|
|
52
|
-
return new Promise((resolve, reject) => {
|
|
53
|
-
instance.patch(SET_GROUP_PICKED_URL, {pick_group_id: pickGroupId}).then(resolve).catch(reject);
|
|
54
|
-
});
|
|
55
|
-
},
|
|
56
|
-
[instance],
|
|
57
|
-
);
|
|
58
|
-
|
|
59
48
|
const startPicking = useCallback(
|
|
60
49
|
async (pickGroupId: number): Promise<PickItem<T>> => {
|
|
61
50
|
return new Promise((resolve, reject) => {
|
|
@@ -119,7 +108,6 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
|
|
|
119
108
|
switchPickItem,
|
|
120
109
|
savePickGroupData,
|
|
121
110
|
scanImplementation,
|
|
122
|
-
setPickGroupPicked,
|
|
123
111
|
currentPickGroupId: currentPickGroupId.current,
|
|
124
112
|
}),
|
|
125
113
|
[
|
|
@@ -128,7 +116,6 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
|
|
|
128
116
|
pickItem,
|
|
129
117
|
savePickGroupData,
|
|
130
118
|
scanImplementation,
|
|
131
|
-
setPickGroupPicked,
|
|
132
119
|
startPicking,
|
|
133
120
|
switchPickItem,
|
|
134
121
|
],
|
|
@@ -4,7 +4,7 @@ import {useGatherer} from './use-gatherer';
|
|
|
4
4
|
import {SET_ITEM_PICKED_URL} from '../shared/api/api-urls';
|
|
5
5
|
|
|
6
6
|
export const usePickItemSwitch = (): ProductSwitch => {
|
|
7
|
-
const {pickItem, currentPickGroupId, savePickGroupData, switchPickItem, onLastPick, instance
|
|
7
|
+
const {pickItem, currentPickGroupId, savePickGroupData, switchPickItem, onLastPick, instance} = useGatherer();
|
|
8
8
|
|
|
9
9
|
const retrieveNextPickItem = useCallback((): void => {
|
|
10
10
|
switchPickItem('next');
|
|
@@ -20,16 +20,12 @@ export const usePickItemSwitch = (): ProductSwitch => {
|
|
|
20
20
|
metadata: metaData,
|
|
21
21
|
})
|
|
22
22
|
.then(response => {
|
|
23
|
-
console.log('pick group finished', response);
|
|
24
23
|
if (response.data.content === 'Pick group finished') {
|
|
25
|
-
|
|
26
|
-
.then(onLastPick)
|
|
27
|
-
.catch(error => console.log('pick group error', error));
|
|
24
|
+
onLastPick();
|
|
28
25
|
} else {
|
|
29
26
|
savePickGroupData(response.data);
|
|
30
27
|
}
|
|
31
|
-
})
|
|
32
|
-
.catch(error => console.log('set item picked error', error));
|
|
28
|
+
});
|
|
33
29
|
},
|
|
34
30
|
[currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData],
|
|
35
31
|
);
|
|
@@ -22,8 +22,6 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
|
|
|
22
22
|
const {instance} = useGatherer();
|
|
23
23
|
const {t} = useTranslation();
|
|
24
24
|
|
|
25
|
-
console.log('pickList', pickList);
|
|
26
|
-
|
|
27
25
|
const getPickListWithSearch = useCallback(
|
|
28
26
|
(searchFieldParam?: string, searchValueParam?: string): void => {
|
|
29
27
|
const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
|