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

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.
@@ -20,7 +20,8 @@ const GathererContext = /*#__PURE__*/(0, _react.createContext)({
20
20
  pickItem: _defaultPickGroupItem.defaultPickGroupItem,
21
21
  savePickGroupData: () => undefined,
22
22
  startPicking: () => new Promise(() => undefined),
23
- switchPickItem: () => new Promise(() => undefined)
23
+ switchPickItem: () => new Promise(() => undefined),
24
+ handleCleanEan: () => ''
24
25
  });
25
26
  exports.GathererContext = GathererContext;
26
27
  const GathererContextProvider = props => {
@@ -28,7 +29,8 @@ const GathererContextProvider = props => {
28
29
  scanImplementation,
29
30
  instance,
30
31
  onLastPick,
31
- language
32
+ language,
33
+ handleCleanEan
32
34
  } = props.config;
33
35
  const [pickItem, setPickItem] = (0, _react.useState)(_defaultPickGroupItem.defaultPickGroupItem);
34
36
  const currentPickGroupId = (0, _react.useRef)(0);
@@ -82,10 +84,11 @@ const GathererContextProvider = props => {
82
84
  onLastPick,
83
85
  startPicking,
84
86
  switchPickItem,
87
+ handleCleanEan,
85
88
  savePickGroupData,
86
89
  scanImplementation,
87
90
  currentPickGroupId: currentPickGroupId.current
88
- }), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
91
+ }), [handleCleanEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
89
92
  return /*#__PURE__*/_react.default.createElement(GathererContext.Provider, {
90
93
  value: context
91
94
  }, /*#__PURE__*/_react.default.createElement(_scanContext.ScanContextProvider, {
@@ -1 +1 @@
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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"}
1
+ {"version":3,"names":["GathererContext","createContext","currentPickGroupId","onLastPick","undefined","instance","axios","create","pickItem","defaultPickGroupItem","savePickGroupData","startPicking","Promise","switchPickItem","handleCleanEan","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 handleCleanEan?: (ean: string) => string;\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 handleCleanEan: () => '',\n});\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language, handleCleanEan} = 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 handleCleanEan,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [\n handleCleanEan,\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":";;;;;;AAAA;AAEA;AAEA;AACA;AACA;AACA;AAAiG;AAAA;AAAA;AAkB1F,MAAMA,eAAe,gBAAG,IAAAC,oBAAa,EAAwB;EAChEC,kBAAkB,EAAE,CAAC;EACrBC,UAAU,EAAE,MAAMC,SAAS;EAC3BC,QAAQ,EAAEC,cAAK,CAACC,MAAM,EAAE;EACxBC,QAAQ,EAAEC,0CAAoB;EAC9BC,iBAAiB,EAAE,MAAMN,SAAS;EAClCO,YAAY,EAAE,MAAM,IAAIC,OAAO,CAAC,MAAMR,SAAS,CAAC;EAChDS,cAAc,EAAE,MAAM,IAAID,OAAO,CAAC,MAAMR,SAAS,CAAC;EAClDU,cAAc,EAAE,MAAM;AAC1B,CAAC,CAAC;AAAC;AAEI,MAAMC,uBAAuB,GAA+BC,KAAY,IAAkB;EAC7F,MAAM;IAACC,kBAAkB;IAAEZ,QAAQ;IAAEF,UAAU;IAAEe,QAAQ;IAAEJ;EAAc,CAAC,GAAGE,KAAK,CAACG,MAAM;EACzF,MAAM,CAACX,QAAQ,EAAEY,WAAW,CAAC,GAAG,IAAAC,eAAQ,EAAcZ,0CAAoB,CAAC;EAC3E,MAAMP,kBAAkB,GAAG,IAAAoB,aAAM,EAAS,CAAC,CAAC;EAE5C,IAAAC,gBAAS,EAAC,MAAM;IAAA;IACZ,yBAAAN,kBAAkB,CAACO,qBAAqB,0DAAxC,2BAAAP,kBAAkB,CAA0B;EAChD,CAAC,EAAE,CAACA,kBAAkB,CAAC,CAAC;EAExB,MAAMP,iBAAiB,GAAG,IAAAe,kBAAW,EAAEC,IAAiB,IAAW;IAC/DN,WAAW,CAACM,IAAI,CAAC;EACrB,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMf,YAAY,GAAG,IAAAc,kBAAW,EAC5B,MAAOE,WAAmB,IAA2B;IACjD,OAAO,IAAIf,OAAO,CAAC,CAACgB,OAAO,EAAEC,MAAM,KAAK;MACpCxB,QAAQ,CACHyB,IAAI,CAACC,0BAAiB,EAAE;QAACC,aAAa,EAAEL;MAAW,CAAC,CAAC,CACrDM,IAAI,CAACC,QAAQ,IAAI;QACdhC,kBAAkB,CAACiC,OAAO,GAAGR,WAAW;QACxCjB,iBAAiB,CAACwB,QAAQ,CAACR,IAAI,CAAC;QAChCE,OAAO,CAACM,QAAQ,CAACR,IAAI,CAAC;MAC1B,CAAC,CAAC,CACDU,KAAK,CAACP,MAAM,CAAC;IACtB,CAAC,CAAC;EACN,CAAC,EACD,CAACxB,QAAQ,EAAEK,iBAAiB,CAAC,CAChC;EAED,MAAMG,cAAc,GAAG,IAAAY,kBAAW,EAC9B,MAAOY,GAAe,IAA2B;IAC7C,MAAMC,GAAG,GAAGD,GAAG,KAAK,MAAM,GAAGE,2BAAkB,GAAGC,2BAAkB;IAEpEpB,WAAW,CAACqB,SAAS,IAAI;MACrB,IAAIJ,GAAG,KAAK,MAAM,IAAII,SAAS,CAACC,QAAQ,EAAE;QACtC,OAAOD,SAAS,CAACC,QAAQ;MAC7B;MAEA,IAAIL,GAAG,KAAK,MAAM,IAAII,SAAS,CAACE,IAAI,EAAE;QAClC,OAAOF,SAAS,CAACE,IAAI;MACzB;MAEA,OAAOF,SAAS;IACpB,CAAC,CAAC;IAEF,OAAO,IAAI7B,OAAO,CAAC,CAACgB,OAAO,EAAEC,MAAM,KAAK;MACpCxB,QAAQ,CACHyB,IAAI,CAACQ,GAAG,EAAE;QACPN,aAAa,EAAE9B,kBAAkB,CAACiC,OAAO;QACzCS,YAAY,EAAEpC,QAAQ,CAACA,QAAQ,CAACqC;MACpC,CAAC,CAAC,CACDZ,IAAI,CAACC,QAAQ,IAAI;QACdd,WAAW,CAACc,QAAQ,CAACR,IAAI,CAAC;QAC1BE,OAAO,CAACM,QAAQ,CAACR,IAAI,CAAC;MAC1B,CAAC,CAAC,CACDU,KAAK,CAACP,MAAM,CAAC;IACtB,CAAC,CAAC;EACN,CAAC,EACD,CAACxB,QAAQ,EAAEG,QAAQ,CAACA,QAAQ,CAACqC,EAAE,CAAC,CACnC;EAED,IAAAtB,gBAAS,EAAC,MAAM;IACZ,IAAIL,QAAQ,EAAE;MACV4B,aAAI,CAACC,cAAc,CAAC7B,QAAQ,CAAC;IACjC;EACJ,CAAC,EAAE,CAACA,QAAQ,CAAC,CAAC;EAEd,MAAM8B,OAAO,GAAG,IAAAC,cAAO,EACnB,OAAO;IACHzC,QAAQ;IACRH,QAAQ;IACRF,UAAU;IACVQ,YAAY;IACZE,cAAc;IACdC,cAAc;IACdJ,iBAAiB;IACjBO,kBAAkB;IAClBf,kBAAkB,EAAEA,kBAAkB,CAACiC;EAC3C,CAAC,CAAC,EACF,CACIrB,cAAc,EACdT,QAAQ,EACRF,UAAU,EACVK,QAAQ,EACRE,iBAAiB,EACjBO,kBAAkB,EAClBN,YAAY,EACZE,cAAc,CACjB,CACJ;EAED,oBACI,6BAAC,eAAe,CAAC,QAAQ;IAAC,KAAK,EAAEmC;EAAQ,gBACrC,6BAAC,gCAAmB;IAAC,OAAO,EAAEhC,KAAK,CAACG,MAAM,CAACF;EAAmB,GAAED,KAAK,CAACkC,QAAQ,CAAuB,CAC9E;AAEnC,CAAC;AAAC"}
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.useScanner = void 0;
7
7
  var _react = require("react");
8
+ var _useGatherer = require("../hooks/use-gatherer");
8
9
  var _scanContext = require("../context/scan-context");
9
10
  const useScanner = onScan => {
10
11
  const {
@@ -12,12 +13,23 @@ const useScanner = onScan => {
12
13
  clearEventListeners
13
14
  } = (0, _react.useContext)(_scanContext.ScanContext);
14
15
  const callbackRef = (0, _react.useRef)(onScan);
16
+ const {
17
+ handleCleanEan
18
+ } = (0, _useGatherer.useGatherer)();
15
19
  (0, _react.useEffect)(() => {
16
20
  callbackRef.current = onScan;
17
21
  }, [onScan]);
18
22
  const startScanner = (0, _react.useCallback)(() => {
19
- registerListener(event => callbackRef.current(event.data.trim()));
20
- }, [registerListener]);
23
+ registerListener(event => {
24
+ const trimmedScan = event.data.trim();
25
+ const scan = handleCleanEan === null || handleCleanEan === void 0 ? void 0 : handleCleanEan(trimmedScan);
26
+ if (!scan) {
27
+ callbackRef.current(trimmedScan);
28
+ return;
29
+ }
30
+ callbackRef.current(scan);
31
+ });
32
+ }, [handleCleanEan, registerListener]);
21
33
  const stopScanner = (0, _react.useCallback)(() => {
22
34
  clearEventListeners();
23
35
  }, [clearEventListeners]);
@@ -1 +1 @@
1
- {"version":3,"names":["useScanner","onScan","registerListener","clearEventListeners","useContext","ScanContext","callbackRef","useRef","useEffect","current","startScanner","useCallback","event","data","trim","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {IScanContext, ScanContext} from '../context/scan-context';\n\ntype ScanCallback = (scan: string) => void;\n\nexport const useScanner = (onScan: ScanCallback): Scanner => {\n const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);\n const callbackRef = useRef<ScanCallback>(onScan);\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => callbackRef.current(event.data.trim()));\n }, [registerListener]);\n\n const stopScanner = useCallback((): void => {\n clearEventListeners();\n }, [clearEventListeners]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":";;;;;;AAAA;AAEA;AAIO,MAAMA,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAG,IAAAC,iBAAU,EAAeC,wBAAW,CAAC;EACrF,MAAMC,WAAW,GAAG,IAAAC,aAAM,EAAeN,MAAM,CAAC;EAEhD,IAAAO,gBAAS,EAAC,MAAM;IACZF,WAAW,CAACG,OAAO,GAAGR,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMS,YAAY,GAAG,IAAAC,kBAAW,EAAC,MAAY;IACzCT,gBAAgB,CAACU,KAAK,IAAIN,WAAW,CAACG,OAAO,CAACG,KAAK,CAACC,IAAI,CAACC,IAAI,EAAE,CAAC,CAAC;EACrE,CAAC,EAAE,CAACZ,gBAAgB,CAAC,CAAC;EAEtB,MAAMa,WAAW,GAAG,IAAAJ,kBAAW,EAAC,MAAY;IACxCR,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHO,YAAY;IACZK;EACJ,CAAC;AACL,CAAC;AAAC"}
1
+ {"version":3,"names":["useScanner","onScan","registerListener","clearEventListeners","useContext","ScanContext","callbackRef","useRef","handleCleanEan","useGatherer","useEffect","current","startScanner","useCallback","event","trimmedScan","data","trim","scan","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {IScanContext, ScanContext} from '../context/scan-context';\n\ntype ScanCallback = (scan: string) => void;\n\nexport const useScanner = (onScan: ScanCallback): Scanner => {\n const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);\n const callbackRef = useRef<ScanCallback>(onScan);\n const {handleCleanEan} = useGatherer();\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => {\n const trimmedScan = event.data.trim();\n const scan = handleCleanEan?.(trimmedScan);\n\n if (!scan) {\n callbackRef.current(trimmedScan);\n return;\n }\n\n callbackRef.current(scan);\n });\n }, [handleCleanEan, registerListener]);\n\n const stopScanner = useCallback((): void => {\n clearEventListeners();\n }, [clearEventListeners]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":";;;;;;AAAA;AAEA;AACA;AAIO,MAAMA,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAG,IAAAC,iBAAU,EAAeC,wBAAW,CAAC;EACrF,MAAMC,WAAW,GAAG,IAAAC,aAAM,EAAeN,MAAM,CAAC;EAChD,MAAM;IAACO;EAAc,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAEtC,IAAAC,gBAAS,EAAC,MAAM;IACZJ,WAAW,CAACK,OAAO,GAAGV,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMW,YAAY,GAAG,IAAAC,kBAAW,EAAC,MAAY;IACzCX,gBAAgB,CAACY,KAAK,IAAI;MACtB,MAAMC,WAAW,GAAGD,KAAK,CAACE,IAAI,CAACC,IAAI,EAAE;MACrC,MAAMC,IAAI,GAAGV,cAAc,aAAdA,cAAc,uBAAdA,cAAc,CAAGO,WAAW,CAAC;MAE1C,IAAI,CAACG,IAAI,EAAE;QACPZ,WAAW,CAACK,OAAO,CAACI,WAAW,CAAC;QAChC;MACJ;MAEAT,WAAW,CAACK,OAAO,CAACO,IAAI,CAAC;IAC7B,CAAC,CAAC;EACN,CAAC,EAAE,CAACV,cAAc,EAAEN,gBAAgB,CAAC,CAAC;EAEtC,MAAMiB,WAAW,GAAG,IAAAN,kBAAW,EAAC,MAAY;IACxCV,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHS,YAAY;IACZO;EACJ,CAAC;AACL,CAAC;AAAC"}
@@ -7,16 +7,18 @@ exports.PickList = void 0;
7
7
  var _react = _interopRequireWildcard(require("react"));
8
8
  var _reactNative = require("react-native");
9
9
  var _reactI18next = require("react-i18next");
10
+ var _search = require("./partials/search");
10
11
  var _emptyList = require("./partials/empty-list");
11
12
  var _useGatherer = require("../hooks/use-gatherer");
12
- var _apiUrls = require("../shared/api/api-urls");
13
13
  var _pickGroupItem = require("./partials/pick-group-item");
14
+ var _apiUrls = require("../shared/api/api-urls");
14
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); }
15
16
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
16
17
  const PickList = props => {
17
18
  const {
18
19
  renderItem,
19
20
  onItemPress,
21
+ isAfterPickList,
20
22
  shouldRefresh
21
23
  } = props;
22
24
  const [loading, setLoading] = (0, _react.useState)(true);
@@ -29,37 +31,23 @@ const PickList = props => {
29
31
  const {
30
32
  t
31
33
  } = (0, _reactI18next.useTranslation)();
32
-
33
- // const getPickListWithSearch = useCallback(
34
- // (searchFieldParam?: string, searchValueParam?: string): void => {
35
- // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
36
- //
37
- // setLoading(true);
38
- //
39
- // instance
40
- // .post(url, {
41
- // searchField: searchFieldParam,
42
- // searchValue: searchValueParam,
43
- // })
44
- // .then(response => setPickList(response.data.pick_groups))
45
- // .catch(error => {
46
- // console.log('error picklist search', error);
47
- // ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
48
- // })
49
- // .finally(() => setLoading(false));
50
- // },
51
- // [instance, isAfterPickList],
52
- // );
53
-
34
+ const getPickListWithSearch = (0, _react.useCallback)((searchFieldParam, searchValueParam) => {
35
+ const url = isAfterPickList ? _apiUrls.GET_AFTER_PICKLIST_URL : _apiUrls.GET_PICKLIST_URL;
36
+ setLoading(true);
37
+ instance.post(url, {
38
+ searchField: searchFieldParam,
39
+ searchValue: searchValueParam
40
+ }).then(response => setPickList(response.data.pick_groups)).catch(error => {
41
+ _reactNative.ToastAndroid.show(error.response.data.error, _reactNative.ToastAndroid.LONG);
42
+ }).finally(() => setLoading(false));
43
+ }, [instance, isAfterPickList]);
54
44
  const getPickList = (0, _react.useCallback)(() => {
55
- console.log(1, 'getpicklist');
56
45
  setLoading(true);
57
46
  instance.post(_apiUrls.GET_PICKLIST_URL).then(response => {
58
- console.log(2, 'picklist then');
59
47
  if (!ignoreCurrentRequest.current) {
60
48
  setPickList(response.data.pick_groups);
61
49
  }
62
- }).catch(error => console.log(3, 'picklist error', error)).finally(() => setLoading(false));
50
+ }).catch(() => _reactNative.ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', _reactNative.ToastAndroid.SHORT)).finally(() => setLoading(false));
63
51
  }, [instance]);
64
52
  (0, _react.useEffect)(() => {
65
53
  ignoreCurrentRequest.current = false;
@@ -77,24 +65,21 @@ const PickList = props => {
77
65
  renderProps: renderProps
78
66
  });
79
67
  };
80
-
81
- // const handlePickListFromSearch = useCallback(
82
- // (search: string): void => {
83
- // getPickListWithSearch('', search);
84
- // },
85
- // [getPickListWithSearch],
86
- // );
87
-
68
+ const handlePickListFromSearch = (0, _react.useCallback)(search => {
69
+ getPickListWithSearch('', search);
70
+ }, [getPickListWithSearch]);
88
71
  return /*#__PURE__*/_react.default.createElement(_reactNative.FlatList, {
89
72
  refreshing: loading,
90
- onRefresh: getPickList,
73
+ onRefresh: getPickListWithSearch,
91
74
  data: pickList,
92
75
  renderItem: renderItem ?? renderPickGroupItem,
93
76
  keyExtractor: pickGroup => pickGroup.id.toString(),
94
77
  ListEmptyComponent: /*#__PURE__*/_react.default.createElement(_emptyList.EmptyList, {
95
78
  text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
79
+ }),
80
+ ListHeaderComponent: /*#__PURE__*/_react.default.createElement(_search.Search, {
81
+ onSearch: handlePickListFromSearch
96
82
  })
97
- // ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
98
83
  });
99
84
  };
100
85
  exports.PickList = PickList;
@@ -1 +1 @@
1
- {"version":3,"names":["PickList","props","renderItem","onItemPress","shouldRefresh","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","isInitialRender","instance","useGatherer","t","useTranslation","getPickList","useCallback","console","log","post","GET_PICKLIST_URL","then","response","current","data","pick_groups","catch","error","finally","useEffect","renderPickGroupItem","renderProps","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {EmptyList} from './partials/empty-list';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {GET_PICKLIST_URL} from '../shared/api/api-urls';\nimport {PickGroupItem} from './partials/pick-group-item';\n\ninterface props<T> {\n isAfterPickList?: boolean;\n shouldRefresh?: boolean;\n renderItem?: ListRenderItem<T>;\n onItemPress?: (pickGroup: T) => void;\n}\n\nexport const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {renderItem, onItemPress, shouldRefresh} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\n const ignoreCurrentRequest = useRef(true);\n const isInitialRender = useRef(true);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n // const getPickListWithSearch = useCallback(\n // (searchFieldParam?: string, searchValueParam?: string): void => {\n // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n //\n // setLoading(true);\n //\n // instance\n // .post(url, {\n // searchField: searchFieldParam,\n // searchValue: searchValueParam,\n // })\n // .then(response => setPickList(response.data.pick_groups))\n // .catch(error => {\n // console.log('error picklist search', error);\n // ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n // })\n // .finally(() => setLoading(false));\n // },\n // [instance, isAfterPickList],\n // );\n\n const getPickList = useCallback(() => {\n console.log(1, 'getpicklist');\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n console.log(2, 'picklist then');\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => console.log(3, 'picklist error', error))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (isInitialRender.current || shouldRefresh) {\n getPickList();\n }\n\n isInitialRender.current = false;\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, shouldRefresh]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n // const handlePickListFromSearch = useCallback(\n // (search: string): void => {\n // getPickListWithSearch('', search);\n // },\n // [getPickListWithSearch],\n // );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={getPickList}\n data={pickList}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n // ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AAEA;AACA;AACA;AACA;AAAyD;AAAA;AASlD,MAAMA,QAAQ,GAAyBC,KAAe,IAAkB;EAC3E,MAAM;IAACC,UAAU;IAAEC,WAAW;IAAEC;EAAa,CAAC,GAAGH,KAAK;EACtD,MAAM,CAACI,OAAO,EAAEC,UAAU,CAAC,GAAG,IAAAC,eAAQ,EAAU,IAAI,CAAC;EACrD,MAAM,CAACC,QAAQ,EAAEC,WAAW,CAAC,GAAG,IAAAF,eAAQ,EAAM,EAAE,CAAC;EACjD,MAAMG,oBAAoB,GAAG,IAAAC,aAAM,EAAC,IAAI,CAAC;EACzC,MAAMC,eAAe,GAAG,IAAAD,aAAM,EAAC,IAAI,CAAC;EACpC,MAAM;IAACE;EAAQ,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAChC,MAAM;IAACC;EAAC,CAAC,GAAG,IAAAC,4BAAc,GAAE;;EAE5B;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;EAEA,MAAMC,WAAW,GAAG,IAAAC,kBAAW,EAAC,MAAM;IAClCC,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,aAAa,CAAC;IAC7Bd,UAAU,CAAC,IAAI,CAAC;IAEhBO,QAAQ,CACHQ,IAAI,CAACC,yBAAgB,CAAC,CACtBC,IAAI,CAACC,QAAQ,IAAI;MACdL,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,eAAe,CAAC;MAC/B,IAAI,CAACV,oBAAoB,CAACe,OAAO,EAAE;QAC/BhB,WAAW,CAACe,QAAQ,CAACE,IAAI,CAACC,WAAW,CAAC;MAC1C;IACJ,CAAC,CAAC,CACDC,KAAK,CAACC,KAAK,IAAIV,OAAO,CAACC,GAAG,CAAC,CAAC,EAAE,gBAAgB,EAAES,KAAK,CAAC,CAAC,CACvDC,OAAO,CAAC,MAAMxB,UAAU,CAAC,KAAK,CAAC,CAAC;EACzC,CAAC,EAAE,CAACO,QAAQ,CAAC,CAAC;EAEd,IAAAkB,gBAAS,EAAC,MAAM;IACZrB,oBAAoB,CAACe,OAAO,GAAG,KAAK;IAEpC,IAAIb,eAAe,CAACa,OAAO,IAAIrB,aAAa,EAAE;MAC1Ca,WAAW,EAAE;IACjB;IAEAL,eAAe,CAACa,OAAO,GAAG,KAAK;IAE/B,OAAO,MAAM;MACTf,oBAAoB,CAACe,OAAO,GAAG,IAAI;IACvC,CAAC;EACL,CAAC,EAAE,CAACR,WAAW,EAAEJ,QAAQ,EAAET,aAAa,CAAC,CAAC;EAE1C,MAAM4B,mBAAmB,GAAIC,WAAkC,IAAkB;IAC7E,oBAAO,6BAAC,4BAAa;MAAC,OAAO,EAAE9B,WAAY;MAAC,WAAW,EAAE8B;IAAY,EAAG;EAC5E,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA;;EAEA,oBACI,6BAAC,qBAAQ;IACL,UAAU,EAAE5B,OAAQ;IACpB,SAAS,EAAEY,WAAY;IACvB,IAAI,EAAET,QAAS;IACf,UAAU,EAAEN,UAAU,IAAI8B,mBAAoB;IAC9C,YAAY,EAAEE,SAAS,IAAIA,SAAS,CAACC,EAAE,CAACC,QAAQ,EAAG;IACnD,kBAAkB,eAAE,6BAAC,oBAAS;MAAC,IAAI,EAAErB,CAAC,CAAE,wBAAuBV,OAAO,GAAG,SAAS,GAAG,WAAY,EAAC;IAAE;IACpG;EAAA,EACF;AAEV,CAAC;AAAC"}
1
+ {"version":3,"names":["PickList","props","renderItem","onItemPress","isAfterPickList","shouldRefresh","loading","setLoading","useState","pickList","setPickList","ignoreCurrentRequest","useRef","isInitialRender","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","getPickList","current","SHORT","useEffect","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {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 shouldRefresh?: boolean;\n renderItem?: ListRenderItem<T>;\n onItemPress?: (pickGroup: T) => void;\n}\n\nexport const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {renderItem, onItemPress, isAfterPickList, shouldRefresh} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\n const ignoreCurrentRequest = useRef(true);\n const isInitialRender = useRef(true);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n const getPickListWithSearch = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n setLoading(true);\n\n instance\n .post(url, {\n searchField: searchFieldParam,\n searchValue: searchValueParam,\n })\n .then(response => setPickList(response.data.pick_groups))\n .catch(error => {\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n })\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n const getPickList = useCallback(() => {\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(() => ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', ToastAndroid.SHORT))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (isInitialRender.current || shouldRefresh) {\n getPickList();\n }\n\n isInitialRender.current = false;\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, shouldRefresh]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n getPickListWithSearch('', search);\n },\n [getPickListWithSearch],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={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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"}
@@ -55,10 +55,7 @@ const Picker = props => {
55
55
  setPickModalVisible(true);
56
56
  }
57
57
  }
58
- },
59
- // Adding stopScanner here is not possible because of the useScanner hook implementation
60
- // eslint-disable-next-line react-hooks/exhaustive-deps
61
- [pickItem.barcode, pickItem.quantity, nextPickItem]);
58
+ }, [pickItem.barcode, pickItem.quantity, nextPickItem, props]);
62
59
  const {
63
60
  startScanner,
64
61
  stopScanner
@@ -1 +1 @@
1
- {"version":3,"names":["container","styles","Picker","props","pickItem","useGatherer","pickModalVisible","setPickModalVisible","useState","nextPickItem","usePickItemSwitch","closeModal","startScanner","handleMultiQuantityPick","quantityPicked","pickModal","handleScan","useCallback","scan","barcode","quantity","onMultiQuantityPick","stopScanner","useScanner","useEffect","style","children","Row","Column","Progress","ProgressBar","PickAmount","ProductInfo"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useEffect, useState} from 'react';\nimport {View, ViewStyle} from 'react-native';\n\nimport {styles} from './styles/picker-styles';\nimport {useScanner} from '../hooks/use-scanner';\nimport {PickAmount} from './partials/pick-amount';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {ProductInfo} from './partials/product-info';\nimport {ProgressBar} from './partials/progress-bar';\nimport {PickModal} from './partials/modal/pick-modal';\nimport {DataRow as Row} from '../shared/layout/data-row';\nimport {usePickItemSwitch} from '../hooks/use-pick-item-switch';\nimport {DataColumn as Column} from '../shared/layout/data-column';\n\ninterface props {\n children: ReactNode;\n style?: ViewStyle;\n pickModal?: JSX.Element;\n onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {pickItem} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const handleMultiQuantityPick = (quantityPicked: number): void => {\n nextPickItem(false, quantityPicked);\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\n\n const handleScan = useCallback(\n (scan: string): void => {\n if (scan !== '' && scan === pickItem.barcode) {\n if (pickItem.quantity === 1) {\n nextPickItem(false, 1);\n } else {\n if (props.pickModal) {\n props.onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n // Adding stopScanner here is not possible because of the useScanner hook implementation\n // eslint-disable-next-line react-hooks/exhaustive-deps\n [pickItem.barcode, pickItem.quantity, nextPickItem],\n );\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n startScanner();\n\n return () => stopScanner();\n }, [startScanner, stopScanner]);\n\n return (\n <View style={[container, props.style]}>\n {pickModal}\n {props.children}\n </View>\n );\n};\n\nPicker.Row = Row;\nPicker.Column = Column;\nPicker.Progress = ProgressBar;\nPicker.PickAmount = PickAmount;\nPicker.ProductInfo = ProductInfo;\n\nexport {Picker};\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAUlE,MAAM;EAACA;AAAS,CAAC,GAAGC,oBAAM;AAE1B,MAAMC,MAAM,GAAIC,KAAY,IAAkB;EAC1C,MAAM;IAACC;EAAQ,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAChC,MAAM,CAACC,gBAAgB,EAAEC,mBAAmB,CAAC,GAAG,IAAAC,eAAQ,EAAU,KAAK,CAAC;EACxE,MAAM;IAACC;EAAY,CAAC,GAAG,IAAAC,oCAAiB,GAAE;EAE1C,MAAMC,UAAU,GAAG,MAAY;IAC3BC,YAAY,EAAE;IACdL,mBAAmB,CAAC,KAAK,CAAC;EAC9B,CAAC;EAED,MAAMM,uBAAuB,GAAIC,cAAsB,IAAW;IAC9DL,YAAY,CAAC,KAAK,EAAEK,cAAc,CAAC;IACnCH,UAAU,EAAE;EAChB,CAAC;EAED,MAAMI,SAAS,GAAGZ,KAAK,CAACY,SAAS,iBAC7B,6BAAC,oBAAS;IAAC,WAAW,EAAEF,uBAAwB;IAAC,OAAO,EAAEP,gBAAiB;IAAC,UAAU,EAAEK;EAAW,EACtG;EAED,MAAMK,UAAU,GAAG,IAAAC,kBAAW,EACzBC,IAAY,IAAW;IACpB,IAAIA,IAAI,KAAK,EAAE,IAAIA,IAAI,KAAKd,QAAQ,CAACe,OAAO,EAAE;MAC1C,IAAIf,QAAQ,CAACgB,QAAQ,KAAK,CAAC,EAAE;QACzBX,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;MAC1B,CAAC,MAAM;QACH,IAAIN,KAAK,CAACY,SAAS,EAAE;UAAA;UACjB,yBAAAZ,KAAK,CAACkB,mBAAmB,0DAAzB,2BAAAlB,KAAK,CAAwB;UAC7B;QACJ;QAEAI,mBAAmB,CAAC,IAAI,CAAC;MAC7B;IACJ;EACJ,CAAC;EACD;EACA;EACA,CAACH,QAAQ,CAACe,OAAO,EAAEf,QAAQ,CAACgB,QAAQ,EAAEX,YAAY,CAAC,CACtD;EAED,MAAM;IAACG,YAAY;IAAEU;EAAW,CAAC,GAAG,IAAAC,sBAAU,EAACP,UAAU,CAAC;EAE1D,IAAAQ,gBAAS,EAAC,MAAM;IACZZ,YAAY,EAAE;IAEd,OAAO,MAAMU,WAAW,EAAE;EAC9B,CAAC,EAAE,CAACV,YAAY,EAAEU,WAAW,CAAC,CAAC;EAE/B,oBACI,6BAAC,iBAAI;IAAC,KAAK,EAAE,CAACtB,SAAS,EAAEG,KAAK,CAACsB,KAAK;EAAE,GACjCV,SAAS,EACTZ,KAAK,CAACuB,QAAQ,CACZ;AAEf,CAAC;AAAC;AAEFxB,MAAM,CAACyB,GAAG,GAAGA,gBAAG;AAChBzB,MAAM,CAAC0B,MAAM,GAAGA,sBAAM;AACtB1B,MAAM,CAAC2B,QAAQ,GAAGC,wBAAW;AAC7B5B,MAAM,CAAC6B,UAAU,GAAGA,sBAAU;AAC9B7B,MAAM,CAAC8B,WAAW,GAAGA,wBAAW"}
1
+ {"version":3,"names":["container","styles","Picker","props","pickItem","useGatherer","pickModalVisible","setPickModalVisible","useState","nextPickItem","usePickItemSwitch","closeModal","startScanner","handleMultiQuantityPick","quantityPicked","pickModal","handleScan","useCallback","scan","barcode","quantity","onMultiQuantityPick","stopScanner","useScanner","useEffect","style","children","Row","Column","Progress","ProgressBar","PickAmount","ProductInfo"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useEffect, useState} from 'react';\nimport {View, ViewStyle} from 'react-native';\n\nimport {styles} from './styles/picker-styles';\nimport {useScanner} from '../hooks/use-scanner';\nimport {PickAmount} from './partials/pick-amount';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {ProductInfo} from './partials/product-info';\nimport {ProgressBar} from './partials/progress-bar';\nimport {PickModal} from './partials/modal/pick-modal';\nimport {DataRow as Row} from '../shared/layout/data-row';\nimport {usePickItemSwitch} from '../hooks/use-pick-item-switch';\nimport {DataColumn as Column} from '../shared/layout/data-column';\n\ninterface props {\n children: ReactNode;\n style?: ViewStyle;\n pickModal?: JSX.Element;\n onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {pickItem} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const handleMultiQuantityPick = (quantityPicked: number): void => {\n nextPickItem(false, quantityPicked);\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\n\n const handleScan = useCallback(\n (scan: string): void => {\n if (scan !== '' && scan === pickItem.barcode) {\n if (pickItem.quantity === 1) {\n nextPickItem(false, 1);\n } else {\n if (props.pickModal) {\n props.onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n [pickItem.barcode, pickItem.quantity, nextPickItem, props],\n );\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n startScanner();\n\n return () => stopScanner();\n }, [startScanner, stopScanner]);\n\n return (\n <View style={[container, props.style]}>\n {pickModal}\n {props.children}\n </View>\n );\n};\n\nPicker.Row = Row;\nPicker.Column = Column;\nPicker.Progress = ProgressBar;\nPicker.PickAmount = PickAmount;\nPicker.ProductInfo = ProductInfo;\n\nexport {Picker};\n"],"mappings":";;;;;;AAAA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAAkE;AAAA;AAUlE,MAAM;EAACA;AAAS,CAAC,GAAGC,oBAAM;AAE1B,MAAMC,MAAM,GAAIC,KAAY,IAAkB;EAC1C,MAAM;IAACC;EAAQ,CAAC,GAAG,IAAAC,wBAAW,GAAE;EAChC,MAAM,CAACC,gBAAgB,EAAEC,mBAAmB,CAAC,GAAG,IAAAC,eAAQ,EAAU,KAAK,CAAC;EACxE,MAAM;IAACC;EAAY,CAAC,GAAG,IAAAC,oCAAiB,GAAE;EAE1C,MAAMC,UAAU,GAAG,MAAY;IAC3BC,YAAY,EAAE;IACdL,mBAAmB,CAAC,KAAK,CAAC;EAC9B,CAAC;EAED,MAAMM,uBAAuB,GAAIC,cAAsB,IAAW;IAC9DL,YAAY,CAAC,KAAK,EAAEK,cAAc,CAAC;IACnCH,UAAU,EAAE;EAChB,CAAC;EAED,MAAMI,SAAS,GAAGZ,KAAK,CAACY,SAAS,iBAC7B,6BAAC,oBAAS;IAAC,WAAW,EAAEF,uBAAwB;IAAC,OAAO,EAAEP,gBAAiB;IAAC,UAAU,EAAEK;EAAW,EACtG;EAED,MAAMK,UAAU,GAAG,IAAAC,kBAAW,EACzBC,IAAY,IAAW;IACpB,IAAIA,IAAI,KAAK,EAAE,IAAIA,IAAI,KAAKd,QAAQ,CAACe,OAAO,EAAE;MAC1C,IAAIf,QAAQ,CAACgB,QAAQ,KAAK,CAAC,EAAE;QACzBX,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;MAC1B,CAAC,MAAM;QACH,IAAIN,KAAK,CAACY,SAAS,EAAE;UAAA;UACjB,yBAAAZ,KAAK,CAACkB,mBAAmB,0DAAzB,2BAAAlB,KAAK,CAAwB;UAC7B;QACJ;QAEAI,mBAAmB,CAAC,IAAI,CAAC;MAC7B;IACJ;EACJ,CAAC,EACD,CAACH,QAAQ,CAACe,OAAO,EAAEf,QAAQ,CAACgB,QAAQ,EAAEX,YAAY,EAAEN,KAAK,CAAC,CAC7D;EAED,MAAM;IAACS,YAAY;IAAEU;EAAW,CAAC,GAAG,IAAAC,sBAAU,EAACP,UAAU,CAAC;EAE1D,IAAAQ,gBAAS,EAAC,MAAM;IACZZ,YAAY,EAAE;IAEd,OAAO,MAAMU,WAAW,EAAE;EAC9B,CAAC,EAAE,CAACV,YAAY,EAAEU,WAAW,CAAC,CAAC;EAE/B,oBACI,6BAAC,iBAAI;IAAC,KAAK,EAAE,CAACtB,SAAS,EAAEG,KAAK,CAACsB,KAAK;EAAE,GACjCV,SAAS,EACTZ,KAAK,CAACuB,QAAQ,CACZ;AAEf,CAAC;AAAC;AAEFxB,MAAM,CAACyB,GAAG,GAAGA,gBAAG;AAChBzB,MAAM,CAAC0B,MAAM,GAAGA,sBAAM;AACtB1B,MAAM,CAAC2B,QAAQ,GAAGC,wBAAW;AAC7B5B,MAAM,CAAC6B,UAAU,GAAGA,sBAAU;AAC9B7B,MAAM,CAAC8B,WAAW,GAAGA,wBAAW"}
@@ -15,7 +15,7 @@ const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;
15
15
  exports.SET_ITEM_PICKED_URL = SET_ITEM_PICKED_URL;
16
16
  const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;
17
17
  exports.PREV_PICK_ITEM_URL = PREV_PICK_ITEM_URL;
18
- const GET_AFTER_PICKLIST_URL = `${BASE_URL}/after-picklist`;
18
+ const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;
19
19
  exports.GET_AFTER_PICKLIST_URL = GET_AFTER_PICKLIST_URL;
20
20
  const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;
21
21
  exports.SET_GROUP_PICKED_URL = SET_GROUP_PICKED_URL;
@@ -1 +1 @@
1
- {"version":3,"names":["BASE_URL","GET_PICKLIST_URL","NEXT_PICK_ITEM_URL","START_PICKING_URL","SET_ITEM_PICKED_URL","PREV_PICK_ITEM_URL","GET_AFTER_PICKLIST_URL","SET_GROUP_PICKED_URL"],"sources":["api-urls.ts"],"sourcesContent":["const BASE_URL = '/api/gatherer';\n\nexport const GET_PICKLIST_URL = `${BASE_URL}/picklist`;\nexport const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;\nexport const START_PICKING_URL = `${BASE_URL}/pick-group/start`;\nexport const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;\nexport const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;\nexport const GET_AFTER_PICKLIST_URL = `${BASE_URL}/after-picklist`;\nexport const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;\n"],"mappings":";;;;;;AAAA,MAAMA,QAAQ,GAAG,eAAe;AAEzB,MAAMC,gBAAgB,GAAI,GAAED,QAAS,WAAU;AAAC;AAChD,MAAME,kBAAkB,GAAI,GAAEF,QAAS,iBAAgB;AAAC;AACxD,MAAMG,iBAAiB,GAAI,GAAEH,QAAS,mBAAkB;AAAC;AACzD,MAAMI,mBAAmB,GAAI,GAAEJ,QAAS,mBAAkB;AAAC;AAC3D,MAAMK,kBAAkB,GAAI,GAAEL,QAAS,qBAAoB;AAAC;AAC5D,MAAMM,sBAAsB,GAAI,GAAEN,QAAS,iBAAgB;AAAC;AAC5D,MAAMO,oBAAoB,GAAI,GAAEP,QAAS,oBAAmB;AAAC"}
1
+ {"version":3,"names":["BASE_URL","GET_PICKLIST_URL","NEXT_PICK_ITEM_URL","START_PICKING_URL","SET_ITEM_PICKED_URL","PREV_PICK_ITEM_URL","GET_AFTER_PICKLIST_URL","SET_GROUP_PICKED_URL"],"sources":["api-urls.ts"],"sourcesContent":["const BASE_URL = '/api/gatherer';\n\nexport const GET_PICKLIST_URL = `${BASE_URL}/picklist`;\nexport const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;\nexport const START_PICKING_URL = `${BASE_URL}/pick-group/start`;\nexport const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;\nexport const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;\nexport const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;\nexport const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;\n"],"mappings":";;;;;;AAAA,MAAMA,QAAQ,GAAG,eAAe;AAEzB,MAAMC,gBAAgB,GAAI,GAAED,QAAS,WAAU;AAAC;AAChD,MAAME,kBAAkB,GAAI,GAAEF,QAAS,iBAAgB;AAAC;AACxD,MAAMG,iBAAiB,GAAI,GAAEH,QAAS,mBAAkB;AAAC;AACzD,MAAMI,mBAAmB,GAAI,GAAEJ,QAAS,mBAAkB;AAAC;AAC3D,MAAMK,kBAAkB,GAAI,GAAEL,QAAS,qBAAoB;AAAC;AAC5D,MAAMM,sBAAsB,GAAI,GAAEN,QAAS,yBAAwB;AAAC;AACpE,MAAMO,oBAAoB,GAAI,GAAEP,QAAS,oBAAmB;AAAC"}
@@ -1 +1 @@
1
- {"version":3,"names":[],"sources":["config.d.ts"],"sourcesContent":["type GathererConfig = {\n instance: import('../../../node_modules/axios').AxiosInstance;\n scanImplementation: {\n registerListener: (event: ScanEvent) => void;\n clearEventListeners: () => void;\n registerEventListener?: () => void;\n onBarcodeReadFail?: (event: ScanEvent) => void;\n };\n onLastPick: () => void;\n language?: LanguageConfig;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\n"],"mappings":""}
1
+ {"version":3,"names":[],"sources":["config.d.ts"],"sourcesContent":["type GathererConfig = {\n instance: import('../../../node_modules/axios').AxiosInstance;\n scanImplementation: {\n registerListener: (event: ScanEvent) => void;\n clearEventListeners: () => void;\n registerEventListener?: () => void;\n onBarcodeReadFail?: (event: ScanEvent) => void;\n };\n onLastPick: () => void;\n language?: LanguageConfig;\n handleCleanEan?: (scan: string) => string;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\n"],"mappings":""}
@@ -11,14 +11,16 @@ export const GathererContext = /*#__PURE__*/createContext({
11
11
  pickItem: defaultPickGroupItem,
12
12
  savePickGroupData: () => undefined,
13
13
  startPicking: () => new Promise(() => undefined),
14
- switchPickItem: () => new Promise(() => undefined)
14
+ switchPickItem: () => new Promise(() => undefined),
15
+ handleCleanEan: () => ''
15
16
  });
16
17
  export const GathererContextProvider = props => {
17
18
  const {
18
19
  scanImplementation,
19
20
  instance,
20
21
  onLastPick,
21
- language
22
+ language,
23
+ handleCleanEan
22
24
  } = props.config;
23
25
  const [pickItem, setPickItem] = useState(defaultPickGroupItem);
24
26
  const currentPickGroupId = useRef(0);
@@ -72,10 +74,11 @@ export const GathererContextProvider = props => {
72
74
  onLastPick,
73
75
  startPicking,
74
76
  switchPickItem,
77
+ handleCleanEan,
75
78
  savePickGroupData,
76
79
  scanImplementation,
77
80
  currentPickGroupId: currentPickGroupId.current
78
- }), [instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
81
+ }), [handleCleanEan, instance, onLastPick, pickItem, savePickGroupData, scanImplementation, startPicking, switchPickItem]);
79
82
  return /*#__PURE__*/React.createElement(GathererContext.Provider, {
80
83
  value: context
81
84
  }, /*#__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","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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"}
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","handleCleanEan","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 handleCleanEan?: (ean: string) => string;\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 handleCleanEan: () => '',\n});\n\nexport const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {\n const {scanImplementation, instance, onLastPick, language, handleCleanEan} = 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 handleCleanEan,\n savePickGroupData,\n scanImplementation,\n currentPickGroupId: currentPickGroupId.current,\n }),\n [\n handleCleanEan,\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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"}
@@ -1,4 +1,5 @@
1
1
  import { useCallback, useContext, useEffect, useRef } from 'react';
2
+ import { useGatherer } from '../hooks/use-gatherer';
2
3
  import { ScanContext } from '../context/scan-context';
3
4
  export const useScanner = onScan => {
4
5
  const {
@@ -6,12 +7,23 @@ export const useScanner = onScan => {
6
7
  clearEventListeners
7
8
  } = useContext(ScanContext);
8
9
  const callbackRef = useRef(onScan);
10
+ const {
11
+ handleCleanEan
12
+ } = useGatherer();
9
13
  useEffect(() => {
10
14
  callbackRef.current = onScan;
11
15
  }, [onScan]);
12
16
  const startScanner = useCallback(() => {
13
- registerListener(event => callbackRef.current(event.data.trim()));
14
- }, [registerListener]);
17
+ registerListener(event => {
18
+ const trimmedScan = event.data.trim();
19
+ const scan = handleCleanEan === null || handleCleanEan === void 0 ? void 0 : handleCleanEan(trimmedScan);
20
+ if (!scan) {
21
+ callbackRef.current(trimmedScan);
22
+ return;
23
+ }
24
+ callbackRef.current(scan);
25
+ });
26
+ }, [handleCleanEan, registerListener]);
15
27
  const stopScanner = useCallback(() => {
16
28
  clearEventListeners();
17
29
  }, [clearEventListeners]);
@@ -1 +1 @@
1
- {"version":3,"names":["useCallback","useContext","useEffect","useRef","ScanContext","useScanner","onScan","registerListener","clearEventListeners","callbackRef","current","startScanner","event","data","trim","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {IScanContext, ScanContext} from '../context/scan-context';\n\ntype ScanCallback = (scan: string) => void;\n\nexport const useScanner = (onScan: ScanCallback): Scanner => {\n const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);\n const callbackRef = useRef<ScanCallback>(onScan);\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => callbackRef.current(event.data.trim()));\n }, [registerListener]);\n\n const stopScanner = useCallback((): void => {\n clearEventListeners();\n }, [clearEventListeners]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":"AAAA,SAAQA,WAAW,EAAEC,UAAU,EAAEC,SAAS,EAAEC,MAAM,QAAO,OAAO;AAEhE,SAAsBC,WAAW,QAAO,yBAAyB;AAIjE,OAAO,MAAMC,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAGP,UAAU,CAAeG,WAAW,CAAC;EACrF,MAAMK,WAAW,GAAGN,MAAM,CAAeG,MAAM,CAAC;EAEhDJ,SAAS,CAAC,MAAM;IACZO,WAAW,CAACC,OAAO,GAAGJ,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMK,YAAY,GAAGX,WAAW,CAAC,MAAY;IACzCO,gBAAgB,CAACK,KAAK,IAAIH,WAAW,CAACC,OAAO,CAACE,KAAK,CAACC,IAAI,CAACC,IAAI,EAAE,CAAC,CAAC;EACrE,CAAC,EAAE,CAACP,gBAAgB,CAAC,CAAC;EAEtB,MAAMQ,WAAW,GAAGf,WAAW,CAAC,MAAY;IACxCQ,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHG,YAAY;IACZI;EACJ,CAAC;AACL,CAAC"}
1
+ {"version":3,"names":["useCallback","useContext","useEffect","useRef","useGatherer","ScanContext","useScanner","onScan","registerListener","clearEventListeners","callbackRef","handleCleanEan","current","startScanner","event","trimmedScan","data","trim","scan","stopScanner"],"sources":["use-scanner.tsx"],"sourcesContent":["import {useCallback, useContext, useEffect, useRef} from 'react';\n\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {IScanContext, ScanContext} from '../context/scan-context';\n\ntype ScanCallback = (scan: string) => void;\n\nexport const useScanner = (onScan: ScanCallback): Scanner => {\n const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);\n const callbackRef = useRef<ScanCallback>(onScan);\n const {handleCleanEan} = useGatherer();\n\n useEffect(() => {\n callbackRef.current = onScan;\n }, [onScan]);\n\n const startScanner = useCallback((): void => {\n registerListener(event => {\n const trimmedScan = event.data.trim();\n const scan = handleCleanEan?.(trimmedScan);\n\n if (!scan) {\n callbackRef.current(trimmedScan);\n return;\n }\n\n callbackRef.current(scan);\n });\n }, [handleCleanEan, registerListener]);\n\n const stopScanner = useCallback((): void => {\n clearEventListeners();\n }, [clearEventListeners]);\n\n return {\n startScanner,\n stopScanner,\n };\n};\n"],"mappings":"AAAA,SAAQA,WAAW,EAAEC,UAAU,EAAEC,SAAS,EAAEC,MAAM,QAAO,OAAO;AAEhE,SAAQC,WAAW,QAAO,uBAAuB;AACjD,SAAsBC,WAAW,QAAO,yBAAyB;AAIjE,OAAO,MAAMC,UAAU,GAAIC,MAAoB,IAAc;EACzD,MAAM;IAACC,gBAAgB;IAAEC;EAAmB,CAAC,GAAGR,UAAU,CAAeI,WAAW,CAAC;EACrF,MAAMK,WAAW,GAAGP,MAAM,CAAeI,MAAM,CAAC;EAChD,MAAM;IAACI;EAAc,CAAC,GAAGP,WAAW,EAAE;EAEtCF,SAAS,CAAC,MAAM;IACZQ,WAAW,CAACE,OAAO,GAAGL,MAAM;EAChC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMM,YAAY,GAAGb,WAAW,CAAC,MAAY;IACzCQ,gBAAgB,CAACM,KAAK,IAAI;MACtB,MAAMC,WAAW,GAAGD,KAAK,CAACE,IAAI,CAACC,IAAI,EAAE;MACrC,MAAMC,IAAI,GAAGP,cAAc,aAAdA,cAAc,uBAAdA,cAAc,CAAGI,WAAW,CAAC;MAE1C,IAAI,CAACG,IAAI,EAAE;QACPR,WAAW,CAACE,OAAO,CAACG,WAAW,CAAC;QAChC;MACJ;MAEAL,WAAW,CAACE,OAAO,CAACM,IAAI,CAAC;IAC7B,CAAC,CAAC;EACN,CAAC,EAAE,CAACP,cAAc,EAAEH,gBAAgB,CAAC,CAAC;EAEtC,MAAMW,WAAW,GAAGnB,WAAW,CAAC,MAAY;IACxCS,mBAAmB,EAAE;EACzB,CAAC,EAAE,CAACA,mBAAmB,CAAC,CAAC;EAEzB,OAAO;IACHI,YAAY;IACZM;EACJ,CAAC;AACL,CAAC"}
@@ -1,14 +1,16 @@
1
1
  import React, { useCallback, useEffect, useRef, useState } from 'react';
2
- import { FlatList } from 'react-native';
2
+ import { FlatList, ToastAndroid } from 'react-native';
3
3
  import { useTranslation } from 'react-i18next';
4
+ import { Search } from './partials/search';
4
5
  import { EmptyList } from './partials/empty-list';
5
6
  import { useGatherer } from '../hooks/use-gatherer';
6
- import { GET_PICKLIST_URL } from '../shared/api/api-urls';
7
7
  import { PickGroupItem } from './partials/pick-group-item';
8
+ import { GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL } from '../shared/api/api-urls';
8
9
  export const PickList = props => {
9
10
  const {
10
11
  renderItem,
11
12
  onItemPress,
13
+ isAfterPickList,
12
14
  shouldRefresh
13
15
  } = props;
14
16
  const [loading, setLoading] = useState(true);
@@ -21,37 +23,23 @@ export const PickList = props => {
21
23
  const {
22
24
  t
23
25
  } = useTranslation();
24
-
25
- // const getPickListWithSearch = useCallback(
26
- // (searchFieldParam?: string, searchValueParam?: string): void => {
27
- // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
28
- //
29
- // setLoading(true);
30
- //
31
- // instance
32
- // .post(url, {
33
- // searchField: searchFieldParam,
34
- // searchValue: searchValueParam,
35
- // })
36
- // .then(response => setPickList(response.data.pick_groups))
37
- // .catch(error => {
38
- // console.log('error picklist search', error);
39
- // ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
40
- // })
41
- // .finally(() => setLoading(false));
42
- // },
43
- // [instance, isAfterPickList],
44
- // );
45
-
26
+ const getPickListWithSearch = useCallback((searchFieldParam, searchValueParam) => {
27
+ const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
28
+ setLoading(true);
29
+ instance.post(url, {
30
+ searchField: searchFieldParam,
31
+ searchValue: searchValueParam
32
+ }).then(response => setPickList(response.data.pick_groups)).catch(error => {
33
+ ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
34
+ }).finally(() => setLoading(false));
35
+ }, [instance, isAfterPickList]);
46
36
  const getPickList = useCallback(() => {
47
- console.log(1, 'getpicklist');
48
37
  setLoading(true);
49
38
  instance.post(GET_PICKLIST_URL).then(response => {
50
- console.log(2, 'picklist then');
51
39
  if (!ignoreCurrentRequest.current) {
52
40
  setPickList(response.data.pick_groups);
53
41
  }
54
- }).catch(error => console.log(3, 'picklist error', error)).finally(() => setLoading(false));
42
+ }).catch(() => ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', ToastAndroid.SHORT)).finally(() => setLoading(false));
55
43
  }, [instance]);
56
44
  useEffect(() => {
57
45
  ignoreCurrentRequest.current = false;
@@ -69,24 +57,21 @@ export const PickList = props => {
69
57
  renderProps: renderProps
70
58
  });
71
59
  };
72
-
73
- // const handlePickListFromSearch = useCallback(
74
- // (search: string): void => {
75
- // getPickListWithSearch('', search);
76
- // },
77
- // [getPickListWithSearch],
78
- // );
79
-
60
+ const handlePickListFromSearch = useCallback(search => {
61
+ getPickListWithSearch('', search);
62
+ }, [getPickListWithSearch]);
80
63
  return /*#__PURE__*/React.createElement(FlatList, {
81
64
  refreshing: loading,
82
- onRefresh: getPickList,
65
+ onRefresh: getPickListWithSearch,
83
66
  data: pickList,
84
67
  renderItem: renderItem ?? renderPickGroupItem,
85
68
  keyExtractor: pickGroup => pickGroup.id.toString(),
86
69
  ListEmptyComponent: /*#__PURE__*/React.createElement(EmptyList, {
87
70
  text: t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)
71
+ }),
72
+ ListHeaderComponent: /*#__PURE__*/React.createElement(Search, {
73
+ onSearch: handlePickListFromSearch
88
74
  })
89
- // ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
90
75
  });
91
76
  };
92
77
  //# sourceMappingURL=pick-list.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["React","useCallback","useEffect","useRef","useState","FlatList","useTranslation","EmptyList","useGatherer","GET_PICKLIST_URL","PickGroupItem","PickList","props","renderItem","onItemPress","shouldRefresh","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","isInitialRender","instance","t","getPickList","console","log","post","then","response","current","data","pick_groups","catch","error","finally","renderPickGroupItem","renderProps","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {EmptyList} from './partials/empty-list';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {GET_PICKLIST_URL} from '../shared/api/api-urls';\nimport {PickGroupItem} from './partials/pick-group-item';\n\ninterface props<T> {\n isAfterPickList?: boolean;\n shouldRefresh?: boolean;\n renderItem?: ListRenderItem<T>;\n onItemPress?: (pickGroup: T) => void;\n}\n\nexport const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {renderItem, onItemPress, shouldRefresh} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\n const ignoreCurrentRequest = useRef(true);\n const isInitialRender = useRef(true);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n // const getPickListWithSearch = useCallback(\n // (searchFieldParam?: string, searchValueParam?: string): void => {\n // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n //\n // setLoading(true);\n //\n // instance\n // .post(url, {\n // searchField: searchFieldParam,\n // searchValue: searchValueParam,\n // })\n // .then(response => setPickList(response.data.pick_groups))\n // .catch(error => {\n // console.log('error picklist search', error);\n // ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n // })\n // .finally(() => setLoading(false));\n // },\n // [instance, isAfterPickList],\n // );\n\n const getPickList = useCallback(() => {\n console.log(1, 'getpicklist');\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n console.log(2, 'picklist then');\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(error => console.log(3, 'picklist error', error))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (isInitialRender.current || shouldRefresh) {\n getPickList();\n }\n\n isInitialRender.current = false;\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, shouldRefresh]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n // const handlePickListFromSearch = useCallback(\n // (search: string): void => {\n // getPickListWithSearch('', search);\n // },\n // [getPickListWithSearch],\n // );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={getPickList}\n data={pickList}\n renderItem={renderItem ?? renderPickGroupItem}\n keyExtractor={pickGroup => pickGroup.id.toString()}\n ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}\n // ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}\n />\n );\n};\n"],"mappings":"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"}
1
+ {"version":3,"names":["React","useCallback","useEffect","useRef","useState","FlatList","ToastAndroid","useTranslation","Search","EmptyList","useGatherer","PickGroupItem","GET_AFTER_PICKLIST_URL","GET_PICKLIST_URL","PickList","props","renderItem","onItemPress","isAfterPickList","shouldRefresh","loading","setLoading","pickList","setPickList","ignoreCurrentRequest","isInitialRender","instance","t","getPickListWithSearch","searchFieldParam","searchValueParam","url","post","searchField","searchValue","then","response","data","pick_groups","catch","error","show","LONG","finally","getPickList","current","SHORT","renderPickGroupItem","renderProps","handlePickListFromSearch","search","pickGroup","id","toString"],"sources":["pick-list.tsx"],"sourcesContent":["import React, {useCallback, useEffect, useRef, useState} from 'react';\nimport {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';\n\nimport {useTranslation} from 'react-i18next';\n\nimport {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 shouldRefresh?: boolean;\n renderItem?: ListRenderItem<T>;\n onItemPress?: (pickGroup: T) => void;\n}\n\nexport const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {\n const {renderItem, onItemPress, isAfterPickList, shouldRefresh} = props;\n const [loading, setLoading] = useState<boolean>(true);\n const [pickList, setPickList] = useState<T[]>([]);\n const ignoreCurrentRequest = useRef(true);\n const isInitialRender = useRef(true);\n const {instance} = useGatherer();\n const {t} = useTranslation();\n\n const getPickListWithSearch = useCallback(\n (searchFieldParam?: string, searchValueParam?: string): void => {\n const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;\n\n setLoading(true);\n\n instance\n .post(url, {\n searchField: searchFieldParam,\n searchValue: searchValueParam,\n })\n .then(response => setPickList(response.data.pick_groups))\n .catch(error => {\n ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);\n })\n .finally(() => setLoading(false));\n },\n [instance, isAfterPickList],\n );\n\n const getPickList = useCallback(() => {\n setLoading(true);\n\n instance\n .post(GET_PICKLIST_URL)\n .then(response => {\n if (!ignoreCurrentRequest.current) {\n setPickList(response.data.pick_groups);\n }\n })\n .catch(() => ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', ToastAndroid.SHORT))\n .finally(() => setLoading(false));\n }, [instance]);\n\n useEffect(() => {\n ignoreCurrentRequest.current = false;\n\n if (isInitialRender.current || shouldRefresh) {\n getPickList();\n }\n\n isInitialRender.current = false;\n\n return () => {\n ignoreCurrentRequest.current = true;\n };\n }, [getPickList, instance, shouldRefresh]);\n\n const renderPickGroupItem = (renderProps: ListRenderItemInfo<T>): JSX.Element => {\n return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;\n };\n\n const handlePickListFromSearch = useCallback(\n (search: string): void => {\n getPickListWithSearch('', search);\n },\n [getPickListWithSearch],\n );\n\n return (\n <FlatList\n refreshing={loading}\n onRefresh={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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"}
@@ -47,10 +47,7 @@ const Picker = props => {
47
47
  setPickModalVisible(true);
48
48
  }
49
49
  }
50
- },
51
- // Adding stopScanner here is not possible because of the useScanner hook implementation
52
- // eslint-disable-next-line react-hooks/exhaustive-deps
53
- [pickItem.barcode, pickItem.quantity, nextPickItem]);
50
+ }, [pickItem.barcode, pickItem.quantity, nextPickItem, props]);
54
51
  const {
55
52
  startScanner,
56
53
  stopScanner
@@ -1 +1 @@
1
- {"version":3,"names":["React","useCallback","useEffect","useState","View","styles","useScanner","PickAmount","useGatherer","ProductInfo","ProgressBar","PickModal","DataRow","Row","usePickItemSwitch","DataColumn","Column","container","Picker","props","pickItem","pickModalVisible","setPickModalVisible","nextPickItem","closeModal","startScanner","handleMultiQuantityPick","quantityPicked","pickModal","handleScan","scan","barcode","quantity","onMultiQuantityPick","stopScanner","style","children","Progress"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useEffect, useState} from 'react';\nimport {View, ViewStyle} from 'react-native';\n\nimport {styles} from './styles/picker-styles';\nimport {useScanner} from '../hooks/use-scanner';\nimport {PickAmount} from './partials/pick-amount';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {ProductInfo} from './partials/product-info';\nimport {ProgressBar} from './partials/progress-bar';\nimport {PickModal} from './partials/modal/pick-modal';\nimport {DataRow as Row} from '../shared/layout/data-row';\nimport {usePickItemSwitch} from '../hooks/use-pick-item-switch';\nimport {DataColumn as Column} from '../shared/layout/data-column';\n\ninterface props {\n children: ReactNode;\n style?: ViewStyle;\n pickModal?: JSX.Element;\n onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {pickItem} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const handleMultiQuantityPick = (quantityPicked: number): void => {\n nextPickItem(false, quantityPicked);\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\n\n const handleScan = useCallback(\n (scan: string): void => {\n if (scan !== '' && scan === pickItem.barcode) {\n if (pickItem.quantity === 1) {\n nextPickItem(false, 1);\n } else {\n if (props.pickModal) {\n props.onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n // Adding stopScanner here is not possible because of the useScanner hook implementation\n // eslint-disable-next-line react-hooks/exhaustive-deps\n [pickItem.barcode, pickItem.quantity, nextPickItem],\n );\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n startScanner();\n\n return () => stopScanner();\n }, [startScanner, stopScanner]);\n\n return (\n <View style={[container, props.style]}>\n {pickModal}\n {props.children}\n </View>\n );\n};\n\nPicker.Row = Row;\nPicker.Column = Column;\nPicker.Progress = ProgressBar;\nPicker.PickAmount = PickAmount;\nPicker.ProductInfo = ProductInfo;\n\nexport {Picker};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAcC,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAO,OAAO;AACxE,SAAQC,IAAI,QAAkB,cAAc;AAE5C,SAAQC,MAAM,QAAO,wBAAwB;AAC7C,SAAQC,UAAU,QAAO,sBAAsB;AAC/C,SAAQC,UAAU,QAAO,wBAAwB;AACjD,SAAQC,WAAW,QAAO,uBAAuB;AACjD,SAAQC,WAAW,QAAO,yBAAyB;AACnD,SAAQC,WAAW,QAAO,yBAAyB;AACnD,SAAQC,SAAS,QAAO,6BAA6B;AACrD,SAAQC,OAAO,IAAIC,GAAG,QAAO,2BAA2B;AACxD,SAAQC,iBAAiB,QAAO,+BAA+B;AAC/D,SAAQC,UAAU,IAAIC,MAAM,QAAO,8BAA8B;AAUjE,MAAM;EAACC;AAAS,CAAC,GAAGZ,MAAM;AAE1B,MAAMa,MAAM,GAAIC,KAAY,IAAkB;EAC1C,MAAM;IAACC;EAAQ,CAAC,GAAGZ,WAAW,EAAE;EAChC,MAAM,CAACa,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGnB,QAAQ,CAAU,KAAK,CAAC;EACxE,MAAM;IAACoB;EAAY,CAAC,GAAGT,iBAAiB,EAAE;EAE1C,MAAMU,UAAU,GAAG,MAAY;IAC3BC,YAAY,EAAE;IACdH,mBAAmB,CAAC,KAAK,CAAC;EAC9B,CAAC;EAED,MAAMI,uBAAuB,GAAIC,cAAsB,IAAW;IAC9DJ,YAAY,CAAC,KAAK,EAAEI,cAAc,CAAC;IACnCH,UAAU,EAAE;EAChB,CAAC;EAED,MAAMI,SAAS,GAAGT,KAAK,CAACS,SAAS,iBAC7B,oBAAC,SAAS;IAAC,WAAW,EAAEF,uBAAwB;IAAC,OAAO,EAAEL,gBAAiB;IAAC,UAAU,EAAEG;EAAW,EACtG;EAED,MAAMK,UAAU,GAAG5B,WAAW,CACzB6B,IAAY,IAAW;IACpB,IAAIA,IAAI,KAAK,EAAE,IAAIA,IAAI,KAAKV,QAAQ,CAACW,OAAO,EAAE;MAC1C,IAAIX,QAAQ,CAACY,QAAQ,KAAK,CAAC,EAAE;QACzBT,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;MAC1B,CAAC,MAAM;QACH,IAAIJ,KAAK,CAACS,SAAS,EAAE;UAAA;UACjB,yBAAAT,KAAK,CAACc,mBAAmB,0DAAzB,2BAAAd,KAAK,CAAwB;UAC7B;QACJ;QAEAG,mBAAmB,CAAC,IAAI,CAAC;MAC7B;IACJ;EACJ,CAAC;EACD;EACA;EACA,CAACF,QAAQ,CAACW,OAAO,EAAEX,QAAQ,CAACY,QAAQ,EAAET,YAAY,CAAC,CACtD;EAED,MAAM;IAACE,YAAY;IAAES;EAAW,CAAC,GAAG5B,UAAU,CAACuB,UAAU,CAAC;EAE1D3B,SAAS,CAAC,MAAM;IACZuB,YAAY,EAAE;IAEd,OAAO,MAAMS,WAAW,EAAE;EAC9B,CAAC,EAAE,CAACT,YAAY,EAAES,WAAW,CAAC,CAAC;EAE/B,oBACI,oBAAC,IAAI;IAAC,KAAK,EAAE,CAACjB,SAAS,EAAEE,KAAK,CAACgB,KAAK;EAAE,GACjCP,SAAS,EACTT,KAAK,CAACiB,QAAQ,CACZ;AAEf,CAAC;AAEDlB,MAAM,CAACL,GAAG,GAAGA,GAAG;AAChBK,MAAM,CAACF,MAAM,GAAGA,MAAM;AACtBE,MAAM,CAACmB,QAAQ,GAAG3B,WAAW;AAC7BQ,MAAM,CAACX,UAAU,GAAGA,UAAU;AAC9BW,MAAM,CAACT,WAAW,GAAGA,WAAW;AAEhC,SAAQS,MAAM"}
1
+ {"version":3,"names":["React","useCallback","useEffect","useState","View","styles","useScanner","PickAmount","useGatherer","ProductInfo","ProgressBar","PickModal","DataRow","Row","usePickItemSwitch","DataColumn","Column","container","Picker","props","pickItem","pickModalVisible","setPickModalVisible","nextPickItem","closeModal","startScanner","handleMultiQuantityPick","quantityPicked","pickModal","handleScan","scan","barcode","quantity","onMultiQuantityPick","stopScanner","style","children","Progress"],"sources":["picker.tsx"],"sourcesContent":["import React, {ReactNode, useCallback, useEffect, useState} from 'react';\nimport {View, ViewStyle} from 'react-native';\n\nimport {styles} from './styles/picker-styles';\nimport {useScanner} from '../hooks/use-scanner';\nimport {PickAmount} from './partials/pick-amount';\nimport {useGatherer} from '../hooks/use-gatherer';\nimport {ProductInfo} from './partials/product-info';\nimport {ProgressBar} from './partials/progress-bar';\nimport {PickModal} from './partials/modal/pick-modal';\nimport {DataRow as Row} from '../shared/layout/data-row';\nimport {usePickItemSwitch} from '../hooks/use-pick-item-switch';\nimport {DataColumn as Column} from '../shared/layout/data-column';\n\ninterface props {\n children: ReactNode;\n style?: ViewStyle;\n pickModal?: JSX.Element;\n onMultiQuantityPick?: () => void;\n shouldLesserPick?: boolean;\n}\n\nconst {container} = styles;\n\nconst Picker = (props: props): JSX.Element => {\n const {pickItem} = useGatherer();\n const [pickModalVisible, setPickModalVisible] = useState<boolean>(false);\n const {nextPickItem} = usePickItemSwitch();\n\n const closeModal = (): void => {\n startScanner();\n setPickModalVisible(false);\n };\n\n const handleMultiQuantityPick = (quantityPicked: number): void => {\n nextPickItem(false, quantityPicked);\n closeModal();\n };\n\n const pickModal = props.pickModal ?? (\n <PickModal onPickItems={handleMultiQuantityPick} visible={pickModalVisible} closeModal={closeModal} />\n );\n\n const handleScan = useCallback(\n (scan: string): void => {\n if (scan !== '' && scan === pickItem.barcode) {\n if (pickItem.quantity === 1) {\n nextPickItem(false, 1);\n } else {\n if (props.pickModal) {\n props.onMultiQuantityPick?.();\n return;\n }\n\n setPickModalVisible(true);\n }\n }\n },\n [pickItem.barcode, pickItem.quantity, nextPickItem, props],\n );\n\n const {startScanner, stopScanner} = useScanner(handleScan);\n\n useEffect(() => {\n startScanner();\n\n return () => stopScanner();\n }, [startScanner, stopScanner]);\n\n return (\n <View style={[container, props.style]}>\n {pickModal}\n {props.children}\n </View>\n );\n};\n\nPicker.Row = Row;\nPicker.Column = Column;\nPicker.Progress = ProgressBar;\nPicker.PickAmount = PickAmount;\nPicker.ProductInfo = ProductInfo;\n\nexport {Picker};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAcC,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAO,OAAO;AACxE,SAAQC,IAAI,QAAkB,cAAc;AAE5C,SAAQC,MAAM,QAAO,wBAAwB;AAC7C,SAAQC,UAAU,QAAO,sBAAsB;AAC/C,SAAQC,UAAU,QAAO,wBAAwB;AACjD,SAAQC,WAAW,QAAO,uBAAuB;AACjD,SAAQC,WAAW,QAAO,yBAAyB;AACnD,SAAQC,WAAW,QAAO,yBAAyB;AACnD,SAAQC,SAAS,QAAO,6BAA6B;AACrD,SAAQC,OAAO,IAAIC,GAAG,QAAO,2BAA2B;AACxD,SAAQC,iBAAiB,QAAO,+BAA+B;AAC/D,SAAQC,UAAU,IAAIC,MAAM,QAAO,8BAA8B;AAUjE,MAAM;EAACC;AAAS,CAAC,GAAGZ,MAAM;AAE1B,MAAMa,MAAM,GAAIC,KAAY,IAAkB;EAC1C,MAAM;IAACC;EAAQ,CAAC,GAAGZ,WAAW,EAAE;EAChC,MAAM,CAACa,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGnB,QAAQ,CAAU,KAAK,CAAC;EACxE,MAAM;IAACoB;EAAY,CAAC,GAAGT,iBAAiB,EAAE;EAE1C,MAAMU,UAAU,GAAG,MAAY;IAC3BC,YAAY,EAAE;IACdH,mBAAmB,CAAC,KAAK,CAAC;EAC9B,CAAC;EAED,MAAMI,uBAAuB,GAAIC,cAAsB,IAAW;IAC9DJ,YAAY,CAAC,KAAK,EAAEI,cAAc,CAAC;IACnCH,UAAU,EAAE;EAChB,CAAC;EAED,MAAMI,SAAS,GAAGT,KAAK,CAACS,SAAS,iBAC7B,oBAAC,SAAS;IAAC,WAAW,EAAEF,uBAAwB;IAAC,OAAO,EAAEL,gBAAiB;IAAC,UAAU,EAAEG;EAAW,EACtG;EAED,MAAMK,UAAU,GAAG5B,WAAW,CACzB6B,IAAY,IAAW;IACpB,IAAIA,IAAI,KAAK,EAAE,IAAIA,IAAI,KAAKV,QAAQ,CAACW,OAAO,EAAE;MAC1C,IAAIX,QAAQ,CAACY,QAAQ,KAAK,CAAC,EAAE;QACzBT,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;MAC1B,CAAC,MAAM;QACH,IAAIJ,KAAK,CAACS,SAAS,EAAE;UAAA;UACjB,yBAAAT,KAAK,CAACc,mBAAmB,0DAAzB,2BAAAd,KAAK,CAAwB;UAC7B;QACJ;QAEAG,mBAAmB,CAAC,IAAI,CAAC;MAC7B;IACJ;EACJ,CAAC,EACD,CAACF,QAAQ,CAACW,OAAO,EAAEX,QAAQ,CAACY,QAAQ,EAAET,YAAY,EAAEJ,KAAK,CAAC,CAC7D;EAED,MAAM;IAACM,YAAY;IAAES;EAAW,CAAC,GAAG5B,UAAU,CAACuB,UAAU,CAAC;EAE1D3B,SAAS,CAAC,MAAM;IACZuB,YAAY,EAAE;IAEd,OAAO,MAAMS,WAAW,EAAE;EAC9B,CAAC,EAAE,CAACT,YAAY,EAAES,WAAW,CAAC,CAAC;EAE/B,oBACI,oBAAC,IAAI;IAAC,KAAK,EAAE,CAACjB,SAAS,EAAEE,KAAK,CAACgB,KAAK;EAAE,GACjCP,SAAS,EACTT,KAAK,CAACiB,QAAQ,CACZ;AAEf,CAAC;AAEDlB,MAAM,CAACL,GAAG,GAAGA,GAAG;AAChBK,MAAM,CAACF,MAAM,GAAGA,MAAM;AACtBE,MAAM,CAACmB,QAAQ,GAAG3B,WAAW;AAC7BQ,MAAM,CAACX,UAAU,GAAGA,UAAU;AAC9BW,MAAM,CAACT,WAAW,GAAGA,WAAW;AAEhC,SAAQS,MAAM"}
@@ -4,6 +4,6 @@ export const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;
4
4
  export const START_PICKING_URL = `${BASE_URL}/pick-group/start`;
5
5
  export const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;
6
6
  export const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;
7
- export const GET_AFTER_PICKLIST_URL = `${BASE_URL}/after-picklist`;
7
+ export const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;
8
8
  export const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;
9
9
  //# sourceMappingURL=api-urls.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["BASE_URL","GET_PICKLIST_URL","NEXT_PICK_ITEM_URL","START_PICKING_URL","SET_ITEM_PICKED_URL","PREV_PICK_ITEM_URL","GET_AFTER_PICKLIST_URL","SET_GROUP_PICKED_URL"],"sources":["api-urls.ts"],"sourcesContent":["const BASE_URL = '/api/gatherer';\n\nexport const GET_PICKLIST_URL = `${BASE_URL}/picklist`;\nexport const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;\nexport const START_PICKING_URL = `${BASE_URL}/pick-group/start`;\nexport const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;\nexport const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;\nexport const GET_AFTER_PICKLIST_URL = `${BASE_URL}/after-picklist`;\nexport const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;\n"],"mappings":"AAAA,MAAMA,QAAQ,GAAG,eAAe;AAEhC,OAAO,MAAMC,gBAAgB,GAAI,GAAED,QAAS,WAAU;AACtD,OAAO,MAAME,kBAAkB,GAAI,GAAEF,QAAS,iBAAgB;AAC9D,OAAO,MAAMG,iBAAiB,GAAI,GAAEH,QAAS,mBAAkB;AAC/D,OAAO,MAAMI,mBAAmB,GAAI,GAAEJ,QAAS,mBAAkB;AACjE,OAAO,MAAMK,kBAAkB,GAAI,GAAEL,QAAS,qBAAoB;AAClE,OAAO,MAAMM,sBAAsB,GAAI,GAAEN,QAAS,iBAAgB;AAClE,OAAO,MAAMO,oBAAoB,GAAI,GAAEP,QAAS,oBAAmB"}
1
+ {"version":3,"names":["BASE_URL","GET_PICKLIST_URL","NEXT_PICK_ITEM_URL","START_PICKING_URL","SET_ITEM_PICKED_URL","PREV_PICK_ITEM_URL","GET_AFTER_PICKLIST_URL","SET_GROUP_PICKED_URL"],"sources":["api-urls.ts"],"sourcesContent":["const BASE_URL = '/api/gatherer';\n\nexport const GET_PICKLIST_URL = `${BASE_URL}/picklist`;\nexport const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;\nexport const START_PICKING_URL = `${BASE_URL}/pick-group/start`;\nexport const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;\nexport const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;\nexport const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;\nexport const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;\n"],"mappings":"AAAA,MAAMA,QAAQ,GAAG,eAAe;AAEhC,OAAO,MAAMC,gBAAgB,GAAI,GAAED,QAAS,WAAU;AACtD,OAAO,MAAME,kBAAkB,GAAI,GAAEF,QAAS,iBAAgB;AAC9D,OAAO,MAAMG,iBAAiB,GAAI,GAAEH,QAAS,mBAAkB;AAC/D,OAAO,MAAMI,mBAAmB,GAAI,GAAEJ,QAAS,mBAAkB;AACjE,OAAO,MAAMK,kBAAkB,GAAI,GAAEL,QAAS,qBAAoB;AAClE,OAAO,MAAMM,sBAAsB,GAAI,GAAEN,QAAS,yBAAwB;AAC1E,OAAO,MAAMO,oBAAoB,GAAI,GAAEP,QAAS,oBAAmB"}
@@ -1 +1 @@
1
- {"version":3,"names":[],"sources":["config.d.ts"],"sourcesContent":["type GathererConfig = {\n instance: import('../../../node_modules/axios').AxiosInstance;\n scanImplementation: {\n registerListener: (event: ScanEvent) => void;\n clearEventListeners: () => void;\n registerEventListener?: () => void;\n onBarcodeReadFail?: (event: ScanEvent) => void;\n };\n onLastPick: () => void;\n language?: LanguageConfig;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\n"],"mappings":""}
1
+ {"version":3,"names":[],"sources":["config.d.ts"],"sourcesContent":["type GathererConfig = {\n instance: import('../../../node_modules/axios').AxiosInstance;\n scanImplementation: {\n registerListener: (event: ScanEvent) => void;\n clearEventListeners: () => void;\n registerEventListener?: () => void;\n onBarcodeReadFail?: (event: ScanEvent) => void;\n };\n onLastPick: () => void;\n language?: LanguageConfig;\n handleCleanEan?: (scan: string) => string;\n};\n\ntype LanguageConfig = 'nl' | 'en';\n\ntype ScanEvent = (event: {data: string}) => void;\n"],"mappings":""}
@@ -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
+ handleCleanEan?: (ean: string) => string;
11
12
  }
12
13
  interface props {
13
14
  children: ReactNode;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scrumble-nl/gatherer-frontend",
3
- "version": "1.1.2-beta.6",
3
+ "version": "1.2.0",
4
4
  "main": "lib/commonjs/index",
5
5
  "module": "lib/module/index",
6
6
  "types": "lib/typescript/index.d.ts",
@@ -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
+ handleCleanEan?: (ean: string) => string;
18
19
  }
19
20
 
20
21
  interface props {
@@ -30,10 +31,11 @@ export const GathererContext = createContext<IGathererContext<any>>({
30
31
  savePickGroupData: () => undefined,
31
32
  startPicking: () => new Promise(() => undefined),
32
33
  switchPickItem: () => new Promise(() => undefined),
34
+ handleCleanEan: () => '',
33
35
  });
34
36
 
35
37
  export const GathererContextProvider = <T extends DefaultPickItem>(props: props): JSX.Element => {
36
- const {scanImplementation, instance, onLastPick, language} = props.config;
38
+ const {scanImplementation, instance, onLastPick, language, handleCleanEan} = props.config;
37
39
  const [pickItem, setPickItem] = useState<PickItem<T>>(defaultPickGroupItem);
38
40
  const currentPickGroupId = useRef<number>(0);
39
41
 
@@ -106,11 +108,13 @@ export const GathererContextProvider = <T extends DefaultPickItem>(props: props)
106
108
  onLastPick,
107
109
  startPicking,
108
110
  switchPickItem,
111
+ handleCleanEan,
109
112
  savePickGroupData,
110
113
  scanImplementation,
111
114
  currentPickGroupId: currentPickGroupId.current,
112
115
  }),
113
116
  [
117
+ handleCleanEan,
114
118
  instance,
115
119
  onLastPick,
116
120
  pickItem,
@@ -1,5 +1,6 @@
1
1
  import {useCallback, useContext, useEffect, useRef} from 'react';
2
2
 
3
+ import {useGatherer} from '../hooks/use-gatherer';
3
4
  import {IScanContext, ScanContext} from '../context/scan-context';
4
5
 
5
6
  type ScanCallback = (scan: string) => void;
@@ -7,14 +8,25 @@ type ScanCallback = (scan: string) => void;
7
8
  export const useScanner = (onScan: ScanCallback): Scanner => {
8
9
  const {registerListener, clearEventListeners} = useContext<IScanContext>(ScanContext);
9
10
  const callbackRef = useRef<ScanCallback>(onScan);
11
+ const {handleCleanEan} = useGatherer();
10
12
 
11
13
  useEffect(() => {
12
14
  callbackRef.current = onScan;
13
15
  }, [onScan]);
14
16
 
15
17
  const startScanner = useCallback((): void => {
16
- registerListener(event => callbackRef.current(event.data.trim()));
17
- }, [registerListener]);
18
+ registerListener(event => {
19
+ const trimmedScan = event.data.trim();
20
+ const scan = handleCleanEan?.(trimmedScan);
21
+
22
+ if (!scan) {
23
+ callbackRef.current(trimmedScan);
24
+ return;
25
+ }
26
+
27
+ callbackRef.current(scan);
28
+ });
29
+ }, [handleCleanEan, registerListener]);
18
30
 
19
31
  const stopScanner = useCallback((): void => {
20
32
  clearEventListeners();
@@ -1,12 +1,13 @@
1
1
  import React, {useCallback, useEffect, useRef, useState} from 'react';
2
- import {FlatList, ListRenderItem, ListRenderItemInfo} from 'react-native';
2
+ import {FlatList, ListRenderItem, ListRenderItemInfo, ToastAndroid} from 'react-native';
3
3
 
4
4
  import {useTranslation} from 'react-i18next';
5
5
 
6
+ import {Search} from './partials/search';
6
7
  import {EmptyList} from './partials/empty-list';
7
8
  import {useGatherer} from '../hooks/use-gatherer';
8
- import {GET_PICKLIST_URL} from '../shared/api/api-urls';
9
9
  import {PickGroupItem} from './partials/pick-group-item';
10
+ import {GET_AFTER_PICKLIST_URL, GET_PICKLIST_URL} from '../shared/api/api-urls';
10
11
 
11
12
  interface props<T> {
12
13
  isAfterPickList?: boolean;
@@ -16,7 +17,7 @@ interface props<T> {
16
17
  }
17
18
 
18
19
  export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
19
- const {renderItem, onItemPress, shouldRefresh} = props;
20
+ const {renderItem, onItemPress, isAfterPickList, shouldRefresh} = props;
20
21
  const [loading, setLoading] = useState<boolean>(true);
21
22
  const [pickList, setPickList] = useState<T[]>([]);
22
23
  const ignoreCurrentRequest = useRef(true);
@@ -24,40 +25,37 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
24
25
  const {instance} = useGatherer();
25
26
  const {t} = useTranslation();
26
27
 
27
- // const getPickListWithSearch = useCallback(
28
- // (searchFieldParam?: string, searchValueParam?: string): void => {
29
- // const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
30
- //
31
- // setLoading(true);
32
- //
33
- // instance
34
- // .post(url, {
35
- // searchField: searchFieldParam,
36
- // searchValue: searchValueParam,
37
- // })
38
- // .then(response => setPickList(response.data.pick_groups))
39
- // .catch(error => {
40
- // console.log('error picklist search', error);
41
- // ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
42
- // })
43
- // .finally(() => setLoading(false));
44
- // },
45
- // [instance, isAfterPickList],
46
- // );
28
+ const getPickListWithSearch = useCallback(
29
+ (searchFieldParam?: string, searchValueParam?: string): void => {
30
+ const url = isAfterPickList ? GET_AFTER_PICKLIST_URL : GET_PICKLIST_URL;
31
+
32
+ setLoading(true);
33
+
34
+ instance
35
+ .post(url, {
36
+ searchField: searchFieldParam,
37
+ searchValue: searchValueParam,
38
+ })
39
+ .then(response => setPickList(response.data.pick_groups))
40
+ .catch(error => {
41
+ ToastAndroid.show(error.response.data.error, ToastAndroid.LONG);
42
+ })
43
+ .finally(() => setLoading(false));
44
+ },
45
+ [instance, isAfterPickList],
46
+ );
47
47
 
48
48
  const getPickList = useCallback(() => {
49
- console.log(1, 'getpicklist');
50
49
  setLoading(true);
51
50
 
52
51
  instance
53
52
  .post(GET_PICKLIST_URL)
54
53
  .then(response => {
55
- console.log(2, 'picklist then');
56
54
  if (!ignoreCurrentRequest.current) {
57
55
  setPickList(response.data.pick_groups);
58
56
  }
59
57
  })
60
- .catch(error => console.log(3, 'picklist error', error))
58
+ .catch(() => ToastAndroid.show('Er ging iets fout met het ophalen van de picklijst', ToastAndroid.SHORT))
61
59
  .finally(() => setLoading(false));
62
60
  }, [instance]);
63
61
 
@@ -79,22 +77,22 @@ export const PickList = <T extends PickGroup>(props: props<T>): JSX.Element => {
79
77
  return <PickGroupItem onPress={onItemPress} renderProps={renderProps} />;
80
78
  };
81
79
 
82
- // const handlePickListFromSearch = useCallback(
83
- // (search: string): void => {
84
- // getPickListWithSearch('', search);
85
- // },
86
- // [getPickListWithSearch],
87
- // );
80
+ const handlePickListFromSearch = useCallback(
81
+ (search: string): void => {
82
+ getPickListWithSearch('', search);
83
+ },
84
+ [getPickListWithSearch],
85
+ );
88
86
 
89
87
  return (
90
88
  <FlatList
91
89
  refreshing={loading}
92
- onRefresh={getPickList}
90
+ onRefresh={getPickListWithSearch}
93
91
  data={pickList}
94
92
  renderItem={renderItem ?? renderPickGroupItem}
95
93
  keyExtractor={pickGroup => pickGroup.id.toString()}
96
94
  ListEmptyComponent={<EmptyList text={t(`pick-list.empty-list.${loading ? 'loading' : 'not-found'}`)} />}
97
- // ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
95
+ ListHeaderComponent={<Search onSearch={handlePickListFromSearch} />}
98
96
  />
99
97
  );
100
98
  };
@@ -56,9 +56,7 @@ const Picker = (props: props): JSX.Element => {
56
56
  }
57
57
  }
58
58
  },
59
- // Adding stopScanner here is not possible because of the useScanner hook implementation
60
- // eslint-disable-next-line react-hooks/exhaustive-deps
61
- [pickItem.barcode, pickItem.quantity, nextPickItem],
59
+ [pickItem.barcode, pickItem.quantity, nextPickItem, props],
62
60
  );
63
61
 
64
62
  const {startScanner, stopScanner} = useScanner(handleScan);
@@ -5,5 +5,5 @@ export const NEXT_PICK_ITEM_URL = `${BASE_URL}/pick-item/next`;
5
5
  export const START_PICKING_URL = `${BASE_URL}/pick-group/start`;
6
6
  export const SET_ITEM_PICKED_URL = `${BASE_URL}/pick-item/picked`;
7
7
  export const PREV_PICK_ITEM_URL = `${BASE_URL}/pick-item/previous`;
8
- export const GET_AFTER_PICKLIST_URL = `${BASE_URL}/after-picklist`;
8
+ export const GET_AFTER_PICKLIST_URL = `${BASE_URL}/picked-with-items-left`;
9
9
  export const SET_GROUP_PICKED_URL = `${BASE_URL}/pick-group/picked`;
@@ -8,6 +8,7 @@ type GathererConfig = {
8
8
  };
9
9
  onLastPick: () => void;
10
10
  language?: LanguageConfig;
11
+ handleCleanEan?: (scan: string) => string;
11
12
  };
12
13
 
13
14
  type LanguageConfig = 'nl' | 'en';