diff --git a/Dockerfile b/Dockerfile index f4953de84..8c2dc0fb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.8 ENV BUILD_PACKAGES postgresql-dev graphviz-dev graphviz build-base git pkgconfig \ python3-dev libxml2-dev jpeg-dev libressl-dev libffi-dev libxslt-dev \ - nodejs npm py3-lxml py3-magic postgresql-client poppler-utils antiword \ + nodejs py3-lxml py3-magic postgresql-client poppler-utils antiword \ curl jq openssh-client vim openssh-client bash RUN apk update --update-cache && apk upgrade @@ -17,9 +17,7 @@ RUN apk add --no-cache python3 nginx tzdata && \ rm -f /etc/nginx/conf.d/* RUN mkdir -p /var/interlegis/sapl && \ - apk add --update --no-cache $BUILD_PACKAGES && \ - npm install -g bower && \ - npm cache verify + apk add --update --no-cache $BUILD_PACKAGES WORKDIR /var/interlegis/sapl/ @@ -37,13 +35,6 @@ COPY config/env_dockerfile /var/interlegis/sapl/sapl/.env # Configura timezone para BRT # RUN cp /usr/share/zoneinfo/America/Sao_Paulo /etc/localtime && echo "America/Sao_Paulo" > /etc/timezone -# manage.py bower install bug: https://github.com/nvbn/django-bower/issues/51 - -# compilescss - Precompile all occurrences of your SASS/SCSS files for the whole project into css files - -RUN python3 manage.py bower_install --allow-root && \ - python3 manage.py compilescss - RUN python3 manage.py collectstatic --noinput --clear # Remove .env(fake) e sapl.db da imagem diff --git a/sapl-frontend/src/apps/compilacao/js/old/compilacao.js b/sapl-frontend/src/apps/compilacao/js/old/compilacao.js index 4ab1ec85e..78bded37d 100644 --- a/sapl-frontend/src/apps/compilacao/js/old/compilacao.js +++ b/sapl-frontend/src/apps/compilacao/js/old/compilacao.js @@ -251,7 +251,7 @@ function DispositivoSearch (opts) { _$('input[name="texto_dispositivo"]').val(formData.texto) _$('select[name="max_results"]').val(formData.max_results) } catch (e) { - console.log(e) + // console.log(e) } setTimeout(function () { @@ -261,7 +261,7 @@ function DispositivoSearch (opts) { // modalDs.find('.btn-busca').trigger('click') // onChangeParamTA() } catch (e) { - console.log(e) + // console.log(e) } }, 200) diff --git a/sapl-frontend/vue.config.js b/sapl-frontend/vue.config.js index d7b002e01..7ee4289ce 100644 --- a/sapl-frontend/vue.config.js +++ b/sapl-frontend/vue.config.js @@ -54,7 +54,7 @@ module.exports = { .plugin('RelativeBundleTrackerPlugin') .use(RelativeBundleTrackerPlugin, [{ path:'.', - filename: '../sapl/static/webpack-stats.json' + filename: '../webpack-stats.json' }]) config.resolve.alias diff --git a/sapl/settings.py b/sapl/settings.py index bbd80498f..ddc782ca2 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -267,7 +267,7 @@ WEBPACK_LOADER = { 'DEFAULT': { 'CACHE': not DEBUG, 'BUNDLE_DIR_NAME': 'sapl/static/', - 'STATS_FILE': BASE_DIR.child('static').child('webpack-stats.json'), + 'STATS_FILE': PROJECT_DIR.child('webpack-stats.json'), 'POLL_INTERVAL': 0.1, 'TIMEOUT': None, 'IGNORE': [r'.+\.hot-update.js', r'.+\.map'] diff --git a/sapl/static/js/compilacao.10aa09f7.js b/sapl/static/js/compilacao.04e48cbd.js similarity index 98% rename from sapl/static/js/compilacao.10aa09f7.js rename to sapl/static/js/compilacao.04e48cbd.js index 07f80918b..b153f7b59 100644 --- a/sapl/static/js/compilacao.10aa09f7.js +++ b/sapl/static/js/compilacao.04e48cbd.js @@ -511,7 +511,7 @@ eval("\nvar create = __webpack_require__(/*! ./_object-create */ \"2aeb\");\nvar /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _home_leandro_desenvolvimento_envs_sapl_sapl_frontend_node_modules_babel_runtime_corejs2_core_js_json_stringify__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./node_modules/@babel/runtime-corejs2/core-js/json/stringify */ \"f499\");\n/* harmony import */ var _home_leandro_desenvolvimento_envs_sapl_sapl_frontend_node_modules_babel_runtime_corejs2_core_js_json_stringify__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_home_leandro_desenvolvimento_envs_sapl_sapl_frontend_node_modules_babel_runtime_corejs2_core_js_json_stringify__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_es6_array_find__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es6.array.find */ \"7514\");\n/* harmony import */ var core_js_modules_es6_array_find__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_array_find__WEBPACK_IMPORTED_MODULE_1__);\n\n\nvar _$ = window.$;\n\nfunction SetCookie(cookieName, cookieValue, nDays) {\n var today = new Date();\n var expire = new Date();\n if (nDays === null || nDays === 0) nDays = 1;\n expire.setTime(today.getTime() + 3600000 * 24 * nDays);\n document.cookie = cookieName + '=' + escape(cookieValue) + ';expires=' + expire.toGMTString();\n}\n\nfunction ReadCookie(cookieName) {\n var theCookie = ' ' + document.cookie;\n var ind = theCookie.indexOf(' ' + cookieName + '=');\n if (ind === -1) ind = theCookie.indexOf(';' + cookieName + '=');\n if (ind === -1 || cookieName === '') return '';\n var ind1 = theCookie.indexOf(';', ind + 1);\n if (ind1 === -1) ind1 = theCookie.length;\n return unescape(theCookie.substring(ind + cookieName.length + 2, ind1));\n}\n\nfunction insertWaitAjax(element) {\n // jQuery(element).append('
')\n _$(element).append('
');\n}\n\nfunction DispositivoSearch(opts) {\n _$(function () {\n var formData = {};\n\n var containerDs = _$('body').children('#container_ds');\n\n if (containerDs.length > 0) {\n _$(containerDs).remove();\n }\n\n containerDs = _$('
');\n\n _$('body').prepend(containerDs);\n\n var fields = _$('[data-sapl-ta=\"DispositivoSearch\"]');\n\n fields.each(function () {\n var field = _$(this);\n\n var dataTypeSelection = field.attr('data-type-selection');\n var dataField = field.attr('data-field');\n var dataFunction = field.attr('data-function');\n\n var onChangeFieldSelects = function onChangeFieldSelects(event) {\n if (dataTypeSelection === 'checkbox') {\n var tas = field.find('input[name=\"ta_select_all\"]'); // tas - Textos Articulados\n\n tas.off();\n tas.on('change', function (event) {\n _$(this).closest('ul').find('input[name=\"' + dataField + '\"]').prop('checked', this.checked); // _$(this).prop('checked', false)\n\n });\n } else {\n var dpts = field.find('input');\n dpts.off();\n dpts.attr('type', 'hidden');\n\n _$('').insertBefore(dpts).append(_$('×')).on('click', function () {\n if (_$(this).closest('ul').find('li').length === 2) {\n _$(this).closest('ul').remove();\n } else {\n _$(this).closest('li').remove();\n }\n });\n }\n };\n\n onChangeFieldSelects();\n\n var onChangeParamTA = function onChangeParamTA(event) {\n var tipoTa = _$('select[name=\"tipo_ta\"]').val();\n\n var tipoModel = _$('select[name=\"tipo_model\"]').val();\n\n var numTa = _$('input[name=\"num_ta\"]').val();\n\n var anoTa = _$('input[name=\"ano_ta\"]').val();\n\n var dispositivosInternos = _$('input[name=\"dispositivos_internos\"]:checked').val();\n\n var rotuloDispositivo = _$('input[name=\"rotulo_dispositivo\"]').val();\n\n var textoDispositivo = _$('input[name=\"texto_dispositivo\"]').val();\n\n var maxResults = _$('select[name=\"max_results\"]').val();\n\n var url = '';\n\n if (rotuloDispositivo.length > 0 || textoDispositivo.length > 0) {\n _$('input[name=\"dispositivos_internos\"]').prop('disabled', false);\n\n _$('input[name=\"dispositivos_internos\"]').each(function (idx, element) {\n element.parentElement.classList.remove('disabled');\n });\n\n _$('input[name=\"dispositivos_internos\"]').closest('#div_id_dispositivos_internos').css('opacity', '1');\n } else {\n _$('input[name=\"dispositivos_internos\"]').filter('[value=\"False\"]').prop('checked', true);\n\n _$('input[name=\"dispositivos_internos\"]').prop('disabled', true);\n\n _$('input[name=\"dispositivos_internos\"]').each(function (idx, element) {\n element.parentElement.classList.add('disabled');\n });\n\n _$('input[name=\"dispositivos_internos\"]').closest('#div_id_dispositivos_internos').css('opacity', '0.3');\n\n dispositivosInternos = 'False';\n }\n\n formData = {\n 'tipo_ta': tipoTa,\n 'tipo_model': tipoModel,\n 'num_ta': numTa,\n 'ano_ta': anoTa,\n 'texto': textoDispositivo,\n 'rotulo': rotuloDispositivo,\n 'dispositivos_internos': dispositivosInternos,\n 'max_results': maxResults,\n 'data_type_selection': dataTypeSelection,\n 'data_field': dataField,\n 'data_function': dataFunction\n };\n window.localStorage.setItem('dispositivo_search_form_data', _home_leandro_desenvolvimento_envs_sapl_sapl_frontend_node_modules_babel_runtime_corejs2_core_js_json_stringify__WEBPACK_IMPORTED_MODULE_0___default()(formData));\n url = '/ta/search_fragment_form';\n\n _$('.result-busca-dispositivo').html('');\n\n insertWaitAjax('.result-busca-dispositivo');\n\n _$.get(url, formData).done(function (data) {\n _$('.result-busca-dispositivo').html(data); // OptionalCustomFrontEnd().init()\n\n\n if (dataTypeSelection === 'checkbox') {\n var tas = _$('.result-busca-dispositivo').find('input[name=\"ta_select_all\"]');\n\n tas.off();\n tas.on('change', function (event) {\n _$(this).closest('ul').find('input[name=\"' + dataField + '\"]').prop('checked', this.checked);\n });\n }\n });\n };\n\n var onKeyPressRotuloBuscaTextual = function onKeyPressRotuloBuscaTextual(event) {\n var rotuloDispositivo = _$('input[name=\"rotulo_dispositivo\"]').val();\n\n var textoDispositivo = _$('input[name=\"texto_dispositivo\"]').val(); // let dispositivosInternos = _$('input[name=\"dispositivos_internos\"]:checked').val()\n\n\n if (rotuloDispositivo.length > 0 || textoDispositivo.length > 0) {\n _$('input[name=\"dispositivos_internos\"]').prop('disabled', false);\n\n _$('input[name=\"dispositivos_internos\"]').each(function (idx, element) {\n element.parentElement.classList.remove('disabled');\n });\n\n _$('input[name=\"dispositivos_internos\"]').closest('#div_id_dispositivos_internos').css('opacity', '1');\n } else {\n _$('input[name=\"dispositivos_internos\"]').filter('[value=\"False\"]').prop('checked', true);\n\n _$('input[name=\"dispositivos_internos\"]').prop('disabled', true);\n\n _$('input[name=\"dispositivos_internos\"]').each(function (idx, element) {\n element.parentElement.classList.add('disabled');\n });\n\n _$('input[name=\"dispositivos_internos\"]').closest('#div_id_dispositivos_internos').css('opacity', '0.3'); // dispositivosInternos = 'False'\n\n }\n };\n\n var buttonDs = field.children('#buttonDs');\n\n if (buttonDs.length > 0) {\n _$(buttonDs).remove();\n }\n\n buttonDs = _$('
');\n field.prepend(buttonDs);\n\n var btnOpenSearch = _$('