argous 1.2.164 → 1.2.167

package/dist/api/index.d.ts

@@ -60,4 +60,4 @@ export function getFileFromLink({ URL: link }?: {
     URL?: string | undefined;
 }): Promise<string>;
 export function getLink(idDocumento: any, nrRevisao: any, timeout: any): Promise<any>;
-export function scanDocument(idDocumento: any, nrRevisao: any): Promise<any>;
+export function scanDocument(idDocumento: any, nrRevisao: any, url: any): Promise<any>;

package/dist/api/index.js

@@ -657,27 +657,32 @@ var searchUsers = function (data) { return __awaiter(void 0, void 0, void 0, fun
 }); };
 exports.searchUsers = searchUsers;
 var prepareFile = function (file) { return __awaiter(void 0, void 0, void 0, function () {
-    var formData, res, _a, _b;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var formData, _a, status, docsUrl, res, _b, _c;
+    var _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
                 formData = new FormData();
+                return [4 /*yield*/, exports.fetchToArgous('agdocsurl', {})];
+            case 1:
+                _a = _e.sent(), status = _a.status, docsUrl = _a.docsUrl;
+                if (!status)
+                    return [2 /*return*/];
                 formData.append('blob', file);
-                return [4 /*yield*/, fetch(exports.api() + "docs/upload.agdoc", {
+                return [4 /*yield*/, fetch(docsUrl + "/argous/docs/upload.agdoc", {
                         method: 'POST',
                         headers: exports.headers(),
                         body: formData
                     })];
-            case 1:
-                res = _d.sent();
-                _a = [{}];
-                return [4 /*yield*/, res.json()];
             case 2:
-                _b = [__assign.apply(void 0, _a.concat([_d.sent()]))];
-                _c = { lastModified: file.lastModified, lastModifiedDate: file.lastModifiedDate, name: file.name, size: file.size, type: file.type, webkitRelativePath: file.webkitRelativePath };
+                res = _e.sent();
+                _b = [{}];
+                return [4 /*yield*/, res.json()];
+            case 3:
+                _c = [__assign.apply(void 0, _b.concat([_e.sent()]))];
+                _d = { lastModified: file.lastModified, lastModifiedDate: file.lastModifiedDate, name: file.name, size: file.size, type: file.type, webkitRelativePath: file.webkitRelativePath };
                 return [4 /*yield*/, file.arrayBuffer()];
-            case 3: return [2 /*return*/, __assign.apply(void 0, _b.concat([(_c.arrayBuffer = _d.sent(), _c)]))];
+            case 4: return [2 /*return*/, __assign.apply(void 0, _c.concat([(_d.arrayBuffer = _e.sent(), _d)]))];
         }
     });
 }); };
@@ -743,11 +748,11 @@ var getLink = function (idDocumento, nrRevisao, timeout) { return __awaiter(void
     });
 }); };
 exports.getLink = getLink;
