@scrumble-nl/gatherer-frontend 1.0.13 → 1.0.15
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 +10 -1
- package/lib/commonjs/context/gatherer-context.js.map +1 -1
- package/lib/commonjs/hooks/use-pick-item-switch.js +4 -3
- package/lib/commonjs/hooks/use-pick-item-switch.js.map +1 -1
- package/lib/module/context/gatherer-context.js +11 -2
- package/lib/module/context/gatherer-context.js.map +1 -1
- package/lib/module/hooks/use-pick-item-switch.js +4 -3
- package/lib/module/hooks/use-pick-item-switch.js.map +1 -1
- package/lib/typescript/context/gatherer-context.d.ts +2 -1
- package/package.json +1 -1
- package/src/context/gatherer-context.tsx +24 -3
- package/src/hooks/use-pick-item-switch.tsx +6 -3
|
@@ -19,6 +19,7 @@ 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),
|
|
22
23
|
startPicking: () => new Promise(() => undefined),
|
|
23
24
|
switchPickItem: () => new Promise(() => undefined)
|
|
24
25
|
});
|
|
@@ -39,6 +40,13 @@ const GathererContextProvider = props => {
|
|
|
39
40
|
const savePickGroupData = (0, _react.useCallback)(data => {
|
|
40
41
|
setPickItem(data);
|
|
41
42
|
}, []);
|
|
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]);
|
|
42
50
|
const startPicking = (0, _react.useCallback)(async pickGroupId => {
|
|
43
51
|
return new Promise((resolve, reject) => {
|
|
44
52
|
instance.post(_apiUrls.START_PICKING_URL, {
|
|
@@ -84,8 +92,9 @@ const GathererContextProvider = props => {
|
|
|
84
92
|
switchPickItem,
|
|
85
93
|
savePickGroupData,
|
|
86
94
|
scanImplementation,
|
|
95
|
+
setPickGroupPicked,
|
|
87
96
|
currentPickGroupId: currentPickGroupId.current
|
|
88
|
-
}), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
|
|
97
|
+
}), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation, setPickGroupPicked, startPicking, switchPickItem]);
|
|
89
98
|
return /*#__PURE__*/_react.default.createElement(GathererContext.Provider, {
|
|
90
99
|
value: context
|
|
91
100
|
}, /*#__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","setPickGroupPicked","Promise","startPicking","switchPickItem","GathererContextProvider","props","scanImplementation","language","config","setPickItem","useState","useRef","useEffect","registerEventListener","useCallback","data","pickGroupId","resolve","reject","patch","SET_GROUP_PICKED_URL","pick_group_id","then","catch","post","START_PICKING_URL","response","current","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, AxiosResponse} 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, SET_GROUP_PICKED_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 setPickGroupPicked: (pickGroupId: number) => Promise<AxiosResponse>;\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 setPickGroupPicked: () => new Promise(() => 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 setPickGroupPicked = useCallback(\n async (pickGroupId: number): Promise<AxiosResponse> => {\n return new Promise((resolve, reject) => {\n instance.patch(SET_GROUP_PICKED_URL, {pick_group_id: pickGroupId}).then(resolve).catch(reject);\n });\n },\n [instance],\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 setPickGroupPicked,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [\n instance,\n onLastPick,\n pickItem,\n savePickGroupData,\n scanImplementation,\n setPickGroupPicked,\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,7 +14,8 @@ const usePickItemSwitch = () => {
|
|
|
14
14
|
savePickGroupData,
|
|
15
15
|
switchPickItem,
|
|
16
16
|
onLastPick,
|
|
17
|
-
instance
|
|
17
|
+
instance,
|
|
18
|
+
setPickGroupPicked
|
|
18
19
|
} = (0, _useGatherer.useGatherer)();
|
|
19
20
|
const retrieveNextPickItem = (0, _react.useCallback)(() => {
|
|
20
21
|
switchPickItem('next');
|
|
@@ -28,11 +29,11 @@ const usePickItemSwitch = () => {
|
|
|
28
29
|
}).then(response => {
|
|
29
30
|
console.log('pick group finished', response);
|
|
30
31
|
if (response.data.content === 'Pick group finished') {
|
|
31
|
-
onLastPick();
|
|
32
|
+
setPickGroupPicked(currentPickGroupId).then(onLastPick).catch(error => console.log('pick group error', error));
|
|
32
33
|
} else {
|
|
33
34
|
savePickGroupData(response.data);
|
|
34
35
|
}
|
|
35
|
-
});
|
|
36
|
+
}).catch(error => console.log('set item picked error', error));
|
|
36
37
|
}, [currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData]);
|
|
37
38
|
const nextPickItem = (0, _react.useCallback)((isSkip, quantityPicked, metaData) => {
|
|
38
39
|
if (isSkip) {
|
|
@@ -1 +1 @@
|
|
|
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","console","log","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 console.log('pick group finished', 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;
|
|
1
|
+
{"version":3,"names":["usePickItemSwitch","pickItem","currentPickGroupId","savePickGroupData","switchPickItem","onLastPick","instance","setPickGroupPicked","useGatherer","retrieveNextPickItem","useCallback","setItemToPicked","quantityPicked","metaData","patch","SET_ITEM_PICKED_URL","quantity_picked","pick_group_id","pick_item_id","id","metadata","then","response","console","log","data","content","catch","error","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, setPickGroupPicked} = 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 console.log('pick group finished', response);\n if (response.data.content === 'Pick group finished') {\n setPickGroupPicked(currentPickGroupId)\n .then(onLastPick)\n .catch(error => console.log('pick group error', error));\n } else {\n savePickGroupData(response.data);\n }\n })\n .catch(error => console.log('set item picked error', error));\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,QAAQ;IAAEC;EAAkB,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAEjI,MAAMC,oBAAoB,GAAG,IAAAC,kBAAW,EAAC,MAAY;IACjDN,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,MAAMO,eAAe,GAAG,IAAAD,kBAAW,EAC/B,CAACE,cAAuB,EAAEC,QAAc,KAAW;IAC/CP,QAAQ,CACHQ,KAAK,CAACC,4BAAmB,EAAE;MACxBC,eAAe,EAAEJ,cAAc;MAC/BK,aAAa,EAAEf,kBAAkB;MACjCgB,YAAY,EAAEjB,QAAQ,CAACA,QAAQ,CAACkB,EAAE;MAClCC,QAAQ,EAAEP;IACd,CAAC,CAAC,CACDQ,IAAI,CAACC,QAAQ,IAAI;MACdC,OAAO,CAACC,GAAG,CAAC,qBAAqB,EAAEF,QAAQ,CAAC;MAC5C,IAAIA,QAAQ,CAACG,IAAI,CAACC,OAAO,KAAK,qBAAqB,EAAE;QACjDnB,kBAAkB,CAACL,kBAAkB,CAAC,CACjCmB,IAAI,CAAChB,UAAU,CAAC,CAChBsB,KAAK,CAACC,KAAK,IAAIL,OAAO,CAACC,GAAG,CAAC,kBAAkB,EAAEI,KAAK,CAAC,CAAC;MAC/D,CAAC,MAAM;QACHzB,iBAAiB,CAACmB,QAAQ,CAACG,IAAI,CAAC;MACpC;IACJ,CAAC,CAAC,CACDE,KAAK,CAACC,KAAK,IAAIL,OAAO,CAACC,GAAG,CAAC,uBAAuB,EAAEI,KAAK,CAAC,CAAC;EACpE,CAAC,EACD,CAAC1B,kBAAkB,EAAEI,QAAQ,EAAED,UAAU,EAAEJ,QAAQ,CAACA,QAAQ,CAACkB,EAAE,EAAEhB,iBAAiB,CAAC,CACtF;EAED,MAAM0B,YAAY,GAAG,IAAAnB,kBAAW,EAC5B,CAACoB,MAAe,EAAElB,cAAuB,EAAEC,QAAc,KAAW;IAChE,IAAIiB,MAAM,EAAE;MACRrB,oBAAoB,EAAE;MACtB;IACJ;IAEAE,eAAe,CAACC,cAAc,EAAEC,QAAQ,CAAC;EAC7C,CAAC,EACD,CAACJ,oBAAoB,EAAEE,eAAe,CAAC,CAC1C;EAED,MAAMoB,gBAAgB,GAAG,IAAArB,kBAAW,EAAC,MAAY;IAC7CN,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,OAAO;IACHyB,YAAY;IACZE;EACJ,CAAC;AACL,CAAC;AAAC"}
|
|
@@ -3,13 +3,14 @@ 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, START_PICKING_URL } from '../shared/api/api-urls';
|
|
6
|
+
import { NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, SET_GROUP_PICKED_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),
|
|
13
14
|
startPicking: () => new Promise(() => undefined),
|
|
14
15
|
switchPickItem: () => new Promise(() => undefined)
|
|
15
16
|
});
|
|
@@ -29,6 +30,13 @@ export const GathererContextProvider = props => {
|
|
|
29
30
|
const savePickGroupData = useCallback(data => {
|
|
30
31
|
setPickItem(data);
|
|
31
32
|
}, []);
|
|
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]);
|
|
32
40
|
const startPicking = useCallback(async pickGroupId => {
|
|
33
41
|
return new Promise((resolve, reject) => {
|
|
34
42
|
instance.post(START_PICKING_URL, {
|
|
@@ -74,8 +82,9 @@ export const GathererContextProvider = props => {
|
|
|
74
82
|
switchPickItem,
|
|
75
83
|
savePickGroupData,
|
|
76
84
|
scanImplementation,
|
|
85
|
+
setPickGroupPicked,
|
|
77
86
|
currentPickGroupId: currentPickGroupId.current
|
|
78
|
-
}), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
|
|
87
|
+
}), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation, setPickGroupPicked, startPicking, switchPickItem]);
|
|
79
88
|
return /*#__PURE__*/React.createElement(GathererContext.Provider, {
|
|
80
89
|
value: context
|
|
81
90
|
}, /*#__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","START_PICKING_URL","GathererContext","currentPickGroupId","onLastPick","undefined","instance","create","pickItem","savePickGroupData","
|
|
1
|
+
{"version":3,"names":["React","createContext","useCallback","useEffect","useMemo","useRef","useState","axios","i18n","ScanContextProvider","defaultPickGroupItem","NEXT_PICK_ITEM_URL","PREV_PICK_ITEM_URL","SET_GROUP_PICKED_URL","START_PICKING_URL","GathererContext","currentPickGroupId","onLastPick","undefined","instance","create","pickItem","savePickGroupData","setPickGroupPicked","Promise","startPicking","switchPickItem","GathererContextProvider","props","scanImplementation","language","config","setPickItem","registerEventListener","data","pickGroupId","resolve","reject","patch","pick_group_id","then","catch","post","response","current","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, AxiosResponse} 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, SET_GROUP_PICKED_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 setPickGroupPicked: (pickGroupId: number) => Promise<AxiosResponse>;\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 setPickGroupPicked: () => new Promise(() => 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 setPickGroupPicked = useCallback(\n async (pickGroupId: number): Promise<AxiosResponse> => {\n return new Promise((resolve, reject) => {\n instance.patch(SET_GROUP_PICKED_URL, {pick_group_id: pickGroupId}).then(resolve).catch(reject);\n });\n },\n [instance],\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 setPickGroupPicked,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [\n instance,\n onLastPick,\n pickItem,\n savePickGroupData,\n scanImplementation,\n setPickGroupPicked,\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,7 +8,8 @@ export const usePickItemSwitch = () => {
|
|
|
8
8
|
savePickGroupData,
|
|
9
9
|
switchPickItem,
|
|
10
10
|
onLastPick,
|
|
11
|
-
instance
|
|
11
|
+
instance,
|
|
12
|
+
setPickGroupPicked
|
|
12
13
|
} = useGatherer();
|
|
13
14
|
const retrieveNextPickItem = useCallback(() => {
|
|
14
15
|
switchPickItem('next');
|
|
@@ -22,11 +23,11 @@ export const usePickItemSwitch = () => {
|
|
|
22
23
|
}).then(response => {
|
|
23
24
|
console.log('pick group finished', response);
|
|
24
25
|
if (response.data.content === 'Pick group finished') {
|
|
25
|
-
onLastPick();
|
|
26
|
+
setPickGroupPicked(currentPickGroupId).then(onLastPick).catch(error => console.log('pick group error', error));
|
|
26
27
|
} else {
|
|
27
28
|
savePickGroupData(response.data);
|
|
28
29
|
}
|
|
29
|
-
});
|
|
30
|
+
}).catch(error => console.log('set item picked error', error));
|
|
30
31
|
}, [currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData]);
|
|
31
32
|
const nextPickItem = useCallback((isSkip, quantityPicked, metaData) => {
|
|
32
33
|
if (isSkip) {
|
|
@@ -1 +1 @@
|
|
|
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","console","log","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 console.log('pick group finished', 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;
|
|
1
|
+
{"version":3,"names":["useCallback","useGatherer","SET_ITEM_PICKED_URL","usePickItemSwitch","pickItem","currentPickGroupId","savePickGroupData","switchPickItem","onLastPick","instance","setPickGroupPicked","retrieveNextPickItem","setItemToPicked","quantityPicked","metaData","patch","quantity_picked","pick_group_id","pick_item_id","id","metadata","then","response","console","log","data","content","catch","error","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, setPickGroupPicked} = 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 console.log('pick group finished', response);\n if (response.data.content === 'Pick group finished') {\n setPickGroupPicked(currentPickGroupId)\n .then(onLastPick)\n .catch(error => console.log('pick group error', error));\n } else {\n savePickGroupData(response.data);\n }\n })\n .catch(error => console.log('set item picked error', error));\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,QAAQ;IAAEC;EAAkB,CAAC,GAAGT,WAAW,EAAE;EAEjI,MAAMU,oBAAoB,GAAGX,WAAW,CAAC,MAAY;IACjDO,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,MAAMK,eAAe,GAAGZ,WAAW,CAC/B,CAACa,cAAuB,EAAEC,QAAc,KAAW;IAC/CL,QAAQ,CACHM,KAAK,CAACb,mBAAmB,EAAE;MACxBc,eAAe,EAAEH,cAAc;MAC/BI,aAAa,EAAEZ,kBAAkB;MACjCa,YAAY,EAAEd,QAAQ,CAACA,QAAQ,CAACe,EAAE;MAClCC,QAAQ,EAAEN;IACd,CAAC,CAAC,CACDO,IAAI,CAACC,QAAQ,IAAI;MACdC,OAAO,CAACC,GAAG,CAAC,qBAAqB,EAAEF,QAAQ,CAAC;MAC5C,IAAIA,QAAQ,CAACG,IAAI,CAACC,OAAO,KAAK,qBAAqB,EAAE;QACjDhB,kBAAkB,CAACL,kBAAkB,CAAC,CACjCgB,IAAI,CAACb,UAAU,CAAC,CAChBmB,KAAK,CAACC,KAAK,IAAIL,OAAO,CAACC,GAAG,CAAC,kBAAkB,EAAEI,KAAK,CAAC,CAAC;MAC/D,CAAC,MAAM;QACHtB,iBAAiB,CAACgB,QAAQ,CAACG,IAAI,CAAC;MACpC;IACJ,CAAC,CAAC,CACDE,KAAK,CAACC,KAAK,IAAIL,OAAO,CAACC,GAAG,CAAC,uBAAuB,EAAEI,KAAK,CAAC,CAAC;EACpE,CAAC,EACD,CAACvB,kBAAkB,EAAEI,QAAQ,EAAED,UAAU,EAAEJ,QAAQ,CAACA,QAAQ,CAACe,EAAE,EAAEb,iBAAiB,CAAC,CACtF;EAED,MAAMuB,YAAY,GAAG7B,WAAW,CAC5B,CAAC8B,MAAe,EAAEjB,cAAuB,EAAEC,QAAc,KAAW;IAChE,IAAIgB,MAAM,EAAE;MACRnB,oBAAoB,EAAE;MACtB;IACJ;IAEAC,eAAe,CAACC,cAAc,EAAEC,QAAQ,CAAC;EAC7C,CAAC,EACD,CAACH,oBAAoB,EAAEC,eAAe,CAAC,CAC1C;EAED,MAAMmB,gBAAgB,GAAG/B,WAAW,CAAC,MAAY;IAC7CO,cAAc,CAAC,MAAM,CAAC;EAC1B,CAAC,EAAE,CAACA,cAAc,CAAC,CAAC;EAEpB,OAAO;IACHsB,YAAY;IACZE;EACJ,CAAC;AACL,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { ReactNode } from 'react';
|
|
2
|
-
import { AxiosInstance } from 'axios';
|
|
2
|
+
import { AxiosInstance, AxiosResponse } from 'axios';
|
|
3
3
|
export interface IGathererContext<T extends DefaultPickItem> {
|
|
4
4
|
pickItem: PickItem<T>;
|
|
5
5
|
currentPickGroupId: number;
|
|
@@ -8,6 +8,7 @@ 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>;
|
|
11
12
|
}
|
|
12
13
|
interface props {
|
|
13
14
|
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} from 'axios';
|
|
3
|
+
import axios, {AxiosInstance, AxiosResponse} 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, START_PICKING_URL} from '../shared/api/api-urls';
|
|
8
|
+
import {NEXT_PICK_ITEM_URL, PREV_PICK_ITEM_URL, SET_GROUP_PICKED_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,6 +15,7 @@ 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>;
|
|
18
19
|
}
|
|
19
20
|
|
|
20
21
|
interface props {
|
|
@@ -28,6 +29,7 @@ export const GathererContext = createContext<IGathererContext<any>>({
|
|
|
28
29
|
instance: axios.create(),
|
|
29
30
|
pickItem: defaultPickGroupItem,
|
|
30
31
|
savePickGroupData: () => undefined,
|
|
32
|
+
setPickGroupPicked: () => new Promise(() => undefined),
|
|
31
33
|
startPicking: () => new Promise(() => undefined),
|
|
32
34
|
switchPickItem: () => new Promise(() => undefined),
|
|
33
35
|
});
|
|
@@ -45,6 +47,15 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
|
|
|
45
47
|
setPickItem(data);
|
|
46
48
|
}, []);
|
|
47
49
|
|
|
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
|
+
|
|
48
59
|
const startPicking = useCallback(
|
|
49
60
|
async (pickGroupId: number): Promise<PickItem<T>> => {
|
|
50
61
|
return new Promise((resolve, reject) => {
|
|
@@ -108,9 +119,19 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
|
|
|
108
119
|
switchPickItem,
|
|
109
120
|
savePickGroupData,
|
|
110
121
|
scanImplementation,
|
|
122
|
+
setPickGroupPicked,
|
|
111
123
|
currentPickGroupId: currentPickGroupId.current,
|
|
112
124
|
}),
|
|
113
|
-
[
|
|
125
|
+
[
|
|
126
|
+
instance,
|
|
127
|
+
onLastPick,
|
|
128
|
+
pickItem,
|
|
129
|
+
savePickGroupData,
|
|
130
|
+
scanImplementation,
|
|
131
|
+
setPickGroupPicked,
|
|
132
|
+
startPicking,
|
|
133
|
+
switchPickItem,
|
|
134
|
+
],
|
|
114
135
|
);
|
|
115
136
|
|
|
116
137
|
return (
|
|
@@ -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} = useGatherer();
|
|
7
|
+
const {pickItem, currentPickGroupId, savePickGroupData, switchPickItem, onLastPick, instance, setPickGroupPicked} = useGatherer();
|
|
8
8
|
|
|
9
9
|
const retrieveNextPickItem = useCallback((): void => {
|
|
10
10
|
switchPickItem('next');
|
|
@@ -22,11 +22,14 @@ export const usePickItemSwitch = (): ProductSwitch => {
|
|
|
22
22
|
.then(response => {
|
|
23
23
|
console.log('pick group finished', response);
|
|
24
24
|
if (response.data.content === 'Pick group finished') {
|
|
25
|
-
|
|
25
|
+
setPickGroupPicked(currentPickGroupId)
|
|
26
|
+
.then(onLastPick)
|
|
27
|
+
.catch(error => console.log('pick group error', error));
|
|
26
28
|
} else {
|
|
27
29
|
savePickGroupData(response.data);
|
|
28
30
|
}
|
|
29
|
-
})
|
|
31
|
+
})
|
|
32
|
+
.catch(error => console.log('set item picked error', error));
|
|
30
33
|
},
|
|
31
34
|
[currentPickGroupId, instance, onLastPick, pickItem.pickItem.id, savePickGroupData],
|
|
32
35
|
);
|