argous 1.2.163 → 1.2.166

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/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/dist/components/Stepper/Stepper.js

@@ -53,7 +53,7 @@ var ColorlibConnector = core_1.withStyles(function (theme) { return ({
     alternativeLabel: function (_a) {
         var orientation = _a.orientation;
         return orientation === 'vertical' ? {
-            top: -38,
+            top: -28,
             transform: 'rotate(90deg)',
             left: 'calc(-50% + 40px)',
             right: 'calc(50% + 10px)',

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/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/lib/components/Stepper/Stepper.js

@@ -6,7 +6,7 @@ import { MdCheck, MdChevronLeft, MdChevronRight } from 'react-icons/md';
 
 const ColorlibConnector = withStyles(theme => ({
   alternativeLabel: ({ orientation }) => orientation === 'vertical' ? {
-    top: -38,
+    top: -28,
     transform: 'rotate(90deg)',
     left: 'calc(-50% + 40px)',
     right: 'calc(50% + 10px)',

package/package.json

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