argous 1.2.226 → 1.2.228

package/dist/actions/index.d.ts

@@ -64,3 +64,7 @@ export declare const setVldPsw: (vldPsw: boolean) => {
     type: string;
     vldPsw: boolean;
 };
+export declare const setProgramAnnotation: (programAnnotation: object) => {
+    type: string;
+    programAnnotation: object;
+};

package/dist/actions/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setVldPsw = exports.setMensagensNaoLidas = exports.setAddProgramWidget = exports.setRightSidebar = exports.setSidebar = exports.setNotificacao = exports.setBlockUser = exports.setFavorites = exports.setFields = exports.clearAllFields = exports.setCurrentField = exports.setCurrentProgram = exports.setInitialPage = exports.setProcesso = exports.setLoading = exports.setUsuarioLogado = void 0;
+exports.setProgramAnnotation = exports.setVldPsw = exports.setMensagensNaoLidas = exports.setAddProgramWidget = exports.setRightSidebar = exports.setSidebar = exports.setNotificacao = exports.setBlockUser = exports.setFavorites = exports.setFields = exports.clearAllFields = exports.setCurrentField = exports.setCurrentProgram = exports.setInitialPage = exports.setProcesso = exports.setLoading = exports.setUsuarioLogado = void 0;
 var setUsuarioLogado = function (usuarioLogado) {
     return { type: 'setUsuarioLogado', usuarioLogado: usuarioLogado };
 };
@@ -65,3 +65,7 @@ var setVldPsw = function (vldPsw) {
     return { type: 'vldPsw', vldPsw: vldPsw };
 };
 exports.setVldPsw = setVldPsw;
+var setProgramAnnotation = function (programAnnotation) {
+    return { type: 'setProgramAnnotation', programAnnotation: programAnnotation };
+};
+exports.setProgramAnnotation = setProgramAnnotation;

package/dist/api/index.d.ts

@@ -71,3 +71,4 @@ export function sendWidgets(widgets: any): Promise<any>;
 export function getPublicDoc(data: any): Promise<any>;
 export function getProgramAnnotations(data: any, token: any): Promise<any>;
 export function saveProgramAnnotation(data: any, token: any): Promise<any>;
+export function sendProgramAnnotation(data: any, token: any): Promise<any>;

package/dist/api/index.js

@@ -48,7 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProgramAnnotations = exports.getPublicDoc = exports.sendWidgets = exports.getWidgetInfo = exports.getWidgets = exports.scanDocument = exports.getLink = exports.getFileFromLink = exports.createDocument = exports.prepareFile = exports.getDocsUrl = exports.searchUsers = exports.getFileInfo = exports.cancelFileUpload = exports.endFileUpload = exports.sendFilePart = exports.inicFileUpload = exports.enviaCompartilhamentoDePrograma = exports.fixTimelinePost = exports.removePostTimeLine = exports.publicaTimeline = exports.toggleLikePost = exports.recebeInfoEstatisticas = exports.recebeInfoLoginsAtivos = exports.recebeThreadsUsuario = exports.recebeInfoThread = exports.recebeThread = exports.readNotificacao = exports.readNotificacoes = exports.getNotificacoes = exports.callProgram = exports.toggleFavorite = exports.getFavorites = exports.method = exports.action = exports.agSet = exports.agGet = exports.getProgram = exports.getPostPublicacao = exports.removeCommentPost = exports.addCommentPost = exports.getPostsTimeline = exports.getMenu = exports.validaToken = exports.logout = exports.login = exports.fetchToArgous = exports.headers = exports.api = exports.server = void 0;
-exports.saveProgramAnnotation = void 0;
+exports.sendProgramAnnotation = exports.saveProgramAnnotation = void 0;
 var utils_1 = require("../utils");
 var config_1 = require("../utils/config");
 var server = function () { return "://" + config_1.getConfig()[/^[a-z]+.+\.com\.br$/.test(window.location.host) ? 'ip' : 'ip'] + "/" + (config_1.getConfig().path ? config_1.getConfig().path : 'jUniIII') + "/"; };
