From 16eeecc84ca9a3e572d95149c7a1dd8092d96d69 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sat, 11 Dec 2021 21:26:48 +0100 Subject: [PATCH 01/23] Import modal initial template - HTML template markup - Basic Js file (No interactions yet) - en-us translations - pt-br translations --- app/angular/components/importModelModal.html | 39 ++++++++++++++++++++ app/angular/components/importModelModal.js | 24 ++++++++++++ app/i18n/languages/en.js | 4 ++ app/i18n/languages/pt_BR.js | 5 +++ 4 files changed, 72 insertions(+) create mode 100644 app/angular/components/importModelModal.html create mode 100644 app/angular/components/importModelModal.js diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html new file mode 100644 index 00000000..e3cfe862 --- /dev/null +++ b/app/angular/components/importModelModal.html @@ -0,0 +1,39 @@ +
+

{{ 'Import model' | translate }}

+
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+
+
+ +
+ + +
\ No newline at end of file diff --git a/app/angular/components/importModelModal.js b/app/angular/components/importModelModal.js new file mode 100644 index 00000000..c8f01d0e --- /dev/null +++ b/app/angular/components/importModelModal.js @@ -0,0 +1,24 @@ +import angular from "angular"; +import template from "./ImportModelModal.html"; + +const app = angular.module("app.ImportModelModal", []); + +const Controller = function () { + const $ctrl = this; + $ctrl.submitted = false; + + $ctrl.cancel = () => { + $ctrl.dismiss({ + reason: "cancel", + }); + }; +}; + +export default app.component("importModelModal", { + template: template, + bindings: { + close: "&", + dismiss: "&" + }, + controller: Controller, +}).name; diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 774744e1..f167b1d2 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -95,4 +95,8 @@ export default { 'You have unsaved changes. Are you sure you want to exit without saving?': 'You have unsaved changes. Are you sure you want to exit without saving?', 'Exit without saving': 'Exit without saving', 'Name': 'Name', + 'Import model': 'Import model', + 'File': 'File', + 'Import': 'Import', +//'': '', }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index b2637755..3b3a15fe 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -46,6 +46,7 @@ export default { 'Cancel': 'Cancelar', 'Delete': 'Excluir', 'Are you sure you want to delete the model?': 'Tem certeza que deseja excluir a modelagem?', + 'Delete model': 'Deletar modelagem', 'Rename': 'Renomear', 'Close': 'Fechar', 'SQL': 'SQL', @@ -95,4 +96,8 @@ export default { 'You have unsaved changes. Are you sure you want to exit without saving?': 'Você tem alterações não salvas. Tem certeza que deseja sair sem salvar?', 'Exit without saving': 'Sair sem salvar', 'Name': 'Nome', + 'Import model': 'Importar modelo', + 'File': 'Arquivo', + 'Import': 'Importar', + //'': '', }; \ No newline at end of file From 49891f04c07b6473587977350c683aab38bdd987 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sat, 11 Dec 2021 21:28:12 +0100 Subject: [PATCH 02/23] Introduce import button to workspace - Add button close to New model - importModal controller --- app/angular/workspace/workspace.html | 1 + app/angular/workspace/workspace.js | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/angular/workspace/workspace.html b/app/angular/workspace/workspace.html index 1f57f9f8..63dd06ff 100644 --- a/app/angular/workspace/workspace.html +++ b/app/angular/workspace/workspace.html @@ -21,6 +21,7 @@

{{ 'Models' | translate }}

diff --git a/app/angular/workspace/workspace.js b/app/angular/workspace/workspace.js index 95b9c224..6eb3ea32 100644 --- a/app/angular/workspace/workspace.js +++ b/app/angular/workspace/workspace.js @@ -6,6 +6,7 @@ import modelCreateComponent from "../components/createModelModal"; import modelDuplicatorComponent from "../components/duplicateModelModal"; import modelDeleterComponent from "../components/deleteModelModal"; import modelRenameComponent from "../components/renameModelModal"; +import modelImportComponent from "../components/importModelModal"; const ListController = function ( $state, @@ -81,6 +82,16 @@ const ListController = function ( }); }; + ctrl.importModel = () => { + const modalInstance = $uibModal.open({ + animation: true, + template: '', + }); + modalInstance.result.then((model) => { + console.log('Salvei!') + }); + }; + ctrl.renameModel = (model) => { const modalInstance = $uibModal.open({ animation: true, @@ -149,7 +160,8 @@ export default angular modelCreateComponent, modelDuplicatorComponent, modelDeleterComponent, - modelRenameComponent + modelRenameComponent, + modelImportComponent ]) .component("workspace", { template, From 901d5f6df61b1f9108fb5961c0c572ba4cd86c0d Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sat, 11 Dec 2021 23:26:21 +0100 Subject: [PATCH 03/23] Add name input to modal upload --- app/angular/components/importModelModal.html | 26 +++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index e3cfe862..03bad2ed 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -16,18 +16,20 @@

{{ 'Import model' | translate }}

autocomplete="off" /> -
- -
- -
+
+ +
+ +
+
From 505d4113e905da7823b22fa95eb95457483e14c3 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 12 Dec 2021 00:17:58 +0100 Subject: [PATCH 04/23] Add .note explanation to import model modal - Add explanation about file type to upload (+ styles) - Add TO Do comment with desired behavior explanation - Add translations --- app/angular/components/importModelModal.html | 3 ++- app/i18n/languages/en.js | 1 + app/i18n/languages/pt_BR.js | 1 + app/sass/form.scss | 8 ++++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index 03bad2ed..2cda6a41 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -15,9 +15,10 @@

{{ 'Import model' | translate }}

data-ng-model="" autocomplete="off" /> +

{{ 'Please select a .BRT file' | translate }}

- +
diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index f167b1d2..6cb21a7d 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -98,5 +98,6 @@ export default { 'Import model': 'Import model', 'File': 'File', 'Import': 'Import', + 'Please select a .BRT file': 'Please choose a .BRT file to upload', //'': '', }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index 3b3a15fe..329ba5de 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -99,5 +99,6 @@ export default { 'Import model': 'Importar modelo', 'File': 'Arquivo', 'Import': 'Importar', + 'Please select a .BRT file': 'Por favor selecione um arquivo .BRT', //'': '', }; \ No newline at end of file diff --git a/app/sass/form.scss b/app/sass/form.scss index 429b067b..0f8b28c7 100644 --- a/app/sass/form.scss +++ b/app/sass/form.scss @@ -34,6 +34,14 @@ input[type="submit"]:focus { .field {position: relative;} .field:not(:last-child) {margin-bottom: 25px;} +//////////////////////////////////////////////////////////////////////////////// +// .form-group +//////////////////////////////////////////////////////////////////////////////// +.form-group .note { + font-size: 0.9em; + font-style: italic; + margin: 2px 0 0 4px; +} //////////////////////////////////////////////////////////////////////////////// // .columnsList From eeecd850bb78fa08032bdd92d89001a7cf18897a Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 12 Dec 2021 17:51:35 +0100 Subject: [PATCH 05/23] Remove conflict marks left by mistake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sorry! my bad 😅 --- app/i18n/languages/en.js | 53 +++------------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index fe6c04d8..9c9513f2 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -41,54 +41,6 @@ export default { 'Generate logical model': 'Generate logical model', 'Next': 'Next', 'New model': 'New model', -<<<<<<< HEAD - 'BR Modelo Web': 'BR Modelo Web', - 'Conceptual': 'Conceptual', - 'Logical': 'Logical', - 'Save': 'Save', - 'This email is not registered yet.': 'This email is not registered yet.', - 'The new password was successfully saved.': 'The new password was successfully saved.', - 'The password must be the same in both fields.': 'The password must be the same in both fields.', - 'The password must contain more than 6 digits.': 'The password must contain more than 6 digits.', - 'Fill the fields in red': 'Fill the fields in red', - 'Password recovery code is invalid, request password recovery again!': 'Password recovery code is invalid, request password recovery again!', - 'This email is not registered yet.': 'This email is not registered yet.', - 'Ops, we had an internal error, please try again later...': 'Ops, we had an internal error, please try again later...', - 'An email with instructions has been sent to EMAIL': 'An email with instructions has been sent to {{email}}', - 'Incorrect login or password': 'Incorrect login or password', - 'Saved successfully!': 'Saved successfully!', - 'The column name cannot be empty!': 'The column name cannot be empty!', - 'Successfully duplicated!': 'Successfully duplicated!', - 'Select the foreign table source!': 'Select the foreign table source!', - '_converted': '_converted', - 'MODEL_NAME (copy)': '{{name}} (copy)', - 'New model name': 'New model name', - 'Conversion Assistant - Specialization': 'Conversion Assistant - Specialization', - 'What do you want to do with inheritance from table TABLE_NAME?': 'What do you want to do with inheritance from table {{table}}?', - 'Use of a table for each entity': 'Use of a table for each entity', - 'Use of a single table for the entire hierarchy': 'Use of a single table for the entire hierarchy', - 'Use of a table for specialized entity(ies) only': 'Use of a table for specialized entity(ies) only', - 'Attention - Conversion Assistant - Specialization': 'Attention - Conversion Assistant - Specialization', - 'It was not possible to perform this conversion because table TABLE_NAME has other connections. Choose another option.': 'It was not possible to perform this conversion because table {{table}} has other connections. Choose another option.', - 'Conversion Assistant: Multivalued Attribute': 'Conversion Assistant: Multivalued Attribute', - 'What do you want to do with multivalued attribute ATTR_NAME of table TABLE_NAME?': 'What do you want to do with multivalued attribute {{attribute}} of table {{table}}?', - 'Conversion Assistant - Relationship (1, n)': 'Conversion Assistant - Relationship (1, n)', - 'What do you want to do with the RELATIONSHIP relationship between the TABLES tables?': 'What do you want to do with the {{relationship}} relationship between the {{tables}} tables?', - 'Create a column in the least cardinality table': 'Create a column in the least cardinality table', - 'Create new table': 'Create new table', - 'Conversion Assistant - Relationship (1, 1)': 'Conversion Assistant - Relationship (1, 1)', - 'Join tables': 'Join tables', - 'Logout': 'Logout', - 'Unsaved changes': 'Unsaved changes', - 'You have unsaved changes. Are you sure you want to exit without saving?': 'You have unsaved changes. Are you sure you want to exit without saving?', - 'Exit without saving': 'Exit without saving', - 'Name': 'Name', - 'Import model': 'Import model', - 'File': 'File', - 'Import': 'Import', - 'Please select a .BRT file': 'Please choose a .BRT file to upload', -//'': '', -======= 'Title': 'Title', 'Model name': 'Model name', 'Cancel': 'Cancel', @@ -144,5 +96,8 @@ export default { 'You have unsaved changes. Are you sure you want to exit without saving?': 'You have unsaved changes. Are you sure you want to exit without saving?', 'Exit without saving': 'Exit without saving', 'Name': 'Name', ->>>>>>> development + 'Import model': 'Import model', + 'File': 'File', + 'Import': 'Import', + 'Please select a .BRT file': 'Please choose a .BRT file to upload', }; \ No newline at end of file From 90059d54aca7b37ff77573917cbee6ff507a4f4f Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Junior (Id)" Date: Sat, 20 Apr 2024 12:16:26 -0300 Subject: [PATCH 06/23] Update Import modal - Remove field "Name" - Replace "file" with URL; - Update / Remove translations; --- app/angular/components/importModelModal.html | 22 ++++---------------- app/i18n/languages/en.js | 8 ++----- app/i18n/languages/pt_BR.js | 4 ++-- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index 2cda6a41..ca2e68b3 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -5,32 +5,18 @@

{{ 'Import model' | translate }}

- +
-

{{ 'Please select a .BRT file' | translate }}

-
-
- -
- -
- +

{{ 'Please insert the URL to import' | translate }}

diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 536fc3a8..8c8b5a17 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -109,9 +109,9 @@ export default { 'Request feature': 'Request feature', 'Report bug': 'Report bug', 'Import model': 'Import model', - 'File': 'File', + 'URL': 'URL', 'Import': 'Import', - 'Please select a .BRT file': 'Please select a .BRT file', + 'Please insert the URL to import': 'Please the URL to import', 'Last save:': 'Last save:', 'at': 'at', 'Equal to': 'Equal to', @@ -158,9 +158,5 @@ export default { 'Forbidden access': 'Forbidden access', 'Looks like this model does not exist or you don\'t have access to it.': 'Looks like this model does not exist or you don\'t have access to it.', 'Back to models list': 'Back to models list', - 'Import model': 'Import model', - 'File': 'File', - 'Import': 'Import', - 'Please select a .BRT file': 'Please choose a .BRT file to upload', 'Copy is not allowed on this module when element has references.': 'Copy is not allowed on this module when element has references.' }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index c0401d66..5317adda 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -109,9 +109,9 @@ export default { 'Request feature': 'Requisitar funcionalidade', 'Report bug': 'Reportar problema', 'Import model': 'Importar modelo', - 'File': 'Arquivo', + 'URL': 'URL', 'Import': 'Importar', - 'Please select a .BRT file': 'Por favor selecione um arquivo .BRT', + 'Please insert the URL to import': 'Por favor insira a URL para importar', 'Last save:': 'Salvo por último:', 'at': 'às', 'Equal to': 'Igual', From ba2c6713aafa426b9798aaa3633e311645e84505 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Junior (Id)" Date: Sat, 20 Apr 2024 12:21:10 -0300 Subject: [PATCH 07/23] Add placeholder to URL field --- app/angular/components/importModelModal.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index ca2e68b3..f6f36d07 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -11,6 +11,7 @@

{{ 'Import model' | translate }}

class="form-control" ng-class="" type="url" + placeholder="https://brmodeloweb.com/share/{hash}" pattern="https://.*" id="import-model" data-ng-model="" From aeaf2eb60d734fe57834ab41ceb45f9ea513c1c6 Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Wed, 24 Apr 2024 21:57:52 -0300 Subject: [PATCH 08/23] Create import api endpoint --- server_app/model/handler.js | 25 +++++++------------------ server_app/model/service.js | 31 ++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/server_app/model/handler.js b/server_app/model/handler.js index c23d5a3d..95ab05b3 100644 --- a/server_app/model/handler.js +++ b/server_app/model/handler.js @@ -136,25 +136,14 @@ const findShareOptions = async (req, res) => { const importModel = async (req, res) => { try { - if (!req.files) { - return res.status(400).send("No file uploaded"); - } - const file = req.files.model; - const { name, type, model } = JSON.parse(decrypt(file.data)); - const userId = req.headers["x-user-id"]; // TODO Change this when implementing authentication via jwt - const validation = modelValidator.validateSaveParams({ - name, - type, - model, - userId, - }); - if (!validation.valid) { - return res.status(422).send(validation.message); - } - const newModel = await modelService.save({ name, type, model, userId }); - return res.status(200).json(newModel); + const { shareId, userId } = req.body; + const newModel = await modelService.importModel(shareId, userId); + return res.status(201).json(newModel); } catch (error) { console.error(error); + if(error === "unauthorized") { + return res.status(401).json({ auth: false, message: 'This model is not shared.' }); + } return res .status(500) .send("There's an error while treating import your model request"); @@ -185,5 +174,5 @@ module.exports = router .put("/:modelId/rename",validateJWT, rename) .post("/share", validateJWT, toggleShare) .get("/:modelId/share/options", validateJWT, findShareOptions) - .post("/import",validateJWT, importModel) + .post("/import", validateJWT, importModel) .get("/share/:sharedId", findSharedModel); diff --git a/server_app/model/service.js b/server_app/model/service.js index 0d92f870..b69c417c 100644 --- a/server_app/model/service.js +++ b/server_app/model/service.js @@ -195,6 +195,34 @@ const countAll = async (userId) => { }); }; +const importModel = async (sharedId, userId) => { + return new Promise(async (resolve, reject) => { + try { + const sharedModel = await findSharedModel(sharedId); + + const newModel = { + "name": sharedModel.name, + "type": sharedModel.type, + "model": sharedModel.model, + "userId": userId + } + + const createdModel = await save(newModel); + + return resolve({ + "_id": createdModel._id, + "type": createdModel.type, + "name": createdModel.name, + "created": createdModel.created, + "who": createdModel.who + }); + } catch (error) { + console.error(error); + return reject(error); + } + }); +}; + const modelService = { listAll, getById, @@ -205,7 +233,8 @@ const modelService = { toggleShare, countAll, findShareOptions, - findSharedModel + findSharedModel, + importModel }; module.exports = modelService; From 7894bc9d76616835554e61886586621a73a3a33e Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Wed, 24 Apr 2024 21:58:28 -0300 Subject: [PATCH 09/23] Create import modal basic function --- app/angular/components/importModelModal.html | 10 ++++------ app/angular/components/importModelModal.js | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index f6f36d07..96c3c0f7 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -9,13 +9,11 @@

{{ 'Import model' | translate }}

{{ 'Please insert the URL to import' | translate }}

@@ -25,5 +23,5 @@

{{ 'Import model' | translate }}

- +
\ No newline at end of file diff --git a/app/angular/components/importModelModal.js b/app/angular/components/importModelModal.js index c8f01d0e..d9e6452a 100644 --- a/app/angular/components/importModelModal.js +++ b/app/angular/components/importModelModal.js @@ -3,15 +3,29 @@ import template from "./ImportModelModal.html"; const app = angular.module("app.ImportModelModal", []); -const Controller = function () { +const Controller = function (ModelAPI, AuthService) { const $ctrl = this; $ctrl.submitted = false; + $ctrl.$onInit = () => { + $ctrl.url = "teste"; + }; + + $ctrl.cancel = () => { $ctrl.dismiss({ reason: "cancel", }); }; + + $ctrl.save = (url) => { + const parts = url.split("/"); + const shareId = parts[parts.length-1]; + console.log(AuthService); + ModelAPI.importModel(shareId, AuthService.loggeduser).then(response => { + $ctrl.close({result: response.data}); + }); + }; }; export default app.component("importModelModal", { From 2b0d6d311343a261d4e644a13d7e256c166623d8 Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Wed, 24 Apr 2024 21:59:07 -0300 Subject: [PATCH 10/23] Add import function to workspace --- app/angular/service/modelAPI.js | 11 ++++++++++- app/angular/workspace/workspace.js | 10 +++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/angular/service/modelAPI.js b/app/angular/service/modelAPI.js index f4465638..65c9ea47 100644 --- a/app/angular/service/modelAPI.js +++ b/app/angular/service/modelAPI.js @@ -75,6 +75,14 @@ const authService = ($http) => { }); }; + const _importModel = function (shareId, userId) { + return $http + .post(`/models/import`, {shareId, userId}) + .then(function (resp) { + return resp; + }); + }; + return { saveModel: _saveModel, getAllModels: _getAllModels, @@ -84,7 +92,8 @@ const authService = ($http) => { renameModel: _renameModel, loadShareOptions: _loadShareOptions, toggleShare: _toggleShare, - getSharedModel: _getSharedModel + getSharedModel: _getSharedModel, + importModel: _importModel }; }; diff --git a/app/angular/workspace/workspace.js b/app/angular/workspace/workspace.js index fc532ec3..8a606178 100644 --- a/app/angular/workspace/workspace.js +++ b/app/angular/workspace/workspace.js @@ -108,9 +108,13 @@ const ListController = function ( const modalInstance = $uibModal.open({ animation: true, template: '', - }); - modalInstance.result.then((model) => { - console.log('Salvei!') + }).result; + modalInstance.then((result) => { + console.log(result); + ctrl.models.push(result); + ctrl.showFeedback($filter('translate')("Your model was imported successfully!"), true, 'success'); + }).catch((reason) => { + console.log("Modal dismissed with reason", reason); }); }; From bff16bd1e7cff5c1cdb64a6ad3eabe813802e751 Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Thu, 25 Apr 2024 11:09:59 -0300 Subject: [PATCH 11/23] Validate url field --- app/angular/components/importModelModal.html | 2 +- app/angular/components/importModelModal.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index 96c3c0f7..0acbdfa8 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -9,7 +9,7 @@

{{ 'Import model' | translate }}

{ - $ctrl.url = "teste"; + $ctrl.url = ""; + $ctrl.submitted = false; }; @@ -21,6 +21,7 @@ const Controller = function (ModelAPI, AuthService) { $ctrl.save = (url) => { const parts = url.split("/"); const shareId = parts[parts.length-1]; + $ctrl.submitted = true; console.log(AuthService); ModelAPI.importModel(shareId, AuthService.loggeduser).then(response => { $ctrl.close({result: response.data}); From 6a4b04aeae853deaefedc435e7fe9688892662ff Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Thu, 25 Apr 2024 12:00:10 -0300 Subject: [PATCH 12/23] Do not allow dismiss import modal on click outside area --- app/angular/components/importModelModal.html | 3 ++- app/angular/components/importModelModal.js | 20 +++++++++++++++----- app/angular/workspace/workspace.js | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index 0acbdfa8..0868e599 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -9,10 +9,11 @@

{{ 'Import model' | translate }}

{{ 'Please insert the URL to import' | translate }}

diff --git a/app/angular/components/importModelModal.js b/app/angular/components/importModelModal.js index 56241838..5483581e 100644 --- a/app/angular/components/importModelModal.js +++ b/app/angular/components/importModelModal.js @@ -5,13 +5,21 @@ const app = angular.module("app.ImportModelModal", []); const Controller = function (ModelAPI, AuthService) { const $ctrl = this; + const urlRegex = /^(https?:\/\/(?:[\w.-]+|\[::1\]|localhost)(?::\d{1,5})?\/#!\/publicview\/[\w.-]+)$/;; + + const validateUrl = (url) => { + if(url == null || url == "") { + return false + } + return urlRegex.test(url); + } $ctrl.$onInit = () => { $ctrl.url = ""; $ctrl.submitted = false; + $ctrl.valid = false; }; - $ctrl.cancel = () => { $ctrl.dismiss({ reason: "cancel", @@ -22,10 +30,12 @@ const Controller = function (ModelAPI, AuthService) { const parts = url.split("/"); const shareId = parts[parts.length-1]; $ctrl.submitted = true; - console.log(AuthService); - ModelAPI.importModel(shareId, AuthService.loggeduser).then(response => { - $ctrl.close({result: response.data}); - }); + $ctrl.valid = validateUrl(url); + if($ctrl.valid) { + ModelAPI.importModel(shareId, AuthService.loggeduser).then(response => { + $ctrl.close({result: response.data}); + }); + } }; }; diff --git a/app/angular/workspace/workspace.js b/app/angular/workspace/workspace.js index 9199a248..47cd8ae5 100644 --- a/app/angular/workspace/workspace.js +++ b/app/angular/workspace/workspace.js @@ -109,6 +109,8 @@ const ListController = function ( ctrl.importModel = () => { const modalInstance = $uibModal.open({ animation: true, + backdrop: 'static', + keyboard: false, template: '', }).result; modalInstance.then((result) => { From 93869ab2aa1b7380a832eeb310321f4f6fce6e61 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Junior (Id)" Date: Thu, 25 Apr 2024 12:11:10 -0300 Subject: [PATCH 13/23] Change :placeholder color on input with error styes - Reduce opacity in order to avoid it to look like text instead of placeholder --- app/sass/form.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/sass/form.scss b/app/sass/form.scss index fbfea5b4..4edeae9a 100644 --- a/app/sass/form.scss +++ b/app/sass/form.scss @@ -192,6 +192,7 @@ input[type="submit"]:focus { .form-control.error::placeholder { color: var(--danger-base); + opacity: 0.5; } textarea { From b4e3f910f238204dc2ad192728cffb269b1930b7 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Junior (Id)" Date: Thu, 25 Apr 2024 12:37:52 -0300 Subject: [PATCH 14/23] Add Feedback message to import modal --- app/angular/components/importModelModal.html | 8 ++++++++ app/i18n/languages/en.js | 2 ++ app/i18n/languages/pt_BR.js | 2 ++ app/sass/modal.scss | 11 +++++++++++ 4 files changed, 23 insertions(+) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index 0868e599..c1b7caa5 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -3,6 +3,14 @@

{{ 'Import model' | translate }}

+
diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 9ac4a2f1..fd008600 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -113,6 +113,8 @@ export default { 'URL': 'URL', 'Import': 'Import', 'Please insert the URL to import': 'Please the URL to import', + 'It was not possible to import this model. ': 'It was not possible to import this model. ', + 'The URL may not be correct or the model does not allow import.': 'The URL may not be correct or the model is not allowed to be imported.', 'Last save:': 'Last save:', 'at': 'at', 'Equal to': 'Equal to', diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index 744cdc96..fd999a43 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -112,6 +112,8 @@ export default { 'URL': 'URL', 'Import': 'Importar', 'Please insert the URL to import': 'Por favor insira a URL para importar', + 'It was not possible to import this model. ': 'Não foi possível importar esse modelo. ', + 'The URL may not be correct or the model does not allow import.': 'A URL pode não estar correta ou o modelo não autoriza importação', 'Last save:': 'Salvo por último:', 'at': 'às', 'Equal to': 'Igual', diff --git a/app/sass/modal.scss b/app/sass/modal.scss index 0e770b91..4a74af41 100644 --- a/app/sass/modal.scss +++ b/app/sass/modal.scss @@ -7,4 +7,15 @@ .modal-title { color: var(--gray-20); +} + +/////////////////////////////////////////////////////////////////////////////// +// For validation inside modal +/////////////////////////////////////////////////////////////////////////////// +.modal-body .feedback .alert { + padding: 6px 10px; +} + +.modal-body .feedback .alert p { + font-size: 1.2rem; } \ No newline at end of file From ee0f6bdba8e8c6032cd76fa3c0565ef7d1718802 Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Thu, 25 Apr 2024 12:54:04 -0300 Subject: [PATCH 15/23] Create and manage allowImport config on sharing --- server_app/model/handler.js | 4 ++-- server_app/model/model.js | 3 ++- server_app/model/service.js | 11 +++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/server_app/model/handler.js b/server_app/model/handler.js index 25d5ac5d..774653d5 100644 --- a/server_app/model/handler.js +++ b/server_app/model/handler.js @@ -110,8 +110,8 @@ const rename = async (req, res) => { const toggleShare = async (req, res) => { try { - const {modelId, active} = req.body; - const shareOptions = await modelService.toggleShare(modelId, active); + const {modelId, active, importAllowed} = req.body; + const shareOptions = await modelService.toggleShare(modelId, active, importAllowed); return res.status(200).send(shareOptions); } catch (error) { console.error(error); diff --git a/server_app/model/model.js b/server_app/model/model.js index 36de8757..7ee21f42 100644 --- a/server_app/model/model.js +++ b/server_app/model/model.js @@ -1,7 +1,8 @@ const mongoose = require("mongoose"); let ShareOptions = mongoose.Schema({ - active: {type: Boolean, required: true} + active: {type: Boolean, required: true}, + importAllowed: {type: Boolean, required: true} }); let model = mongoose.Schema({ diff --git a/server_app/model/service.js b/server_app/model/service.js index c31a0fe6..45c1d186 100644 --- a/server_app/model/service.js +++ b/server_app/model/service.js @@ -112,19 +112,22 @@ const remove = async (modelId) => { }; const buildConfigResponse = (shareOptions) => { + const importAllowed = (shareOptions.importAllowed != null) ? shareOptions.importAllowed : false; return { "active": shareOptions.active, + "importAllowed": importAllowed, "url": getSharedLink(shareOptions._id) } } -const toggleShare = async (modelId, active) => { +const toggleShare = async (modelId, active, importAllowed) => { return new Promise(async (resolve, reject) => { try { const model = await modelRepository.findOne({ _id: modelId }); if(model != null) { - const shareOptions = model.shareOptions != null ? model.shareOptions : {"active": active} + const shareOptions = model.shareOptions != null ? model.shareOptions : {"active": false, "importAllowed": false} shareOptions.active = active; + shareOptions.importAllowed = importAllowed; const updatedModel = await modelRepository.findOneAndUpdate( { _id: modelId }, { $set: { shareOptions: shareOptions, updated: Date.now() } }, @@ -149,7 +152,7 @@ const findShareOptions = async (modelId) => { if(model != null && model.shareOptions != null) { return resolve(buildConfigResponse(model.shareOptions)); } - const shareOptions = {"active": false}; + const shareOptions = {"active": false, "importAllowed": false}; const updatedModel = await modelRepository.findOneAndUpdate( { _id: modelId }, { $set: { shareOptions: shareOptions, updated: Date.now() } }, @@ -167,7 +170,7 @@ const findSharedModel = async (sharedId) => { return new Promise(async (resolve, reject) => { try { const model = await modelRepository.findOne({ "shareOptions._id": sharedId }); - if(model === null || model.shareOptions === null || !model.shareOptions.active){ + if(model === null || model.shareOptions === null || !model.shareOptions.active || !model.shareOptions.importAllowed){ reject("unauthorized"); } return resolve({ From abadf1a3a6069c8bcab6086d3382202683b704f8 Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Thu, 25 Apr 2024 12:54:53 -0300 Subject: [PATCH 16/23] Add allowImport config to export modal --- app/angular/components/shareModelModal.html | 8 ++++++++ app/angular/components/shareModelModal.js | 14 +++++++++----- app/angular/service/modelAPI.js | 4 ++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/angular/components/shareModelModal.html b/app/angular/components/shareModelModal.html index fb9ab336..c4518fd2 100644 --- a/app/angular/components/shareModelModal.html +++ b/app/angular/components/shareModelModal.html @@ -13,6 +13,14 @@

{{ 'Share model' | translate }}

+
+
+ +
+
diff --git a/app/angular/components/shareModelModal.js b/app/angular/components/shareModelModal.js index 3e4be721..09ff07a4 100644 --- a/app/angular/components/shareModelModal.js +++ b/app/angular/components/shareModelModal.js @@ -12,13 +12,17 @@ const Controller = function (ModelAPI) { const shareConfig = response.data; $ctrl.url = shareConfig.active ? shareConfig.url : ""; $ctrl.shared = shareConfig.active; - $ctrl.backupUrl = shareConfig.url; - $ctrl.backupShared = shareConfig.active; + $ctrl.importAllowed = shareConfig.importAllowed; + $ctrl.backupConfig = shareConfig; }); }; + const hasChanges = (newActive, newImportAllowed) => { + return $ctrl.backupConfig.active != newActive || $ctrl.backupConfig.importAllowed != newImportAllowed; + } + $ctrl.toggleShare = (shared) => { - $ctrl.url = shared? $ctrl.backupUrl : ""; + $ctrl.url = shared? $ctrl.backupConfig.url : ""; } $ctrl.cancel = () => { @@ -26,8 +30,8 @@ const Controller = function (ModelAPI) { }; $ctrl.save = () => { - if($ctrl.shared != $ctrl.backupShared) { - ModelAPI.toggleShare($ctrl.modelId, $ctrl.shared).then(() => { + if(hasChanges($ctrl.shared, $ctrl.importAllowed)) { + ModelAPI.toggleShare($ctrl.modelId, $ctrl.shared, $ctrl.importAllowed).then(() => { $ctrl.close({reason: "model shared"}); }).catch(error => { console.log(error); diff --git a/app/angular/service/modelAPI.js b/app/angular/service/modelAPI.js index d85865c7..20d5bf82 100644 --- a/app/angular/service/modelAPI.js +++ b/app/angular/service/modelAPI.js @@ -59,9 +59,9 @@ const authService = ($http) => { }); }; - const _toggleShare = function (modelId, active) { + const _toggleShare = function (modelId, active, importAllowed) { return $http - .post(`/models/share`, {"modelId": modelId, "active": active}) + .post(`/models/share`, {"modelId": modelId, "active": active, "importAllowed": importAllowed}) .then(function (resp) { return resp; }); From 7236b56eacca10e3ebfd9afd7aaa0f96f460466c Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Junior (Id)" Date: Thu, 25 Apr 2024 13:05:12 -0300 Subject: [PATCH 17/23] Improve import modal validation (Markup) - Add .alert to import modal -Defione styles adjustments to .alert inside modals (Global) - Loading indication iside modals (Global) - Add loading indication at Import modal --- app/angular/components/importModelModal.html | 6 ++++++ app/sass/mainHeader.scss | 15 ++++++++------- app/sass/modal.scss | 13 +++++++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index c1b7caa5..32c2e395 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -1,5 +1,11 @@

{{ 'Import model' | translate }}

+ Loading
diff --git a/app/sass/mainHeader.scss b/app/sass/mainHeader.scss index da1bfd7a..5e0c19dd 100644 --- a/app/sass/mainHeader.scss +++ b/app/sass/mainHeader.scss @@ -102,13 +102,19 @@ // Loading //////////////////////////////////////////////////////////////////////////////// .br-loader { + display: none; position: fixed; top: 70px; left: 50%; margin-left: -20px; - display: none; + padding: 3px;; + border: 1px solid var(--border-light); + border-radius: 4px; + background-color: var(--white); } +.br-loader.loading {display: block;} + /////////////////////////////////////////////////////////////////////////////// // .nav-icons dropdown-icon /////////////////////////////////////////////////////////////////////////////// @@ -133,9 +139,4 @@ .nav-icons .dropdown-menu > li > a { color: var(--gray-20); -} - -/////////////////////////////////////////////////////////////////////////////// -// .br-loader -/////////////////////////////////////////////////////////////////////////////// -.br-loader.loading {display: block;} +} \ No newline at end of file diff --git a/app/sass/modal.scss b/app/sass/modal.scss index 4a74af41..e709024a 100644 --- a/app/sass/modal.scss +++ b/app/sass/modal.scss @@ -9,6 +9,19 @@ color: var(--gray-20); } +/////////////////////////////////////////////////////////////////////////////// +// Loading indicator inside a modal +/////////////////////////////////////////////////////////////////////////////// +.modal-header { + position: relative; +} + +.modal-header .br-loader { + position: absolute; + top: unset; + bottom: -9px; +} + /////////////////////////////////////////////////////////////////////////////// // For validation inside modal /////////////////////////////////////////////////////////////////////////////// From ea2e414fcd668c8d0b9b8e906d6312a959d4f9db Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Thu, 25 Apr 2024 13:23:12 -0300 Subject: [PATCH 18/23] Handle feedbacks on import model --- app/angular/components/importModelModal.html | 2 +- app/angular/components/importModelModal.js | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/angular/components/importModelModal.html b/app/angular/components/importModelModal.html index 32c2e395..28b3b32f 100644 --- a/app/angular/components/importModelModal.html +++ b/app/angular/components/importModelModal.html @@ -10,7 +10,7 @@

{{ 'Import model' | translate }}

-
-
-

{{ 'With this link, people will be able to see but not modify this model' | translate }}

-
-
diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 046f6fef..03c2be1f 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -169,10 +169,11 @@ export default { 'Go to Github Sponsors': 'Go to Github Sponsors', 'Share model':'Share model', 'Create public link':'Create public link', - 'Make model public': 'Make model public', + 'Enable import': 'Enable import', + 'Allow users to make copies using the public link': 'Allow users to make copies using the public link', 'URL': 'URL', 'Copy': 'Copy', - 'With this link, people will be able to see but not modify this model': 'With this link, people will be able to see but not modify this model', + 'People will be able to see but not modify your model': 'People will be able to see but not modify your model', "Sharing configuration has been updated successfully!": "Sharing configuration has been updated successfully!", "Your model was imported successfully!": "Your model was imported successfully!" }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index 8b7d3af9..fe4bbb83 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -168,10 +168,11 @@ export default { 'Go to Github Sponsors': 'Ir para o Github Sponsors', 'Share model': 'Compartilhar modelo', 'Create public link': 'Criar link público', - 'Make model public': 'Tornar modelo público', + 'Enable import': 'Autorizar importação', + 'Allow users to make copies using the public link': 'Permitir que os usuários façam cópias usando o link público', 'URL': 'URL', 'Copy': 'Copiar', - 'With this link, people will be able to see but not modify this model': 'Com este link, as pessoas poderão ver, mas não modificar este modelo', + 'People will be able to see but not modify your model': 'As pessoas poderão ver, mas não modificar seu modelo', "Sharing configuration has been updated successfully!": "A configuração de compartilhamento foi atualizada com sucesso!", "Your model was imported successfully!": "Seu modelo foi importado com sucesso!" }; \ No newline at end of file diff --git a/app/sass/form.scss b/app/sass/form.scss index 4edeae9a..7873aaa0 100644 --- a/app/sass/form.scss +++ b/app/sass/form.scss @@ -49,6 +49,7 @@ input[type="submit"]:focus { // .form-group //////////////////////////////////////////////////////////////////////////////// .form-group .note { + word-break: normal; font-size: 0.9em; font-style: italic; margin: 2px 0 0 4px; From ce281387342266b23074a0bb9aac1b59064095f9 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Junior (Id)" Date: Thu, 25 Apr 2024 14:25:15 -0300 Subject: [PATCH 22/23] Only enable import if share model option is true --- app/angular/components/shareModelModal.html | 2 +- app/angular/components/shareModelModal.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/angular/components/shareModelModal.html b/app/angular/components/shareModelModal.html index 1149d8a5..f4263078 100644 --- a/app/angular/components/shareModelModal.html +++ b/app/angular/components/shareModelModal.html @@ -16,7 +16,7 @@

{{ 'Share model' | translate }}

diff --git a/app/angular/components/shareModelModal.js b/app/angular/components/shareModelModal.js index 09ff07a4..8f588858 100644 --- a/app/angular/components/shareModelModal.js +++ b/app/angular/components/shareModelModal.js @@ -23,6 +23,9 @@ const Controller = function (ModelAPI) { $ctrl.toggleShare = (shared) => { $ctrl.url = shared? $ctrl.backupConfig.url : ""; + if (!shared) { + $ctrl.importAllowed = false; + } } $ctrl.cancel = () => { From 906772164fe3ca0b0742282b05df0dd8f9184301 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Junior (Id)" Date: Thu, 25 Apr 2024 14:27:25 -0300 Subject: [PATCH 23/23] Remove consolle.log left overs --- server_app/model/service.js | 1 - 1 file changed, 1 deletion(-) diff --git a/server_app/model/service.js b/server_app/model/service.js index 45c1d186..aea7762f 100644 --- a/server_app/model/service.js +++ b/server_app/model/service.js @@ -227,7 +227,6 @@ const importModel = async (sharedId, userId) => { } const duplicate = async (modelId, userId, newName) => { - console.log(modelId, userId, newName); return new Promise(async (resolve, reject) => { try {