-var scanDocument = function (idDocumento, nrRevisao) { return __awaiter(void 0, void 0, void 0, function () {
+var scanDocument = function (idDocumento, nrRevisao, url) { return __awaiter(void 0, void 0, void 0, function () {
     var res;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, fetch(exports.api() + "docs/scan.agdoc", {
+            case 0: return [4 /*yield*/, fetch(url + "argous/docs/scan.agdoc", {
                     method: 'post',
                     headers: exports.headers(),
                     body: JSON.stringify({ idDocumento: idDocumento, nrRevisao: nrRevisao })

package/dist/components/ArgousComplexTable/ArgousComplexTable.d.ts

@@ -121,7 +121,7 @@ export interface ArgousComplexTableProps extends ArgousComplexTableBodyProps, Ar
    */
   tableProps?: TableProps,
   /**
-   * Props repassados ao toolbar
+   * Props repassados ao componente toolbar
    */
   toolbarProps?: any
 }

package/dist/components/ArgousComplexTable/ArgousComplexTable.js

@@ -165,13 +165,13 @@ var initialState = function (defaultRowsPerPage) { return ({
     loading: false
 }); };
 var ArgousComplexTable = react_1.forwardRef(function (_a, ref) {
-    var _b = _a.ToolbarComponent, ToolbarComponent = _b === void 0 ? __1.ArgousComplexTableToolbar : _b, _c = _a.HeadComponent, HeadComponent = _c === void 0 ? __1.ArgousComplexTableHead : _c, _d = _a.BodyComponent, BodyComponent = _d === void 0 ? __1.ArgousComplexTableBody : _d, _e = _a.PaginationComponent, PaginationComponent = _e === void 0 ? __1.ArgousComplexPagination : _e, _f = _a.paginationControl, paginationControl = _f === void 0 ? {} : _f, _g = _a.FooterComponent, FooterComponent = _g === void 0 ? undefined : _g, footerProps = _a.footerProps, dados = _a.dados, _h = _a.head, head = _h === void 0 ? [] : _h, _j = _a.line, line = _j === void 0 ? function (i) { return i; } : _j, actions = _a.actions, title = _a.title, _k = _a.defaultRowsPerPage, defaultRowsPerPage = _k === void 0 ? 10 : _k, _l = _a.rowsPerPageOptions, rowsPerPageOptions = _l === void 0 ? [10, 25, 50] : _l, checkEnabled = _a.enableCheck, disableCheckIf = _a.disableCheckIf, showCount = _a.showCount, lineStyle = _a.lineStyle, _m = _a.lineClass, lineClass = _m === void 0 ? function () { return undefined; } : _m, onClick = _a.onClick, onDoubleClick = _a.onDoubleClick, _o = _a.children, children = _o === void 0 ? undefined : _o, style = _a.style, className = _a.className, columnStyles = _a.columnStyles, headerColumnStyles = _a.headerColumnStyles, columnOptions = _a.columnOptions, disableFilter = _a.disableFilter, _p = _a.filterLabel, filterLabel = _p === void 0 ? 'Filtro' : _p, _q = _a.indexToSelect, indexToSelect = _q === void 0 ? 0 : _q, _r = _a.disableSorting, disableSorting = _r === void 0 ? [] : _r, _s = _a.size, size = _s === void 0 ? 'small' : _s, onOpen = _a.onOpen, lineTitle = _a.lineTitle, onClose = _a.onClose, method = _a.method, methodPrms = _a.methodPrms, _t = _a.methodResultList, methodResultList = _t === void 0 ? 'lista' : _t, onMethodResponse = _a.onMethodResponse, field = _a.field, fixedToolbar = _a.fixedToolbar, onSelect = _a.onSelect, customKey = _a.customKey, _u = _a.columnProps, columnProps = _u === void 0 ? function () { return ''; } : _u, _v = _a.rowProps, rowProps = _v === void 0 ? function () { return ''; } : _v, _w = _a.savedState, savedState = _w === void 0 ? {} : _w, containerProps = _a.containerProps, _x = _a.onClickAway, onClickAway = _x === void 0 ? function () { return undefined; } : _x, enableCheckIfSelected = _a.enableCheckIfSelected, enableDrag = _a.enableDrag, onDrop = _a.onDrop, tableProps = _a.tableProps, toolbarProps = _a.toolbarProps;
+    var _b = _a.ToolbarComponent, ToolbarComponent = _b === void 0 ? __1.ArgousComplexTableToolbar : _b, _c = _a.HeadComponent, HeadComponent = _c === void 0 ? __1.ArgousComplexTableHead : _c, _d = _a.BodyComponent, BodyComponent = _d === void 0 ? __1.ArgousComplexTableBody : _d, _e = _a.PaginationComponent, PaginationComponent = _e === void 0 ? __1.ArgousComplexPagination : _e, _f = _a.FooterComponent, FooterComponent = _f === void 0 ? undefined : _f, footerProps = _a.footerProps, dados = _a.dados, _g = _a.head, head = _g === void 0 ? [] : _g, _h = _a.line, line = _h === void 0 ? function (i) { return i; } : _h, actions = _a.actions, title = _a.title, _j = _a.defaultRowsPerPage, defaultRowsPerPage = _j === void 0 ? 10 : _j, _k = _a.rowsPerPageOptions, rowsPerPageOptions = _k === void 0 ? [10, 25, 50] : _k, checkEnabled = _a.enableCheck, disableCheckIf = _a.disableCheckIf, showCount = _a.showCount, lineStyle = _a.lineStyle, _l = _a.lineClass, lineClass = _l === void 0 ? function () { return undefined; } : _l, onClick = _a.onClick, onDoubleClick = _a.onDoubleClick, _m = _a.children, children = _m === void 0 ? undefined : _m, style = _a.style, className = _a.className, columnStyles = _a.columnStyles, headerColumnStyles = _a.headerColumnStyles, columnOptions = _a.columnOptions, disableFilter = _a.disableFilter, _o = _a.filterLabel, filterLabel = _o === void 0 ? 'Filtro' : _o, _p = _a.indexToSelect, indexToSelect = _p === void 0 ? 0 : _p, _q = _a.disableSorting, disableSorting = _q === void 0 ? [] : _q, _r = _a.size, size = _r === void 0 ? 'small' : _r, onOpen = _a.onOpen, lineTitle = _a.lineTitle, onClose = _a.onClose, method = _a.method, methodPrms = _a.methodPrms, _s = _a.methodResultList, methodResultList = _s === void 0 ? 'lista' : _s, onMethodResponse = _a.onMethodResponse, field = _a.field, fixedToolbar = _a.fixedToolbar, onSelect = _a.onSelect, customKey = _a.customKey, _t = _a.columnProps, columnProps = _t === void 0 ? function () { return ''; } : _t, _u = _a.rowProps, rowProps = _u === void 0 ? function () { return ''; } : _u, _v = _a.savedState, savedState = _v === void 0 ? {} : _v, containerProps = _a.containerProps, _w = _a.onClickAway, onClickAway = _w === void 0 ? function () { return undefined; } : _w, enableCheckIfSelected = _a.enableCheckIfSelected, enableDrag = _a.enableDrag, onDrop = _a.onDrop, tableProps = _a.tableProps, toolbarProps = _a.toolbarProps;
     var classes = useStyles();
-    var _y = react_1.useReducer(reducer, initialState(defaultRowsPerPage)), state = _y[0], dispatch = _y[1];
+    var _x = react_1.useReducer(reducer, initialState(defaultRowsPerPage)), state = _x[0], dispatch = _x[1];
     var memoState = react_1.useMemo(function () { return (__assign(__assign({}, state), { dispatch: dispatch })); }, [state, dispatch]);
     var selected = memoState.selected, page = memoState.page, rowsPerPage = memoState.rowsPerPage, order = memoState.order, orderBy = memoState.orderBy, filter = memoState.filter, open = memoState.open;
-    var _z = react_1.useState(dados /*.map(linha => isArray(linha) ? linha : Object.values(linha))*/ || []), lista = _z[0], setLista = _z[1];
-    var _0 = react_1.useState(__assign(__assign({}, paginationControl), { qtRegs: defaultRowsPerPage, pgAtl: 1 })), ctrlPgn = _0[0], setCtrlPgn = _0[1];
+    var _y = react_1.useState(dados /*.map(linha => isArray(linha) ? linha : Object.values(linha))*/ || []), lista = _y[0], setLista = _y[1];
+    var _z = react_1.useState({ qtRegs: defaultRowsPerPage, pgAtl: 1 }), ctrlPgn = _z[0], setCtrlPgn = _z[1];
     var qtRegs = ctrlPgn.qtRegs, pgAtl = ctrlPgn.pgAtl, ordCols = ctrlPgn.ordCols;
     var enableCheck = checkEnabled || (enableCheckIfSelected && !!selected.length);
     react_1.useEffect(function () {

package/dist/components/FilePreparer/FilePreparer.js

@@ -189,26 +189,38 @@ var FilePreparer = function (_a, ref) {
     var inputRef = react_1.useRef();
     var _f = react_1.useState(false), loading = _f[0], setLoading = _f[1];
     var _g = react_1.useState(initialFiles), files = _g[0], setFiles = _g[1];
+    var _h = react_1.useState(), motivo = _h[0], setMotivo = _h[1];
     react_1.useEffect(function () {
         if (valuePlaceHolder && !multiple)
             setFiles(function (f) { return [__assign(__assign({}, f[0]), { name: valuePlaceHolder })]; });
     }, [valuePlaceHolder, multiple]);
+    var handleChange = function (_, v, reason) {
+        setMotivo(reason);
+        inputRef.current.value = '';
+        setFiles(v || []);
+        onChange && onChange(multiple ? v || [] : (v || [])[0], motivo);
+    };
     var preparaArquivo = react_1.useCallback(function (file) { return __awaiter(void 0, void 0, void 0, function () {
-        var reqs, i, res, resps;
+        var resultUrl, reqs, i, res, resps;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (!file)
                         return [2 /*return*/];
                     setLoading(true);
+                    return [4 /*yield*/, api_1.fetchToArgous('agdocsurl', {})];
+                case 1:
+                    resultUrl = _a.sent();
+                    if (!resultUrl.status)
+                        return [2 /*return*/];
                     reqs = [];
                     if (file.map)
                         reqs = file;
                     else
                         for (i = 0; i < file.length; i++)
                             reqs.push(file[i]);
-                    return [4 /*yield*/, Promise.all(reqs.map(function (item) { return api_1.prepareFile(item.fileObject || item); }))];
-                case 1:
+                    return [4 /*yield*/, Promise.all(reqs.map(function (item) { return api_1.prepareFile(item.fileObject || item, resultUrl.docsUrl); }))];
+                case 2:
                     res = _a.sent();
                     resps = [];
                     res.forEach(function (item, i) {
@@ -224,18 +236,11 @@ var FilePreparer = function (_a, ref) {
             }
         });
     }); }, [concat, files, motivo, multiple, onChange]);
-    var _h = react_1.useState(), motivo = _h[0], setMotivo = _h[1];
     // useUpdateEffect(() => {
     //   onChange && onChange(multiple ? files : files[0], motivo);
     //   setMotivo(undefined);
     // }, [files]);
     react_1.useImperativeHandle(ref, function () { return ({ preparaArquivo: preparaArquivo, loading: loading, setLoading: setLoading }); }, [preparaArquivo, loading]);
-    var handleChange = function (_, v, reason) {
-        setMotivo(reason);
-        inputRef.current.value = '';
-        setFiles(v || []);
-        onChange && onChange(multiple ? v || [] : (v || [])[0], motivo);
-    };
     var _j = lab_1.useAutocomplete({
         value: files,
         inputValue: files.length ? '' : placeholder || 'Selecione um arquivo',

package/lib/api/index.js

@@ -335,10 +335,12 @@ export const searchUsers = async (data) => {
   return await res.json();
 };
 
-export const prepareFile = async file => {
+export const prepareFile = async (file) => {
   const formData = new FormData();
+  const { status, docsUrl } = await fetchToArgous('agdocsurl', { });
+  if (!status) return;
   formData.append('blob', file);
-  const res = await fetch(`${api()}docs/upload.agdoc`, {
+  const res = await fetch(`${docsUrl}/argous/docs/upload.agdoc`, {
     method: 'POST',
     headers: headers(),
     body: formData
@@ -392,8 +394,8 @@ export const getLink = async (idDocumento, nrRevisao, timeout) => {
   })).json();
 };
 
-export const scanDocument = async (idDocumento, nrRevisao) => {
-  const res = await fetch(`${api()}docs/scan.agdoc`, {
+export const scanDocument = async (idDocumento, nrRevisao, url) => {
+  const res = await fetch(`${url}argous/docs/scan.agdoc`, {
     method: 'post',
     headers: headers(),
     body: JSON.stringify({ idDocumento, nrRevisao }) 

package/lib/components/ArgousComplexTable/ArgousComplexTable.d.ts

@@ -121,7 +121,7 @@ export interface ArgousComplexTableProps extends ArgousComplexTableBodyProps, Ar
    */
   tableProps?: TableProps,
   /**
-   * Props repassados ao toolbar
+   * Props repassados ao componente toolbar
    */
   toolbarProps?: any
 }

package/lib/components/ArgousComplexTable/ArgousComplexTable.js

@@ -125,7 +125,6 @@ const ArgousComplexTable = forwardRef(({
   HeadComponent = ArgousComplexTableHead,
   BodyComponent = ArgousComplexTableBody,
   PaginationComponent = ArgousComplexPagination,
-  paginationControl = {},
   FooterComponent = undefined,
   footerProps,
   dados, 
@@ -181,7 +180,7 @@ const ArgousComplexTable = forwardRef(({
   const { selected, page, rowsPerPage, order, orderBy, filter, open } = memoState;
 
   const [lista, setLista] = useState(dados/*.map(linha => isArray(linha) ? linha : Object.values(linha))*/ || []);
-  const [ctrlPgn, setCtrlPgn] = useState({ ...paginationControl, qtRegs: defaultRowsPerPage, pgAtl: 1 });
+  const [ctrlPgn, setCtrlPgn] = useState({ qtRegs: defaultRowsPerPage, pgAtl: 1 });
   const { qtRegs, pgAtl, ordCols } = ctrlPgn;
 
   const enableCheck = checkEnabled || (enableCheckIfSelected && !!selected.length);

package/lib/components/FilePreparer/FilePreparer.js

@@ -1,4 +1,4 @@
-import { prepareFile } from '../../api';
+import { fetchToArgous, prepareFile } from '../../api';
 import { setError } from '../../utils/api';
 import { Chip, CircularProgress, FilledInput, IconButton, makeStyles, TextField } from '@material-ui/core';
 import { useAutocomplete } from '@material-ui/lab';
@@ -116,18 +116,28 @@ const FilePreparer = ({
 
   const [loading, setLoading] = useState(false);
   const [files, setFiles] = useState(initialFiles);
+  const [motivo, setMotivo] = useState();
 
   useEffect(() => {
     if (valuePlaceHolder && !multiple) setFiles(f => [{ ...f[0], name: valuePlaceHolder }]);
   }, [valuePlaceHolder, multiple]);
 
+  const handleChange = (_, v, reason) => {
+    setMotivo(reason);
+    inputRef.current.value = '';
+    setFiles(v || []);
+    onChange && onChange(multiple ? v || [] : (v || [])[0], motivo);
+  };
+
   const preparaArquivo = useCallback(async file => {
     if (!file) return;
     setLoading(true);
+    const resultUrl = await fetchToArgous('agdocsurl', { });
+    if (!resultUrl.status) return;
     let reqs = [];
     if (file.map) reqs = file;
-    else for (let i = 0; i < file.length; i++) reqs.push(file[i]);        
-    const res = await Promise.all(reqs.map(item => prepareFile(item.fileObject || item)));
+    else for (let i = 0; i < file.length; i++) reqs.push(file[i]);
+    const res = await Promise.all(reqs.map(item => prepareFile(item.fileObject || item, resultUrl.docsUrl)));
     let resps = [];
     res.forEach((item, i) => {
       if (item.idRecebimento) resps.push({ ...item, path: file[i].fullPath });
@@ -135,26 +145,15 @@ const FilePreparer = ({
     });
     setFiles(f => concat && multiple ? ([...f, ...resps]) : resps);
     setLoading(false);
-    
     onChange && onChange(multiple ? concat ? [...files, ...resps] : resps : resps[0], motivo);
   }, [concat, files, motivo, multiple, onChange]);
 
-  const [motivo, setMotivo] = useState();
-
   // useUpdateEffect(() => {
   //   onChange && onChange(multiple ? files : files[0], motivo);
   //   setMotivo(undefined);
   // }, [files]);
 
   useImperativeHandle(ref, () => ({ preparaArquivo, loading, setLoading }), [preparaArquivo, loading]);
-  
-  const handleChange = (_, v, reason) => {
-    setMotivo(reason);
-    inputRef.current.value = '';
-    setFiles(v || []);
-
-    onChange && onChange(multiple ? v || [] : (v || [])[0], motivo);
-  };
 
   const { 
     getInputProps, 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "argous",
-  "version": "1.2.164",
+  "version": "1.2.167",
   "description": "Argous.",
   "main": "lib/index.js",
   "author": "Carlos Schneider",