@@ -930,3 +930,20 @@ var saveProgramAnnotation = function (data, token) { return __awaiter(void 0, vo
     });
 }); };
 exports.saveProgramAnnotation = saveProgramAnnotation;
+var sendProgramAnnotation = function (data, token) { 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() + "agsendpgannotation.rslvr", {
+                    method: 'post',
+                    headers: exports.headers(token),
+                    body: JSON.stringify(data)
+                })];
+            case 1:
+                res = _a.sent();
+                return [4 /*yield*/, res.json()];
+            case 2: return [2 /*return*/, _a.sent()];
+        }
+    });
+}); };
+exports.sendProgramAnnotation = sendProgramAnnotation;

package/dist/components/Programa/Programa.js

@@ -81,11 +81,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var BarraFerramentas_1 = __importDefault(require("./../BarraFerramentas"));
-var Annotations_1 = __importDefault(require("./Annotations"));
 var PageCodeEasterEgg_1 = __importDefault(require("./PageCodeEasterEgg"));
 var argous = __importStar(require("../../actions"));
 var api_1 = require("../../api");
-var utils_1 = require("../../utils");
 var core_1 = require("@material-ui/core");
 var prop_types_1 = __importDefault(require("prop-types"));
 var react_1 = __importStar(require("react"));
@@ -98,13 +96,11 @@ function Programa(_a) {
     var _this = this;
     var code = _a.code, children = _a.children, _b = _a.loading, loading = _b === void 0 ? false : _b, _c = _a.threads, threads = _c === void 0 ? [] : _c, hint = _a.hint, title = _a.title, panelTitle = _a.panelTitle, hideTitle = _a.hideTitle, setCurrentProgram = _a.setCurrentProgram, programDidMount = _a.programDidMount, favorites = _a.favorites, setFavorites = _a.setFavorites, bfHabNavegador = _a.bfHabNavegador, _d = _a.bfAbas, bfAbas = _d === void 0 ? [] : _d, _e = _a.bfFerramentas, bfFerramentas = _e === void 0 ? [] : _e, bfExecutaFuncao = _a.bfExecutaFuncao, bfNmFuncaoVoltar = _a.bfNmFuncaoVoltar, bfNmCompartilhar = _a.bfNmCompartilhar, bfHabCrud = _a.bfHabCrud, bfNmSalva = _a.bfNmSalva, bfNmExclui = _a.bfNmExclui, _f = _a.bfHabFavorito, bfHabFavorito = _f === void 0 ? true : _f, bfTitulo = _a.bfTitulo, 
     // permissoes = { salvar: true, editar: true, excluir: true },
-    linkCompartilhamento = _a.linkCompartilhamento, className = _a.className, rightSidebar = _a.rightSidebar, setRightSidebar = _a.setRightSidebar, setAddProgramWidget = _a.setAddProgramWidget, _g = _a.annotationParameters, annotationParameters = _g === void 0 ? {} : _g, _h = _a.openAnnotationParameters, openAnnotationParameters = _h === void 0 ? function () { return ''; } : _h, _ = _a.fields, props = __rest(_a, ["code", "children", "loading", "threads", "hint", "title", "panelTitle", "hideTitle", "setCurrentProgram", "programDidMount", "favorites", "setFavorites", "bfHabNavegador", "bfAbas", "bfFerramentas", "bfExecutaFuncao", "bfNmFuncaoVoltar", "bfNmCompartilhar", "bfHabCrud", "bfNmSalva", "bfNmExclui", "bfHabFavorito", "bfTitulo", "linkCompartilhamento", "className", "rightSidebar", "setRightSidebar", "setAddProgramWidget", "annotationParameters", "openAnnotationParameters", "fields"]);
+    linkCompartilhamento = _a.linkCompartilhamento, className = _a.className, rightSidebar = _a.rightSidebar, setRightSidebar = _a.setRightSidebar, setAddProgramWidget = _a.setAddProgramWidget, setProgramAnnotation = _a.setProgramAnnotation, annotationParameters = _a.annotationParameters, openAnnotationParameters = _a.openAnnotationParameters, _ = _a.fields, props = __rest(_a, ["code", "children", "loading", "threads", "hint", "title", "panelTitle", "hideTitle", "setCurrentProgram", "programDidMount", "favorites", "setFavorites", "bfHabNavegador", "bfAbas", "bfFerramentas", "bfExecutaFuncao", "bfNmFuncaoVoltar", "bfNmCompartilhar", "bfHabCrud", "bfNmSalva", "bfNmExclui", "bfHabFavorito", "bfTitulo", "linkCompartilhamento", "className", "rightSidebar", "setRightSidebar", "setAddProgramWidget", "setProgramAnnotation", "annotationParameters", "openAnnotationParameters", "fields"]);
     var theme = core_1.useTheme();
-    var createModal = utils_1.useModal().createModal;
-    var annotationsModal = createModal(Annotations_1.default);
-    var _j = react_1.useState({}), programa = _j[0], setPrograma = _j[1];
-    var _k = react_1.useState(false), favoriteAnimationInsert = _k[0], setFavoriteAnimationInsert = _k[1];
-    var _l = react_1.useState(false), favoriteAnimationRemove = _l[0], setFavoriteAnimationRemove = _l[1];
+    var _g = react_1.useState({}), programa = _g[0], setPrograma = _g[1];
+    var _h = react_1.useState(false), favoriteAnimationInsert = _h[0], setFavoriteAnimationInsert = _h[1];
+    var _j = react_1.useState(false), favoriteAnimationRemove = _j[0], setFavoriteAnimationRemove = _j[1];
     var toolbarLoading = react_1.useState(initialStateToolbarLoading)[0] /*, setToolbarLoading*/;
     react_1.useEffect(function () {
         (function () { return __awaiter(_this, void 0, void 0, function () {
@@ -129,12 +125,7 @@ function Programa(_a) {
         return function () { return setCurrentProgram(undefined); };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    var openAnnotations = function (event) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, annotationsModal(__assign(__assign({}, programa), { code: code, annotationParameters: annotationParameters, openAnnotationParameters: openAnnotationParameters }))];
-            case 1: return [2 /*return*/, _a.sent()];
-        }
-    }); }); };
+    var openAnnotations = function (event) { return setProgramAnnotation(__assign(__assign({}, programa), { open: true, code: code, annotationParameters: annotationParameters, openAnnotationParameters: openAnnotationParameters })); };
     var addFavorite = function () {
         var path = window.location.pathname;
         api_1.toggleFavorite({ link: path }).then(function (res) {
@@ -186,21 +177,19 @@ function Programa(_a) {
                 react_1.default.createElement(core_1.CircularProgress, { disableShrink: true }))) : children),
         react_1.default.createElement(PageCodeEasterEgg_1.default, __assign({}, { code: code }))));
 }
-var mapStateToProps = function (state) {
-    return {
-        fields: state.argous.fields,
-        favorites: state.argous.favorites,
-        rightSidebar: state.argous.rightSidebar
-    };
-};
-var mapDispatchToProps = function (dispatch) {
-    return {
-        setAddProgramWidget: function (data) { return dispatch(argous.setAddProgramWidget(data)); },
-        setCurrentProgram: function (data) { return dispatch(argous.setCurrentProgram(data)); },
-        setRightSidebar: function (data) { return dispatch(argous.setRightSidebar(data)); },
-        setFavorites: function (data) { return dispatch(argous.setFavorites(data)); }
-    };
-};
+var mapStateToProps = function (state) { return ({
+    fields: state.argous.fields,
+    favorites: state.argous.favorites,
+    rightSidebar: state.argous.rightSidebar,
+    programAnnotation: state.argous.programAnnotation
+}); };
+var mapDispatchToProps = function (dispatch) { return ({
+    setAddProgramWidget: function (data) { return dispatch(argous.setAddProgramWidget(data)); },
+    setCurrentProgram: function (data) { return dispatch(argous.setCurrentProgram(data)); },
+    setRightSidebar: function (data) { return dispatch(argous.setRightSidebar(data)); },
+    setFavorites: function (data) { return dispatch(argous.setFavorites(data)); },
+    setProgramAnnotation: function (data) { return dispatch(argous.setProgramAnnotation(data)); }
+}); };
 Programa.propTypes = {
     code: prop_types_1.default.string.isRequired,
     loading: prop_types_1.default.bool,

package/dist/reducers/argous.d.ts

@@ -11,6 +11,7 @@ declare const argous: (state: {
     sidebar: boolean;
     rightSidebar: boolean;
     addProgramWidget: undefined;
+    programAnnotation: {};
 } | undefined, action: ActionType) => {
     processos: any;
     usuarioLogado: {};
@@ -23,6 +24,7 @@ declare const argous: (state: {
     sidebar: boolean;
     rightSidebar: boolean;
     addProgramWidget: undefined;
+    programAnnotation: {};
 } | {
     notificacao: any;
     usuarioLogado: {};
@@ -36,6 +38,7 @@ declare const argous: (state: {
     sidebar: boolean;
     rightSidebar: boolean;
     addProgramWidget: undefined;
+    programAnnotation: {};
 } | {
     currentProgram: string;
     usuarioLogado: {};
@@ -49,6 +52,7 @@ declare const argous: (state: {
     sidebar: boolean;
     rightSidebar: boolean;
     addProgramWidget: undefined;
+    programAnnotation: {};
 } | {
     fields: any;
     usuarioLogado: {};
@@ -61,6 +65,7 @@ declare const argous: (state: {
     sidebar: boolean;
     rightSidebar: boolean;
     addProgramWidget: undefined;
+    programAnnotation: {};
 } | {
     favorites: any[];
     usuarioLogado: {};
@@ -73,6 +78,7 @@ declare const argous: (state: {
     sidebar: boolean;
     rightSidebar: boolean;
     addProgramWidget: undefined;
+    programAnnotation: {};
 } | {
     addProgramWidget: any;
     usuarioLogado: {};
@@ -85,6 +91,7 @@ declare const argous: (state: {
     vldPsw: boolean;
     sidebar: boolean;
     rightSidebar: boolean;
+    programAnnotation: {};
 } | {
     mensagensNaoLidas: number;
     usuarioLogado: {};
@@ -98,5 +105,6 @@ declare const argous: (state: {
     sidebar: boolean;
     rightSidebar: boolean;
     addProgramWidget: undefined;
+    programAnnotation: {};
 };
 export default argous;

package/dist/reducers/argous.js

@@ -24,7 +24,8 @@ var argous = function (state, action) {
         vldPsw: false,
         sidebar: true,
         rightSidebar: false,
-        addProgramWidget: undefined
+        addProgramWidget: undefined,
+        programAnnotation: {}
     }; }
     switch (action.type) {
         case 'setUsuarioLogado':
@@ -62,6 +63,8 @@ var argous = function (state, action) {
             return __assign(__assign({}, state), { addProgramWidget: action.addProgramWidget });
         case 'setMensagensNaoLidas':
             return __assign(__assign({}, state), { mensagensNaoLidas: action.mensagensNaoLidas });
+        case 'setProgramAnnotation':
+            return __assign(__assign({}, state), { programAnnotation: action.programAnnotation });
         default:
             return state;
     }

package/dist/types.d.ts

@@ -65,7 +65,8 @@ export interface ArgousType {
   usuarioLogado: UsuarioLogado,
   vldPsw: boolean,
   rightSidebar: boolean,
-  addProgramWidget: any
+  addProgramWidget: any,
+  programAnnotation: object
 }
 export interface StoreState {
   argous: ArgousType
@@ -154,5 +155,10 @@ interface setVldPsw {
   vldPsw: boolean 
 }
 
+interface setProgramAnnotation { 
+  type: 'setProgramAnnotation', 
+  programAnnotation: object 
+}
+
 
-export type ActionType = setUsuarioLogado|setLoading|setProcesso|setInitialPage|setCurrentProgram|setCurrentField|clearAllFields|setFields|setFavorites|setBlockUser|setNotificacao|setSidebar|setMensagensNaoLidas|setVldPsw|setRightSidebar|setAddProgramWidget
+export type ActionType = setUsuarioLogado|setLoading|setProcesso|setInitialPage|setCurrentProgram|setCurrentField|clearAllFields|setFields|setFavorites|setBlockUser|setNotificacao|setSidebar|setMensagensNaoLidas|setVldPsw|setRightSidebar|setAddProgramWidget|setProgramAnnotation

package/lib/actions/index.ts

@@ -62,4 +62,8 @@ export const setMensagensNaoLidas = (mensagensNaoLidas: number) => {
 
 export const setVldPsw = (vldPsw: boolean) => {
   return { type: 'vldPsw', vldPsw };
+};
+
+export const setProgramAnnotation = (programAnnotation: object) => {
+  return { type: 'setProgramAnnotation', programAnnotation };
 };

package/lib/api/index.js

@@ -487,4 +487,13 @@ export const saveProgramAnnotation = async (data, token) => {
     body: JSON.stringify(data)
   });
   return await res.json();
+};
+
+export const sendProgramAnnotation = async (data, token) => {
+  const res = await fetch(`${api()}agsendpgannotation.rslvr`, {
+    method: 'post',
+    headers: headers(token),
+    body: JSON.stringify(data)
+  });
+  return await res.json();
 };

package/lib/components/Programa/Programa.js

@@ -1,9 +1,7 @@
 import BarraFerramentas from './../BarraFerramentas';
-import Annotations from './Annotations';
 import PageCodeEasterEgg from './PageCodeEasterEgg';
 import * as argous from '../../actions';
 import { getProgram, toggleFavorite } from '../../api';
-import { useModal } from '../../utils';
 import { Box, CircularProgress, Paper, Typography, useTheme } from '@material-ui/core';
 import PropTypes from 'prop-types';
 import React, { useEffect, useState } from 'react';
@@ -46,15 +44,14 @@ function Programa({
   rightSidebar,
   setRightSidebar,
   setAddProgramWidget,
-  annotationParameters = {},
-  openAnnotationParameters = () => '',
+  setProgramAnnotation,
+  annotationParameters,
+  openAnnotationParameters,
   fields: _,
   ...props
 }) {
 
   const theme = useTheme();
-  const { createModal } = useModal();
-  const annotationsModal = createModal(Annotations);
   const [programa, setPrograma] = useState({});
   const [favoriteAnimationInsert, setFavoriteAnimationInsert] = useState(false);
   const [favoriteAnimationRemove, setFavoriteAnimationRemove] = useState(false);
@@ -74,7 +71,7 @@ function Programa({
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  const openAnnotations = async (event) => await annotationsModal({ ...programa, code, annotationParameters, openAnnotationParameters });
+  const openAnnotations = (event) => setProgramAnnotation({ ...programa, open: true, code, annotationParameters, openAnnotationParameters });
 
   const addFavorite = () => {
     const path = window.location.pathname;
@@ -159,22 +156,20 @@ function Programa({
   );
 }
 
-const mapStateToProps = (state) => {
-  return { 
-    fields: state.argous.fields, 
-    favorites: state.argous.favorites, 
-    rightSidebar: state.argous.rightSidebar
-  };
-};
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    setAddProgramWidget: data => dispatch(argous.setAddProgramWidget(data)),
-    setCurrentProgram: data => dispatch(argous.setCurrentProgram(data)),
-    setRightSidebar: data => dispatch(argous.setRightSidebar(data)),
-    setFavorites: data => dispatch(argous.setFavorites(data))
-  };
-};
+const mapStateToProps = (state) => ({ 
+  fields: state.argous.fields, 
+  favorites: state.argous.favorites, 
+  rightSidebar: state.argous.rightSidebar, 
+  programAnnotation: state.argous.programAnnotation 
+});
+
+const mapDispatchToProps = (dispatch) => ({ 
+  setAddProgramWidget: data => dispatch(argous.setAddProgramWidget(data)), 
+  setCurrentProgram: data => dispatch(argous.setCurrentProgram(data)), 
+  setRightSidebar: data => dispatch(argous.setRightSidebar(data)), 
+  setFavorites: data => dispatch(argous.setFavorites(data)), 
+  setProgramAnnotation: data => dispatch(argous.setProgramAnnotation(data)) 
+});
 
 Programa.propTypes = {
   code: PropTypes.string.isRequired,

package/lib/reducers/argous.ts

@@ -11,7 +11,8 @@ const argous = (state = {
   vldPsw: false,
   sidebar: true,
   rightSidebar: false,
-  addProgramWidget: undefined
+  addProgramWidget: undefined,
+  programAnnotation: {}
 }, action: ActionType) => {
   switch (action.type) {
     case 'setUsuarioLogado':
@@ -107,6 +108,11 @@ const argous = (state = {
         ...state,
         mensagensNaoLidas: action.mensagensNaoLidas
       };
+    case 'setProgramAnnotation':
+      return {
+        ...state,
+        programAnnotation: action.programAnnotation
+      };
     default:
       return state;
   }

package/lib/types.d.ts

@@ -65,7 +65,8 @@ export interface ArgousType {
   usuarioLogado: UsuarioLogado,
   vldPsw: boolean,
   rightSidebar: boolean,
-  addProgramWidget: any
+  addProgramWidget: any,
+  programAnnotation: object
 }
 export interface StoreState {
   argous: ArgousType
@@ -154,5 +155,10 @@ interface setVldPsw {
   vldPsw: boolean 
 }
 
+interface setProgramAnnotation { 
+  type: 'setProgramAnnotation', 
+  programAnnotation: object 
+}
+
 
-export type ActionType = setUsuarioLogado|setLoading|setProcesso|setInitialPage|setCurrentProgram|setCurrentField|clearAllFields|setFields|setFavorites|setBlockUser|setNotificacao|setSidebar|setMensagensNaoLidas|setVldPsw|setRightSidebar|setAddProgramWidget
+export type ActionType = setUsuarioLogado|setLoading|setProcesso|setInitialPage|setCurrentProgram|setCurrentField|clearAllFields|setFields|setFavorites|setBlockUser|setNotificacao|setSidebar|setMensagensNaoLidas|setVldPsw|setRightSidebar|setAddProgramWidget|setProgramAnnotation

package/package.json

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

package/dist/components/Programa/Annotations/Annotation.d.ts

@@ -1,19 +0,0 @@
-export const ANNOTATION_ID_INDEX: 0;
-export const ANNOTATION_PARENT_ID_INDEX: 1;
-export const ANNOTATION_USER_INDEX: 2;
-export const ANNOTATION_PROGRAM_CODE_INDEX: 3;
-export const ANNOTATION_PARAMETERS_INDEX: 4;
-export const ANNOTATION_DATE_INDEX: 5;
-export const ANNOTATION_TEXT_INDEX: 6;
-export const ANNOTATION_DOCUMENT_ID_INDEX: 7;
-export const ANNOTATION_ANSWERS_INDEX: 8;
-export const ANNOTATION_MARKED_USERS_INDEX: 9;
-export const ANNOTATION_PRIVACY_TYPE_INDEX: 10;
-export const ANNOTATION_CODE_INDEX: 11;
-export const ANNOTATION_DOCUMENT_MIME_TYPE_INDEX: 12;
-export const ANNOTATION_DOCUMENT_URL_INDEX: 13;
-export default Annotation;
-declare function Annotation({ annotation }: {
-    annotation: any;
-}): React.JSX.Element;
-import React from "react";