From 454e9cbdb392f13e323c60a41a0d057dbdd750ed Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 28 Nov 2021 18:15:31 +0100 Subject: [PATCH 01/54] Raw markup to add sections to logical sidebar Keep in mind this is a raw quick and dirty markup. The objective is help us to udnerstand how all elements work together. --- app/angular/logic/sidebar-panel.html | 132 +++++++++++++++++++++++++++ app/sass/app.scss | 3 +- app/sass/sidebarPannel.scss | 104 +++++++++++++++++++++ 3 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 app/angular/logic/sidebar-panel.html create mode 100644 app/sass/sidebarPannel.scss diff --git a/app/angular/logic/sidebar-panel.html b/app/angular/logic/sidebar-panel.html new file mode 100644 index 00000000..d7c6f134 --- /dev/null +++ b/app/angular/logic/sidebar-panel.html @@ -0,0 +1,132 @@ + \ No newline at end of file diff --git a/app/sass/app.scss b/app/sass/app.scss index 534cece9..4c0e19e1 100644 --- a/app/sass/app.scss +++ b/app/sass/app.scss @@ -11,4 +11,5 @@ @import 'selectOptions.scss'; @import 'sql.scss'; @import 'print.scss'; -@import 'joint-custom.scss'; \ No newline at end of file +@import 'joint-custom.scss'; +@import 'sidebarPannel'; \ No newline at end of file diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss new file mode 100644 index 00000000..0ef8d661 --- /dev/null +++ b/app/sass/sidebarPannel.scss @@ -0,0 +1,104 @@ +.sidebar-panel { + +} +//////////////////////////////////////////////////////////////////////////////// +// .panel-header +//////////////////////////////////////////////////////////////////////////////// + +.panel-header { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + padding: 8px 12px; + margin-bottom: 1px; + color: #fff; + background-color: #3d9970; + cursor: pointer; +} + +.panel-header:hover { + background-color: #1a744b; +} + +.panel-header > h3 { + font-weight: 300; + font-size: 14px; + margin: 0; +} + +.panel-header > .fa { + position: relative; + top: -2px; +} + +//////////////////////////////////////////////////////////////////////////////// +// .panel-content +//////////////////////////////////////////////////////////////////////////////// +.temp-hide .panel-content {padding: 0;} + +.panel-content { + padding: 8px 12px; +} + +//////////////////////////////////////////////////////////////////////////////// +// .table-columns +//////////////////////////////////////////////////////////////////////////////// +.table-columns { + list-style: none; + padding: 0; +} + +//////////////////////////////////////////////////////////////////////////////// +// .column-details +//////////////////////////////////////////////////////////////////////////////// +.column-details.temp-expanded header {display: none;} + +.column-details { + padding: 12px 8px; + border: 1px solid #ddd; + border-radius: 3px; + margin-bottom: 8px; +} + +.column-details header { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + ; +} + +.column-details .table-title { + margin: 0; + font-size: 12px; + font-weight: bold; + font-family: monospace; +} + +.column-details .relationship { + display: inline-block; + border: 1px solid #000; + border-radius: 2px; + padding:0 2px; + font-size: 10px; + font-weight: 500; + letter-spacing: 0.1em; +} + +.column-details-content .form-group {margin-bottom: 12px;} + +//////////////////////////////////////////////////////////////////////////////// +// +//////////////////////////////////////////////////////////////////////////////// +.column-details-actions { + display: flex; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + border-top: 1px solid #ddd; + padding-top: 12px;; +} + +.column-details-actions .br-button {width: 50%;} \ No newline at end of file From 2e4f7e16c51124f166aa5212d8f1824bcff235d9 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 28 Nov 2021 18:17:16 +0100 Subject: [PATCH 02/54] Add missing line to comment header --- app/sass/buttons.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/sass/buttons.scss b/app/sass/buttons.scss index 208a9525..61bd6922 100644 --- a/app/sass/buttons.scss +++ b/app/sass/buttons.scss @@ -39,6 +39,8 @@ background-color: #ddd; } +//////////////////////////////////////////////////////////////////////////////// + // .btn-alt //////////////////////////////////////////////////////////////////////////////// .btn-alt { From 4dd16608c79452d9d8f919d0b6a82f7fd1b85f6d Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Wed, 1 Dec 2021 16:21:52 -0300 Subject: [PATCH 03/54] View form component WIP --- app/angular/index.js | 2 + app/angular/logic/logic.html | 334 ++++++++++++++++++++++++----------- app/angular/logic/logic.js | 10 ++ app/angular/view/view.html | 58 ++++++ app/angular/view/view.js | 32 ++++ app/sass/app.scss | 6 +- app/sass/buttons.scss | 4 + app/sass/form.scss | 4 + app/sass/sidebarPannel.scss | 7 +- 9 files changed, 355 insertions(+), 102 deletions(-) create mode 100644 app/angular/view/view.html create mode 100644 app/angular/view/view.js diff --git a/app/angular/index.js b/app/angular/index.js index 1c87a83c..f6486d73 100644 --- a/app/angular/index.js +++ b/app/angular/index.js @@ -18,6 +18,7 @@ import "../joint/joint.ui.stencil.css"; import "oclazyload"; import sidebarControlConceptual from "./conceptual/sidebarControl"; +import view from "./view/view"; import authService from "./service/authService"; import modelService from "./service/modelAPI"; import dropdownComponent from "./components/dropdown"; @@ -47,6 +48,7 @@ const app = angular.module("app", [ logicFactory, sidebarControlConceptual, dropdownIconComponent, + view, ]); app.config([ diff --git a/app/angular/logic/logic.html b/app/angular/logic/logic.html index 385e01f8..0e182c57 100644 --- a/app/angular/logic/logic.html +++ b/app/angular/logic/logic.html @@ -58,125 +58,250 @@

{{ 'Logical model of:' | translate }} {{$ctrl.model.nam
- + {{ 'Select an element to edit' | translate }}
-
- -
- - -
- -
-
- - +
+
+
+

{{ 'Table properties' | translate }}

+
-
+
- + -
- -
- - - -
- -
- - -
- -
- -
+
+
+
-
- -
+
+
+

{{ 'Columns' | translate }}

+ +
-
-
+ +
+
+ + +
-
- - -
-
+ -
+
+
+
+

{{ 'Views' | translate }}

+ +
+ +
+ +
+
+
@@ -342,7 +478,7 @@

{{ 'Logical model of:' | translate }} {{$ctrl.model.nam

- + diff --git a/app/angular/logic/logic.js b/app/angular/logic/logic.js index 337de10e..0dc54c6c 100644 --- a/app/angular/logic/logic.js +++ b/app/angular/logic/logic.js @@ -45,6 +45,16 @@ const controller = function ( type: "success" } + ctrl.sections = { + tableProperties: true, + columns: false, + views: false, + } + + ctrl.toggleSection = (section) => { + ctrl.sections[section] = !ctrl.sections[section]; + } + ctrl.print = function () { window.print(); } diff --git a/app/angular/view/view.html b/app/angular/view/view.html new file mode 100644 index 00000000..95ebd0ad --- /dev/null +++ b/app/angular/view/view.html @@ -0,0 +1,58 @@ +
+ + +
+
+ + +
+ +
+ + +
+ +
+ + +
+
+ +
+
+
+ +
+ + +
+ +
+ + +
+ +
+
\ No newline at end of file diff --git a/app/angular/view/view.js b/app/angular/view/view.js new file mode 100644 index 00000000..4ef3c700 --- /dev/null +++ b/app/angular/view/view.js @@ -0,0 +1,32 @@ +import angular from "angular"; +import template from "./view.html"; + +const app = angular.module("app.view", []); + +const Controller = function () { + const $ctrl = this; + + $ctrl.view = {}; + + $ctrl.$onChanges = (changes) => { + if (changes.table != null && changes.table.currentValue != null) { + $ctrl.view = changes.table.currentValue; + } + } + + $ctrl.toggleForm = () => { + $ctrl.formVisible = !$ctrl.formVisible; + }; + + $ctrl.save = () => { + console.log($ctrl.view); + } +}; + +export default app.component("view", { + template: template, + bindings: { + table: "<", + }, + controller: Controller, +}).name; diff --git a/app/sass/app.scss b/app/sass/app.scss index 4c0e19e1..802f41b9 100644 --- a/app/sass/app.scss +++ b/app/sass/app.scss @@ -12,4 +12,8 @@ @import 'sql.scss'; @import 'print.scss'; @import 'joint-custom.scss'; -@import 'sidebarPannel'; \ No newline at end of file +@import 'sidebarPannel'; + +:root { + accent-color: #3d9970; +} \ No newline at end of file diff --git a/app/sass/buttons.scss b/app/sass/buttons.scss index 701ecaee..e20ada3c 100644 --- a/app/sass/buttons.scss +++ b/app/sass/buttons.scss @@ -16,6 +16,10 @@ transition: all 0.25s ease; } +.br-button--full { + width: 100%; +} + .br-button:hover { color: #fff; background: #3d9970; diff --git a/app/sass/form.scss b/app/sass/form.scss index 429b067b..ee2c5857 100644 --- a/app/sass/form.scss +++ b/app/sass/form.scss @@ -175,4 +175,8 @@ input[type="submit"]:focus { textarea { resize: vertical; +} + +input[type="checkbox"] { + cursor: pointer; } \ No newline at end of file diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index 0ef8d661..0d48f7c1 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -10,11 +10,12 @@ flex-direction: row; align-items: center; justify-content: space-between; - padding: 8px 12px; + padding: 12px; margin-bottom: 1px; color: #fff; background-color: #3d9970; cursor: pointer; + transition: ease .3s; } .panel-header:hover { @@ -101,4 +102,6 @@ padding-top: 12px;; } -.column-details-actions .br-button {width: 50%;} \ No newline at end of file +.column-details-actions .br-button {width: 50%;} + +.column-details .checkbox { margin: 4px 0; } \ No newline at end of file From 716235c3628e8e9c41e030c449a9526310d1d0d0 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Thu, 2 Dec 2021 19:47:51 -0300 Subject: [PATCH 04/54] Create ColumnForm component --- app/angular/logic/columnForm.html | 94 +++++++++++++++++++++++++++++++ app/angular/logic/columnForm.js | 36 ++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 app/angular/logic/columnForm.html create mode 100644 app/angular/logic/columnForm.js diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html new file mode 100644 index 00000000..66e2b757 --- /dev/null +++ b/app/angular/logic/columnForm.html @@ -0,0 +1,94 @@ +
+
+ + +
+ +
+ + + +
+ +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + + +
+ +
+ + +
+
\ No newline at end of file diff --git a/app/angular/logic/columnForm.js b/app/angular/logic/columnForm.js new file mode 100644 index 00000000..bc4bf31f --- /dev/null +++ b/app/angular/logic/columnForm.js @@ -0,0 +1,36 @@ +import angular from "angular"; +import template from "./columnForm.html"; + +const app = angular.module("app.columnForm", []); + +const Controller = function () { + const $ctrl = this; + + $ctrl.cancel = () => { + $ctrl.dismiss(); + }; + + $ctrl.selectType = function (selected) { + if (!$ctrl.column.PK && !$ctrl.column.FK) { + $ctrl.column.type = selected.type; + } else { + $ctrl.column.type = "INT"; + } + } + + $ctrl.selectTableOrigin = function (selected) { + $ctrl.column.tableOrigin.idName = selected.name; + } +}; + +export default app.component("columnForm", { + template: template, + bindings: { + save: "<", + dismiss: "&", + column: "<", + index: "<", + tableNames: "<" + }, + controller: Controller, +}).name; From d0fef5efd0ec912fe6f806779ce0da559144850c Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Thu, 2 Dec 2021 19:48:38 -0300 Subject: [PATCH 05/54] Add column form component to logic component --- app/angular/index.js | 2 - app/angular/logic/logic.html | 292 +---------------------------------- app/angular/logic/logic.js | 40 +---- app/joint/table.js | 6 +- 4 files changed, 16 insertions(+), 324 deletions(-) diff --git a/app/angular/index.js b/app/angular/index.js index f6486d73..1c87a83c 100644 --- a/app/angular/index.js +++ b/app/angular/index.js @@ -18,7 +18,6 @@ import "../joint/joint.ui.stencil.css"; import "oclazyload"; import sidebarControlConceptual from "./conceptual/sidebarControl"; -import view from "./view/view"; import authService from "./service/authService"; import modelService from "./service/modelAPI"; import dropdownComponent from "./components/dropdown"; @@ -48,7 +47,6 @@ const app = angular.module("app", [ logicFactory, sidebarControlConceptual, dropdownIconComponent, - view, ]); app.config([ diff --git a/app/angular/logic/logic.html b/app/angular/logic/logic.html index 0e182c57..d9064d47 100644 --- a/app/angular/logic/logic.html +++ b/app/angular/logic/logic.html @@ -43,7 +43,7 @@

{{ 'Logical model of:' | translate }} {{$ctrl.model.nam
    • @@ -98,199 +98,14 @@

    {{column.name}}

    PK -
    -
    - - -
    - -
    - - - -
    - -
    - - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - - - -
    - -
    - - -
    -
    +
    -
    - - -
    - -
    - - - -
    - -
    - - -
    - -
    - -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    - -
    - - - -
    - -
    - - -
    +
    - -
    @@ -299,8 +114,6 @@

    {{column.name}}

    - -

    aria-hidden="true" ng-click="$ctrl.deleteColumn(column, $index); $event.stopPropagation();" > - -
    -
    - - -
    - -
    - - - -
    - -
    - - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - - - -
    - -
    - - -
    -
    - - + +
    diff --git a/app/angular/logic/logic.js b/app/angular/logic/logic.js index 0dc54c6c..e63c6928 100644 --- a/app/angular/logic/logic.js +++ b/app/angular/logic/logic.js @@ -5,6 +5,8 @@ import sqlGeneratorModal from "../components/sqlGeneratorModal"; import duplicateModelModal from "../components/duplicateModelModal"; import Column from "../service/Column"; import preventExitServiceModule from "../service/preventExitService"; +import view from "../view/view"; +import columnForm from "./columnForm"; const controller = function ( $rootScope, @@ -55,6 +57,10 @@ const controller = function ( ctrl.sections[section] = !ctrl.sections[section]; } + ctrl.changeVisible = function () { + ctrl.editionVisible = !ctrl.editionVisible; + } + ctrl.print = function () { window.print(); } @@ -178,22 +184,14 @@ const controller = function ( ctrl.closeAllColumns(); column.expanded = true; - //LogicService.editColumn($index); } - ctrl.editColumn = function (oldColumn, editedColumn, $index) { + ctrl.editColumn = function (editedColumn, $index) { if (editedColumn.name == "") { ctrl.showFeedback("The column name cannot be empty!", true, "error"); return; } - // if(editedColumn.FK && editedColumn.tableOrigin.idName == "") { - // ctrl.showFeedback("Selecione a origem da tabela estrangeira!", true, "error"); - // return; - // } else { - // column.tableOrigin.idOrigin = self.mapTables.get(column.tableOrigin.idName); - // } - LogicService.editColumn($index, editedColumn); ctrl.closeAllColumns(); @@ -228,24 +226,6 @@ const controller = function ( } } - ctrl.selectAddType = function (selected) { - if (!ctrl.addColumnModel.PK && !ctrl.addColumnModel.FK) { - ctrl.addColumnModel.type = selected.type; - } else { - ctrl.addColumnModel.type = "INT"; - } - } - - ctrl.selectEditType = function (selected) { - if (!ctrl.editColumnModel.PK && !ctrl.editColumnModel.FK) { - ctrl.editColumnModel.type = selected.type; - } - } - - ctrl.selectAddTableOrigin = function (selected) { - ctrl.addColumnModel.tableOrigin.idName = selected.name; - } - ctrl.newColumnObject = function () { return new Column(); } @@ -273,10 +253,6 @@ const controller = function ( LogicService.zoomNone(); } - ctrl.changeVisible = function () { - ctrl.editionVisible = !ctrl.editionVisible; - } - ctrl.generateSQL = function () { var sql = SqlGeneratorService.generate(LogicService.buildTablesJson()); @@ -337,7 +313,7 @@ const controller = function ( }; export default angular - .module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule]) + .module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule, view, columnForm]) .component("editorLogic", { template, controller, diff --git a/app/joint/table.js b/app/joint/table.js index 202d3285..1f872f01 100644 --- a/app/joint/table.js +++ b/app/joint/table.js @@ -27,15 +27,15 @@ uml.Class = joint.shapes.basic.Generic.extend({ '.uml-class-name-text': { 'ref': '.uml-class-name-rect', 'ref-y': .5, 'ref-x': .5, 'text-anchor': 'middle', 'y-alignment': 'middle', 'font-weight': 'bold', - 'fill': 'black', 'font-size': 12, 'font-family': 'Times New Roman' + 'fill': 'black', 'font-size': 12, 'font-family': 'Fira Sans' }, '.uml-class-attrs-text': { 'ref': '.uml-class-attrs-rect', 'ref-y': 5, 'ref-x': 5, - 'fill': 'black', 'font-size': 12, 'font-family': 'Times New Roman' + 'fill': 'black', 'font-size': 12, 'font-family': 'Fira Sans' }, '.uml-class-methods-text': { 'ref': '.uml-class-methods-rect', 'ref-y': 5, 'ref-x': 5, - 'fill': 'black', 'font-size': 12, 'font-family': 'Times New Roman' + 'fill': 'black', 'font-size': 12, 'font-family': 'Fira Sans' } }, From 38a919a7b0ab7a74001707a5975ff1f64bb5a6ce Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Thu, 2 Dec 2021 20:08:31 -0300 Subject: [PATCH 06/54] Fix scroll on sidebar and move bug icon --- app/angular/logic/logic.html | 2 +- app/sass/buttons.scss | 2 +- app/sass/sidebarPannel.scss | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/angular/logic/logic.html b/app/angular/logic/logic.html index d9064d47..4f752018 100644 --- a/app/angular/logic/logic.html +++ b/app/angular/logic/logic.html @@ -63,7 +63,7 @@

    {{ 'Logical model of:' | translate }} {{$ctrl.model.nam -
    +

    {{ 'Table properties' | translate }}

    diff --git a/app/sass/buttons.scss b/app/sass/buttons.scss index e20ada3c..beb20eb2 100644 --- a/app/sass/buttons.scss +++ b/app/sass/buttons.scss @@ -80,7 +80,7 @@ position: fixed; z-index: 10; bottom: 24px; - right: 24px; + left: 24px; font-size: 2em; width: 42px; height: 42px; diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index 0d48f7c1..997674fe 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -1,3 +1,8 @@ +.sidebar-wrapper { + height: 100%; + overflow-y: scroll; +} + .sidebar-panel { } From 385d3488335116d4114cc5f3b1aa6f13956eff22 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Thu, 2 Dec 2021 21:04:37 -0300 Subject: [PATCH 07/54] Fix load tables to edit column and change ng-show to ng-disabled --- app/angular/components/dropdown.html | 2 +- app/angular/components/dropdown.js | 1 + app/angular/logic/columnForm.html | 15 ++++++++++----- app/angular/logic/logic.js | 13 +++++++++---- app/sass/selectOptions.scss | 6 ++++++ 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/app/angular/components/dropdown.html b/app/angular/components/dropdown.html index 25ae14fe..83f62a85 100644 --- a/app/angular/components/dropdown.html +++ b/app/angular/components/dropdown.html @@ -1,6 +1,6 @@
    - +
    • {{option.name}}
      • diff --git a/app/angular/components/dropdown.js b/app/angular/components/dropdown.js index 27bbb408..9cf212b2 100644 --- a/app/angular/components/dropdown.js +++ b/app/angular/components/dropdown.js @@ -34,5 +34,6 @@ export default angular.module("app.dropdown", []).component("dropdown", { options: "<", selected: "<", onSelect: "&", + disabled: '<' }, }).name; diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html index 66e2b757..38585890 100644 --- a/app/angular/logic/columnForm.html +++ b/app/angular/logic/columnForm.html @@ -18,13 +18,14 @@
    -
    +
    @@ -48,39 +49,43 @@
    -
    +
    -
    +
    -
    +
    -
    +
    diff --git a/app/angular/logic/logic.js b/app/angular/logic/logic.js index e63c6928..5dac58ec 100644 --- a/app/angular/logic/logic.js +++ b/app/angular/logic/logic.js @@ -179,6 +179,7 @@ const controller = function ( } ctrl.editionColumnMode = function (column) { + loadTables(); ctrl.editColumnModel = JSON.parse(JSON.stringify(column)); ctrl.closeAllColumns(); @@ -215,10 +216,7 @@ const controller = function ( ctrl.addColumnVisible = false; } - ctrl.showAddColumn = function (show) { - ctrl.addColumnVisible = show; - ctrl.addColumnModel = ctrl.newColumnObject(); - + const loadTables = () => { ctrl.tableNames = []; ctrl.mapTables = LogicService.getTablesMap(); for (var key of ctrl.mapTables.keys()) { @@ -226,6 +224,13 @@ const controller = function ( } } + ctrl.showAddColumn = function (show) { + ctrl.addColumnVisible = show; + ctrl.addColumnModel = ctrl.newColumnObject(); + + loadTables(); + } + ctrl.newColumnObject = function () { return new Column(); } diff --git a/app/sass/selectOptions.scss b/app/sass/selectOptions.scss index ba4afbd4..c2a21af0 100644 --- a/app/sass/selectOptions.scss +++ b/app/sass/selectOptions.scss @@ -37,6 +37,12 @@ .dropdown-tmp-trigger > button { width: 100%; text-align: left; + background: #FFF; +} + +.dropdown-tmp-trigger > button:disabled { + color: #c0c0c0; + background-color: #ddd; } .dropdown-tmp-trigger > button:focus { From 26d1bef56a6469422183fd8f5e8fa8c8d357f49f Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Thu, 2 Dec 2021 23:21:58 -0300 Subject: [PATCH 08/54] Init View element --- app/angular/logic/logic.html | 4 +- app/angular/logic/logic.js | 1 + app/angular/service/logicFactory.js | 39 +++++++-- app/angular/service/logicService.js | 20 ++++- app/angular/view/view.js | 1 + app/joint/table.js | 126 +++++++++++++++++++++++++++- 6 files changed, 180 insertions(+), 11 deletions(-) diff --git a/app/angular/logic/logic.html b/app/angular/logic/logic.html index 4f752018..5d405a6b 100644 --- a/app/angular/logic/logic.html +++ b/app/angular/logic/logic.html @@ -63,7 +63,7 @@

    {{ 'Logical model of:' | translate }} {{$ctrl.model.nam

    -
    +

    {{ 'Table properties' | translate }}

    @@ -107,7 +107,7 @@

    {{column.name}}

    - +
    diff --git a/app/angular/logic/logic.js b/app/angular/logic/logic.js index e63c6928..556ad997 100644 --- a/app/angular/logic/logic.js +++ b/app/angular/logic/logic.js @@ -113,6 +113,7 @@ const controller = function ( ctrl.selectedElement = element; if (element != null) { ctrl.selectedName = element.attributes.name; + ctrl.selectedType = element.attributes.type; } }); }); diff --git a/app/angular/service/logicFactory.js b/app/angular/service/logicFactory.js index 5a118f4a..ece09952 100644 --- a/app/angular/service/logicFactory.js +++ b/app/angular/service/logicFactory.js @@ -3,11 +3,7 @@ import angular from "angular"; import * as joint from "jointjs/dist/joint"; import "jointjs/dist/joint.min.css"; -import tables from "../../joint/table"; -joint.shapes.uml = tables; - const logicFactory = () => { - var logic = joint.shapes.uml; const _createTable = function () { @@ -42,8 +38,41 @@ const logicFactory = () => { return table; } + const _createView = function () { + var table = new logic.Abstract({ + position: { x: 12, y: 155 }, + size: { width: 100, height: 100 }, + name: 'View', + attributes: [], + attrs: { + '.uml-class-name-rect': { + fill: 'red', + stroke: '#000', + 'stroke-width': 0.5, + }, + '.uml-class-attrs-rect': { + fill: '#fff', + stroke: '#000', + 'stroke-width': 0.5 + }, + '.uml-class-methods-rect': { + fill: '#fff', + stroke: '#000', + 'stroke-width': 0.5 + }, + '.uml-class-attrs-text': { + ref: '.uml-class-attrs-rect', + 'ref-y': 0.5, + 'y-alignment': 'middle' + } + } + }); + return table; + } + return { - createTable: _createTable + createTable: _createTable, + createView: _createView } } diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index 56b5dab6..76cdbf0d 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -4,8 +4,10 @@ import "backbone"; import $ from "jquery"; import * as joint from "jointjs/dist/joint"; -import shapes from "../../joint/shapes"; -joint.shapes.erd = shapes; +import erd from "../../joint/shapes"; +import uml from "../../joint/table"; +joint.shapes.erd = erd; +joint.shapes.uml = uml; import "jointjs/dist/joint.min.css"; import "../../joint/joint.ui.stencil"; @@ -50,6 +52,7 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) drawGrid: true, model: ls.graph }); + ls.commandManager = new joint.dia.CommandManager({ graph: ls.graph }); ls.selectionView = new joint.ui.SelectionView({ paper: ls.paper, graph: ls.graph, model: new Backbone.Collection }); @@ -156,7 +159,8 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) }); $('#stencil-holder').append(stencil.render().el); stencil.load([ - LogicFactory.createTable() + LogicFactory.createTable(), + LogicFactory.createView() ]); } @@ -206,6 +210,11 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) halo.removeHandle('clone'); halo.removeHandle('fork'); halo.removeHandle('rotate'); + + if(cellView.model.getType() === "View") { + halo.removeHandle('link'); + } + halo.render(); } @@ -302,6 +311,11 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) var source = ls.graph.getCell(link.get('source').id); var target = ls.graph.getCell(link.get('target').id); + if(source.getType() === "View" || target.getType() === "View") { + link.remove(); + return + } + var originName = source.attributes.name; var idOrigin = source.attributes.id; const column = new Column({ diff --git a/app/angular/view/view.js b/app/angular/view/view.js index 4ef3c700..f13690dc 100644 --- a/app/angular/view/view.js +++ b/app/angular/view/view.js @@ -27,6 +27,7 @@ export default app.component("view", { template: template, bindings: { table: "<", + tables: "<", }, controller: Controller, }).name; diff --git a/app/joint/table.js b/app/joint/table.js index 1f872f01..ffd63242 100644 --- a/app/joint/table.js +++ b/app/joint/table.js @@ -115,7 +115,131 @@ uml.Class = joint.shapes.basic.Generic.extend({ offsetY += rectHeight; }); - } + }, + + getType: function() { + return "Class" + } + +}); + +uml.Abstract = joint.shapes.basic.Generic.extend({ + + markup: [ + '', + '', + '', + '', + '', + '' + ].join(''), + + defaults: _.defaultsDeep({ + + type: 'uml.Abstract', + + attrs: { + rect: { 'width': 200 }, + + '.uml-class-name-rect': { 'stroke': 'black', 'stroke-width': 0.5, 'fill': 'red' }, + '.uml-class-attrs-rect': { 'stroke': 'black', 'stroke-width': 0.5, 'fill': '#fff' }, + '.uml-class-methods-rect': { 'stroke': 'black', 'stroke-width': 0.5, 'fill': '#fff' }, + + '.uml-class-name-text': { + 'ref': '.uml-class-name-rect', 'ref-y': .5, 'ref-x': .5, 'text-anchor': 'middle', 'y-alignment': 'middle', 'font-weight': 'bold', + 'fill': 'black', 'font-size': 12, 'font-family': 'Fira Sans' + }, + '.uml-class-attrs-text': { + 'ref': '.uml-class-attrs-rect', 'ref-y': 5, 'ref-x': 5, + 'fill': 'black', 'font-size': 12, 'font-family': 'Fira Sans' + }, + '.uml-class-methods-text': { + 'ref': '.uml-class-methods-rect', 'ref-y': 5, 'ref-x': 5, + 'fill': 'black', 'font-size': 12, 'font-family': 'Fira Sans' + } + }, + + name: [], + attributes: [], + methods: [], + objects: [] + + }, joint.shapes.basic.Generic.prototype.defaults), + + initialize: function () { + + this.on('change:name change:attributes change:methods', function () { + this.updateRectangles(); + this.trigger('uml-update'); + }, this); + + this.updateRectangles(); + + joint.shapes.basic.Generic.prototype.initialize.apply(this, arguments); + }, + + getClassName: function () { + return this.get('name'); + }, + + addAttribute: function (obj) { + if (obj.PK) { + obj.name = obj.name + ": PK"; + } + + if (obj.FK) { + obj.name = obj.name + ": FK"; + } + + this.get('attributes').push(obj.name); + this.get('objects').push(obj); + this.updateRectangles(); + this.trigger('uml-update'); + }, + + deleteColumn: function (index) { + this.get('attributes').splice(index, 1); + this.get('objects').splice(index, 1); + this.updateRectangles(); + this.trigger('uml-update'); + }, + + editColumn: function (index, name, object) { + this.get('attributes')[index] = name; + this.get('objects')[index] = object; + this.updateRectangles(); + this.trigger('uml-update'); + }, + + updateRectangles: function () { + + var attrs = this.get('attrs'); + + var rects = [ + { type: 'name', text: this.getClassName() }, + { type: 'attrs', text: this.get('attributes') }, + { type: 'methods', text: this.get('methods') } + ]; + + var offsetY = 0; + + _.each(rects, function (rect) { + + var lines = _.isArray(rect.text) ? rect.text : [rect.text]; + var rectHeight = lines.length * 20 + 20; + + attrs['.uml-class-' + rect.type + '-text'].text = lines.join('\n'); + attrs['.uml-class-' + rect.type + '-rect'].height = rectHeight; + attrs['.uml-class-' + rect.type + '-rect'].transform = 'translate(0,' + offsetY + ')'; + + offsetY += rectHeight; + }); + + }, + + getType: function() { + return "View" + } }); From ffa50cf350d5e4b2c5c6d5e6664819dd69766f50 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sat, 4 Dec 2021 22:10:31 +0100 Subject: [PATCH 09/54] Increase .model-properties width We're increasing sidebar width in order to better accommodate content being introduced. --- app/sass/structure.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/sass/structure.scss b/app/sass/structure.scss index 547e42a4..ead7fe84 100644 --- a/app/sass/structure.scss +++ b/app/sass/structure.scss @@ -119,9 +119,9 @@ a, position: fixed; z-index: 10; top: 88px; - right: -224px; + right: -285px; bottom: 0; - width: 240px; + width: 300px; border-top: 1px solid #e7e7e7; border-left: 1px solid #e7e7e7; background-color: #f8f8f8; From bd6d9e5ad90dadfe62584046cd0844a0dca6af86 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sat, 4 Dec 2021 22:13:09 +0100 Subject: [PATCH 10/54] Rename .sidebar-wrapper to .properties-content - Follow pattern used in both model views - Remove related styles - .panel-wrapper was (Apparently) created to handle vertical scroll in the sidebar. properties-content already handle this. --- app/angular/logic/logic.html | 2 +- app/sass/sidebarPannel.scss | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/app/angular/logic/logic.html b/app/angular/logic/logic.html index 5d405a6b..374c85d6 100644 --- a/app/angular/logic/logic.html +++ b/app/angular/logic/logic.html @@ -63,7 +63,7 @@

    {{ 'Logical model of:' | translate }} {{$ctrl.model.nam

    -
    +

    {{ 'Table properties' | translate }}

    diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index 997674fe..4543e145 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -1,15 +1,6 @@ -.sidebar-wrapper { - height: 100%; - overflow-y: scroll; -} - -.sidebar-panel { - -} //////////////////////////////////////////////////////////////////////////////// // .panel-header //////////////////////////////////////////////////////////////////////////////// - .panel-header { display: flex; flex-direction: row; From 464fc53566c539842d54e27425b218d7d5bcdafb Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sat, 4 Dec 2021 22:16:47 +0100 Subject: [PATCH 11/54] Sidebar content and Form adjustments and fixes - Add extra space at the end of each .panel-content to add some "breath" to elements - Remove unecessary display: none; used for development reasons in the past - Font-weight adjustments - Add word-break to .checkboxes label and .table-title elemetns --- app/sass/form.scss | 4 ++++ app/sass/sidebarPannel.scss | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/sass/form.scss b/app/sass/form.scss index ee2c5857..a60c5df6 100644 --- a/app/sass/form.scss +++ b/app/sass/form.scss @@ -179,4 +179,8 @@ textarea { input[type="checkbox"] { cursor: pointer; +} + +.checkbox > label { + word-break: break-all; } \ No newline at end of file diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index 4543e145..d1435bda 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -35,7 +35,11 @@ .temp-hide .panel-content {padding: 0;} .panel-content { - padding: 8px 12px; + padding: 8px 12px 18px; +} + +.panel-content .form-group:last-child { + margin-bottom: 0; } //////////////////////////////////////////////////////////////////////////////// @@ -49,8 +53,6 @@ //////////////////////////////////////////////////////////////////////////////// // .column-details //////////////////////////////////////////////////////////////////////////////// -.column-details.temp-expanded header {display: none;} - .column-details { padding: 12px 8px; border: 1px solid #ddd; @@ -68,9 +70,11 @@ .column-details .table-title { margin: 0; + line-height: 1.2em; font-size: 12px; - font-weight: bold; + font-weight: 500; font-family: monospace; + word-break: break-all; } .column-details .relationship { From 816315881ed32ff4739a0fc3e5ea6a7db09fdd7e Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 00:11:10 +0100 Subject: [PATCH 12/54] Update .emtpy-state styles - Remove button look & feel - Use neutral style --- app/angular/conceptual/sidebarControl.html | 2 +- app/angular/logic/logic.html | 2 +- app/sass/structure.scss | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/angular/conceptual/sidebarControl.html b/app/angular/conceptual/sidebarControl.html index 82169e02..34747b6a 100644 --- a/app/angular/conceptual/sidebarControl.html +++ b/app/angular/conceptual/sidebarControl.html @@ -9,7 +9,7 @@
    - +

    {{ 'Select an element to edit' | translate }}

    diff --git a/app/angular/logic/logic.html b/app/angular/logic/logic.html index 374c85d6..749f743d 100644 --- a/app/angular/logic/logic.html +++ b/app/angular/logic/logic.html @@ -58,7 +58,7 @@

    {{ 'Logical model of:' | translate }} {{$ctrl.model.nam
    - {{ 'Select an element to edit' | translate }} +

    {{ 'Select an element to edit' | translate }}

    diff --git a/app/sass/structure.scss b/app/sass/structure.scss index ead7fe84..e783e1d3 100644 --- a/app/sass/structure.scss +++ b/app/sass/structure.scss @@ -163,11 +163,10 @@ a, } .properties-content .empty-state { + font-size: 1.3em; + font-weight: 100; text-align: center; - color: #3d9970; - vertical-align: middle; - border: 1px solid #3d9970; - border-radius: 2px; + color: #959595; padding: 10px; } From 7061ece5b1e2921aeb5a5b3e90f4d2ec9cc4d503 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 00:12:01 +0100 Subject: [PATCH 13/54] Update link to Google fonts Fira --- app/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/index.html b/app/index.html index 5666b29c..feb635c0 100644 --- a/app/index.html +++ b/app/index.html @@ -4,7 +4,9 @@ brModeloWeb - + + + From 60cc739bbffc4eb096dabdf1b3628672d95ba31d Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 00:27:43 +0100 Subject: [PATCH 14/54] Adjust .properties-content - Use .old class to identify the old implementation - Remove unnecessary forced dimensions with position --- app/angular/conceptual/sidebarControl.html | 2 +- app/angular/logic/logic.html | 2 +- app/sass/structure.scss | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/angular/conceptual/sidebarControl.html b/app/angular/conceptual/sidebarControl.html index 34747b6a..177fcb0c 100644 --- a/app/angular/conceptual/sidebarControl.html +++ b/app/angular/conceptual/sidebarControl.html @@ -5,7 +5,7 @@ data-ng-class="!$ctrl.visible ? 'fa-angle-double-left' : 'fa-angle-double-right'"> -
    +
    diff --git a/app/angular/logic/logic.html b/app/angular/logic/logic.html index 749f743d..5f881a52 100644 --- a/app/angular/logic/logic.html +++ b/app/angular/logic/logic.html @@ -55,7 +55,7 @@

    {{ 'Logical model of:' | translate }} {{$ctrl.model.nam -
    +

    {{ 'Select an element to edit' | translate }}

    diff --git a/app/sass/structure.scss b/app/sass/structure.scss index e783e1d3..03720993 100644 --- a/app/sass/structure.scss +++ b/app/sass/structure.scss @@ -153,15 +153,14 @@ a, } .properties-content { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - padding: 16px; + height: 100%; overflow-y: scroll; } +.properties-content.old { + padding: 16px; +} + .properties-content .empty-state { font-size: 1.3em; font-weight: 100; From 2071af730d3cf15da56f53f65ca19951432a475a Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 15:27:08 +0100 Subject: [PATCH 15/54] Follow code formating rules from .editorconfig --- app/angular/logic/columnForm.html | 176 +++++++++++++-------------- app/angular/service/Column.js | 30 ++--- app/angular/view/view.html | 120 +++++++++++-------- app/angular/view/view.js | 14 +-- app/i18n/languages/en.js | 190 +++++++++++++++--------------- app/i18n/languages/pt_BR.js | 190 +++++++++++++++--------------- app/sass/app.scss | 2 +- 7 files changed, 370 insertions(+), 352 deletions(-) diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html index 38585890..316bfebe 100644 --- a/app/angular/logic/columnForm.html +++ b/app/angular/logic/columnForm.html @@ -1,99 +1,99 @@
    -
    - - -
    +
    + + +
    -
    - - - -
    +
    + + + +
    -
    - - -
    +
    + + +
    -
    - -
    +
    + +
    -
    - -
    +
    + +
    -
    - -
    +
    + +
    -
    - -
    +
    + +
    -
    - -
    +
    + +
    -
    - - - -
    +
    + + + +
    -
    - - -
    +
    + + +
    \ No newline at end of file diff --git a/app/angular/service/Column.js b/app/angular/service/Column.js index a828e372..8a918223 100644 --- a/app/angular/service/Column.js +++ b/app/angular/service/Column.js @@ -1,17 +1,17 @@ export default class Column { - constructor({ name = "", PK = false, FK = false, type = "INT", idOrigin = "", idLink = "" } = {}) { - this.FK = FK; - this.PK = PK; - this.NOT_NULL = false; - this.UNIQUE = false; - this.AUTO_INCREMENT = false; - this.defaultValue = ""; - this.name = name; - this.tableOrigin = { - idOrigin, - idLink, - idName: "", - } - this.type = type; - } + constructor({ name = "", PK = false, FK = false, type = "INT", idOrigin = "", idLink = "" } = {}) { + this.FK = FK; + this.PK = PK; + this.NOT_NULL = false; + this.UNIQUE = false; + this.AUTO_INCREMENT = false; + this.defaultValue = ""; + this.name = name; + this.tableOrigin = { + idOrigin, + idLink, + idName: "", + } + this.type = type; + } } diff --git a/app/angular/view/view.html b/app/angular/view/view.html index 95ebd0ad..d519ce2b 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -1,58 +1,76 @@
    - - -
    -
    - - -
    + -
    - - -
    + +
    + {{ 'Based in' | translate }} + +
    -
    - - -
    -
    - -
    -
    -
    +
    + + +
    -
    - - -
    +
    + -
    - - -
    +
    +
    + +
    +
    +
    -
    +
    + + +
    + +
    + + +
    + +
    \ No newline at end of file diff --git a/app/angular/view/view.js b/app/angular/view/view.js index f13690dc..f2fa2bea 100644 --- a/app/angular/view/view.js +++ b/app/angular/view/view.js @@ -6,9 +6,9 @@ const app = angular.module("app.view", []); const Controller = function () { const $ctrl = this; - $ctrl.view = {}; + $ctrl.view = {}; - $ctrl.$onChanges = (changes) => { + $ctrl.$onChanges = (changes) => { if (changes.table != null && changes.table.currentValue != null) { $ctrl.view = changes.table.currentValue; } @@ -18,16 +18,16 @@ const Controller = function () { $ctrl.formVisible = !$ctrl.formVisible; }; - $ctrl.save = () => { - console.log($ctrl.view); - } + $ctrl.save = () => { + console.log($ctrl.view); + } }; export default app.component("view", { template: template, bindings: { - table: "<", - tables: "<", + table: "<", + tables: "<", }, controller: Controller, }).name; diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 774744e1..080c624a 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -1,98 +1,98 @@ export default { - 'Email': 'Email', - 'Password': 'Password', - 'Login': 'Login', - 'Create account': 'Create account', - 'Change language': 'Change language', - 'Recovery password': 'Recovery password', - 'Report a bug or request a feature': 'Report a bug or request a feature', - 'Back': 'Back', - 'Redefine password': 'Redefine password', - 'Confirm password': 'Confirm password', - 'Go to login': 'Go to login', - 'Select an element to edit': 'Select an element to edit', - 'Columns': 'Columns', - 'Type': 'Type', - 'PK': 'PK', - 'FK': 'FK', - 'Source': 'Source', - 'Cardinality': 'Cardinality', - 'Logical model of:': 'Logical model of:', - 'Save (CTRL S)': 'Save (CTRL S)', - 'Undo (CTRL Z)': 'Undo (CTRL Z)', - 'Redo (CTRL SHIFT Z)': 'Redo (CTRL SHIFT Z)', - 'Zoom in (Z +)': 'Zoom in (Z +)', - 'Zoom out (Z -)': 'Zoom out (Z -)', - 'Zoom 100% (Z 0)': 'Zoom 100% (Z 0)', - 'Duplicate': 'Duplicate', - 'Duplicate model': 'Duplicate model', - 'Generate SQL': 'Generate SQL', - 'Print (CTRL P)': 'Print (CTRL P)', - 'Specialize': 'Specialize', - 'Self relationship': 'Self relationship', - 'Add': 'Add', - 'Role': 'Role', - 'Weak': 'Weak', - 'Edit': 'Edit', - 'Composed': 'Composed', - 'Associative entity': 'Associative entity', - 'Transform': 'Transform', - 'Conceptual model of:': 'Conceptual model of:', - 'Generate logical model': 'Generate logical model', - 'Next': 'Next', - 'New model': 'New model', - 'Title': 'Title', - 'Model name': 'Model name', - 'Cancel': 'Cancel', - 'Delete': 'Delete', - 'Are you sure you want to delete the model?': 'Are you sure you want to delete the model?', - 'Rename': 'Rename', - 'Close': 'Close', - 'SQL': 'SQL', - 'Author': 'Author', - 'Created': 'Created', - 'Actions': 'Actions', - 'Models': 'Models', + 'Email': 'Email', + 'Password': 'Password', + 'Login': 'Login', + 'Create account': 'Create account', + 'Change language': 'Change language', + 'Recovery password': 'Recovery password', + 'Report a bug or request a feature': 'Report a bug or request a feature', + 'Back': 'Back', + 'Redefine password': 'Redefine password', + 'Confirm password': 'Confirm password', + 'Go to login': 'Go to login', + 'Select an element to edit': 'Select an element to edit', + 'Columns': 'Columns', + 'Type': 'Type', + 'PK': 'PK', + 'FK': 'FK', + 'Source': 'Source', + 'Cardinality': 'Cardinality', + 'Logical model of:': 'Logical model of:', + 'Save (CTRL S)': 'Save (CTRL S)', + 'Undo (CTRL Z)': 'Undo (CTRL Z)', + 'Redo (CTRL SHIFT Z)': 'Redo (CTRL SHIFT Z)', + 'Zoom in (Z +)': 'Zoom in (Z +)', + 'Zoom out (Z -)': 'Zoom out (Z -)', + 'Zoom 100% (Z 0)': 'Zoom 100% (Z 0)', + 'Duplicate': 'Duplicate', + 'Duplicate model': 'Duplicate model', + 'Generate SQL': 'Generate SQL', + 'Print (CTRL P)': 'Print (CTRL P)', + 'Specialize': 'Specialize', + 'Self relationship': 'Self relationship', + 'Add': 'Add', + 'Role': 'Role', + 'Weak': 'Weak', + 'Edit': 'Edit', + 'Composed': 'Composed', + 'Associative entity': 'Associative entity', + 'Transform': 'Transform', + 'Conceptual model of:': 'Conceptual model of:', + 'Generate logical model': 'Generate logical model', + 'Next': 'Next', 'New model': 'New model', - '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', + 'Title': 'Title', + 'Model name': 'Model name', + 'Cancel': 'Cancel', + 'Delete': 'Delete', + 'Are you sure you want to delete the model?': 'Are you sure you want to delete the model?', + 'Rename': 'Rename', + 'Close': 'Close', + 'SQL': 'SQL', + 'Author': 'Author', + 'Created': 'Created', + 'Actions': 'Actions', + 'Models': 'Models', + 'New model': 'New model', + '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', }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index b2637755..014df058 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -1,98 +1,98 @@ export default { - 'Email': 'Email', - 'Password': 'Senha', - 'Login': 'Entrar', - 'Create account': 'Criar conta', - 'Change language': 'Mudar idioma', - 'Recovery password': 'Recuperar senha', - 'Report a bug or request a feature': 'Reportar bug ou requisitar funcionalidade', - 'Back': 'Voltar', - 'Redefine password': 'Redefinir senha', - 'Confirm password': 'Confirmar senha', - 'Go to login': 'Ir para login', - 'Select an element to edit': 'Selecione um elemento para editar', - 'Columns': 'Colunas', - 'Type': 'Tipo', - 'PK': 'PK', - 'FK': 'FK', - 'Source': 'Origem', - 'Cardinality': 'Cardinalidade', - 'Logical model of:': 'Modelagem lógica de:', - 'Save (CTRL S)': 'Salvar (CTRL S)', - 'Undo (CTRL Z)': 'Desfazer (CTRL Z)', - 'Redo (CTRL SHIFT Z)': 'Refazer (CTRL SHIFT Z)', - 'Zoom in (Z +)': 'Mais zoom (Z +)', - 'Zoom out (Z -)': 'Menos zoom (Z -)', - 'Zoom 100% (Z 0)': 'Zoom 100% (Z 0)', - 'Duplicate': 'Duplicar', - 'Duplicate model': 'Duplicar modelagem', - 'Generate SQL': 'Gerar SQL', - 'Print (CTRL P)': 'Imprimir (CTRL P)', - 'Specialize': 'Especializar', - 'Self relationship': 'Auto relacionamento', - 'Add': 'Adicionar', - 'Role': 'Papel', - 'Weak': 'Fraco', - 'Edit': 'Editar', - 'Composed': 'Composto', - 'Associative entity': 'Entidade associativa', - 'Transform': 'Transformar', - 'Conceptual model of:': 'Modelagem conceitual de:', - 'Generate logical model': 'Gerar modelagem lógica', - 'Next': 'Avançar', + 'Email': 'Email', + 'Password': 'Senha', + 'Login': 'Entrar', + 'Create account': 'Criar conta', + 'Change language': 'Mudar idioma', + 'Recovery password': 'Recuperar senha', + 'Report a bug or request a feature': 'Reportar bug ou requisitar funcionalidade', + 'Back': 'Voltar', + 'Redefine password': 'Redefinir senha', + 'Confirm password': 'Confirmar senha', + 'Go to login': 'Ir para login', + 'Select an element to edit': 'Selecione um elemento para editar', + 'Columns': 'Colunas', + 'Type': 'Tipo', + 'PK': 'PK', + 'FK': 'FK', + 'Source': 'Origem', + 'Cardinality': 'Cardinalidade', + 'Logical model of:': 'Modelagem lógica de:', + 'Save (CTRL S)': 'Salvar (CTRL S)', + 'Undo (CTRL Z)': 'Desfazer (CTRL Z)', + 'Redo (CTRL SHIFT Z)': 'Refazer (CTRL SHIFT Z)', + 'Zoom in (Z +)': 'Mais zoom (Z +)', + 'Zoom out (Z -)': 'Menos zoom (Z -)', + 'Zoom 100% (Z 0)': 'Zoom 100% (Z 0)', + 'Duplicate': 'Duplicar', + 'Duplicate model': 'Duplicar modelagem', + 'Generate SQL': 'Gerar SQL', + 'Print (CTRL P)': 'Imprimir (CTRL P)', + 'Specialize': 'Especializar', + 'Self relationship': 'Auto relacionamento', + 'Add': 'Adicionar', + 'Role': 'Papel', + 'Weak': 'Fraco', + 'Edit': 'Editar', + 'Composed': 'Composto', + 'Associative entity': 'Entidade associativa', + 'Transform': 'Transformar', + 'Conceptual model of:': 'Modelagem conceitual de:', + 'Generate logical model': 'Gerar modelagem lógica', + 'Next': 'Avançar', 'New model': 'Novo modelo', - 'Title': 'Título', - 'Model name': 'Nome da modelagem', - 'Cancel': 'Cancelar', - 'Delete': 'Excluir', - 'Are you sure you want to delete the model?': 'Tem certeza que deseja excluir a modelagem?', - 'Rename': 'Renomear', - 'Close': 'Fechar', - 'SQL': 'SQL', - 'Author': 'Autor', - 'Created': 'Criação', - 'Actions': 'Ações', - 'Models': 'Modelagens', - 'New model': 'Nova modelagem', - 'BR Modelo Web': 'BR Modelo Web', - 'Conceptual': 'Conceitual', - 'Logical': 'Lógico', - 'Save': 'Salvar', - 'This email is not registered yet.': 'Esse email ainda não está cadastrado.', - 'The new password was successfully saved.': 'Nova senha salva com sucesso.', - 'The password must be the same in both fields.': 'A senha deve ser a mesma nos dois campos.', - 'The password must contain more than 6 digits.': 'Senha deve conter mais que 6 dígitos.', - 'Fill the fields in red': 'Preencha os campos em vermelho', - 'Password recovery code is invalid, request password recovery again!': 'Código de recuperação de senha é inválido, solicite a recuperação de senha novamente!', - 'This email is not registered yet.': 'Esse email ainda não está cadastrado.', - 'Ops, we had an internal error, please try again later...': 'Ops, tivemos um erro interno, por favor tente novamente mais tarde...', - 'An email with instructions has been sent to EMAIL': 'Um email com instruções foi enviado para {{email}}', - 'Incorrect login or password': 'Login ou senha incorretos', - 'Saved successfully!': 'Salvo com sucesso!', - 'The column name cannot be empty!': 'Nome da coluna não pode ficar vazio!', - 'Successfully duplicated!': 'Duplicado com sucesso!', - 'Select the foreign table source!': 'Selecione a origem da tabela estrangeira!', - '_converted': '_convertido', - 'MODEL_NAME (copy)': '{{name}} (cópia)', - 'New model name': 'Novo nome da modelagem', - 'Conversion Assistant - Specialization': 'Assistente de conversão - Especialização', - 'What do you want to do with inheritance from table TABLE_NAME?': 'O que deseja fazer com a herança partindo da tabela {{table}}?', - 'Use of a table for each entity': 'Uso de uma tabela para cada entidade', - 'Use of a single table for the entire hierarchy': 'Uso de uma única tabela para toda hierarquia', - 'Use of a table for specialized entity(ies) only': 'Uso de uma tabela apenas para entidade(s) especializada(s)', - 'Attention - Conversion Assistant - Specialization': 'Atenção - Assistente de conversão - Especialização', - 'It was not possible to perform this conversion because table TABLE_NAME has other connections. Choose another option.': 'Não foi possível realizar essa conversão pois a tabela {{table}} possui outras conexões. Escolha outra opção.', - 'Conversion Assistant: Multivalued Attribute': 'Assistente de conversão: Atributo multivalorado', - 'What do you want to do with multivalued attribute ATTR_NAME of table TABLE_NAME?': 'O que deseja fazer com atributo multivalorado {{attribute}} da tabela {{table}}?', - 'Conversion Assistant - Relationship (1, n)': 'Assistente de conversão - Relacionamento (1, n)', - 'What do you want to do with the RELATIONSHIP relationship between the TABLES tables?': 'O que deseja fazer com o relacionamento {{relationship}} entre as tabelas {{tables}}?', - 'Create a column in the least cardinality table': 'Criar uma coluna na tabela de menor cardinalidade', - 'Create new table': 'Criar nova tabela', - 'Conversion Assistant - Relationship (1, 1)': 'Assistente de conversão - Relacionamento (1, 1)', - 'Join tables': 'Unir tabelas', - 'Logout': 'Sair', - 'Unsaved changes': 'Alterações não salvas', - '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', + 'Title': 'Título', + 'Model name': 'Nome da modelagem', + 'Cancel': 'Cancelar', + 'Delete': 'Excluir', + 'Are you sure you want to delete the model?': 'Tem certeza que deseja excluir a modelagem?', + 'Rename': 'Renomear', + 'Close': 'Fechar', + 'SQL': 'SQL', + 'Author': 'Autor', + 'Created': 'Criação', + 'Actions': 'Ações', + 'Models': 'Modelagens', + 'New model': 'Nova modelagem', + 'BR Modelo Web': 'BR Modelo Web', + 'Conceptual': 'Conceitual', + 'Logical': 'Lógico', + 'Save': 'Salvar', + 'This email is not registered yet.': 'Esse email ainda não está cadastrado.', + 'The new password was successfully saved.': 'Nova senha salva com sucesso.', + 'The password must be the same in both fields.': 'A senha deve ser a mesma nos dois campos.', + 'The password must contain more than 6 digits.': 'Senha deve conter mais que 6 dígitos.', + 'Fill the fields in red': 'Preencha os campos em vermelho', + 'Password recovery code is invalid, request password recovery again!': 'Código de recuperação de senha é inválido, solicite a recuperação de senha novamente!', + 'This email is not registered yet.': 'Esse email ainda não está cadastrado.', + 'Ops, we had an internal error, please try again later...': 'Ops, tivemos um erro interno, por favor tente novamente mais tarde...', + 'An email with instructions has been sent to EMAIL': 'Um email com instruções foi enviado para {{email}}', + 'Incorrect login or password': 'Login ou senha incorretos', + 'Saved successfully!': 'Salvo com sucesso!', + 'The column name cannot be empty!': 'Nome da coluna não pode ficar vazio!', + 'Successfully duplicated!': 'Duplicado com sucesso!', + 'Select the foreign table source!': 'Selecione a origem da tabela estrangeira!', + '_converted': '_convertido', + 'MODEL_NAME (copy)': '{{name}} (cópia)', + 'New model name': 'Novo nome da modelagem', + 'Conversion Assistant - Specialization': 'Assistente de conversão - Especialização', + 'What do you want to do with inheritance from table TABLE_NAME?': 'O que deseja fazer com a herança partindo da tabela {{table}}?', + 'Use of a table for each entity': 'Uso de uma tabela para cada entidade', + 'Use of a single table for the entire hierarchy': 'Uso de uma única tabela para toda hierarquia', + 'Use of a table for specialized entity(ies) only': 'Uso de uma tabela apenas para entidade(s) especializada(s)', + 'Attention - Conversion Assistant - Specialization': 'Atenção - Assistente de conversão - Especialização', + 'It was not possible to perform this conversion because table TABLE_NAME has other connections. Choose another option.': 'Não foi possível realizar essa conversão pois a tabela {{table}} possui outras conexões. Escolha outra opção.', + 'Conversion Assistant: Multivalued Attribute': 'Assistente de conversão: Atributo multivalorado', + 'What do you want to do with multivalued attribute ATTR_NAME of table TABLE_NAME?': 'O que deseja fazer com atributo multivalorado {{attribute}} da tabela {{table}}?', + 'Conversion Assistant - Relationship (1, n)': 'Assistente de conversão - Relacionamento (1, n)', + 'What do you want to do with the RELATIONSHIP relationship between the TABLES tables?': 'O que deseja fazer com o relacionamento {{relationship}} entre as tabelas {{tables}}?', + 'Create a column in the least cardinality table': 'Criar uma coluna na tabela de menor cardinalidade', + 'Create new table': 'Criar nova tabela', + 'Conversion Assistant - Relationship (1, 1)': 'Assistente de conversão - Relacionamento (1, 1)', + 'Join tables': 'Unir tabelas', + 'Logout': 'Sair', + 'Unsaved changes': 'Alterações não salvas', + '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', }; \ No newline at end of file diff --git a/app/sass/app.scss b/app/sass/app.scss index 802f41b9..ce7161fa 100644 --- a/app/sass/app.scss +++ b/app/sass/app.scss @@ -15,5 +15,5 @@ @import 'sidebarPannel'; :root { - accent-color: #3d9970; + accent-color: #3d9970; } \ No newline at end of file From 16f5340a1e503fa09f35bcd7e4b59612d9e3e5a0 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 17:03:09 +0100 Subject: [PATCH 16/54] introduce "Delete" option to column edition - Rename .column-details-actions to .sidebar-block-actions (In favor to reuse it in other places without semantic conflicts) - Break .sidebar-block-actions in two main areas: - .actions-regular - .actions-destructive - Add styles to .br-button.destructive - Slightly change .br-button-yellow color --- app/angular/logic/columnForm.html | 11 ++++++++--- app/sass/buttons.scss | 17 +++++++++++++---- app/sass/sidebarPannel.scss | 27 ++++++++++++++++++--------- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html index 316bfebe..f67410e5 100644 --- a/app/angular/logic/columnForm.html +++ b/app/angular/logic/columnForm.html @@ -92,8 +92,13 @@
    -
    - - +
    +
    + + +
    +
    + +
    \ No newline at end of file diff --git a/app/sass/buttons.scss b/app/sass/buttons.scss index beb20eb2..fedd99af 100644 --- a/app/sass/buttons.scss +++ b/app/sass/buttons.scss @@ -27,12 +27,22 @@ } .br-button.yellow { - border-color: #dd7c58; - color: #dd7c58; + border-color: #f58056; + color: #f58056; } .br-button.yellow:hover { - background: #dd7c58; + background: #f58056; + color: #fff; +} + +.br-button.destructive { + border-color: #af1010; + color: #af1010; +} + +.br-button.destructive:hover { + background: #af1010; color: #fff; } @@ -44,7 +54,6 @@ } //////////////////////////////////////////////////////////////////////////////// - // .btn-alt //////////////////////////////////////////////////////////////////////////////// .btn-alt { diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index d1435bda..2078c662 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -89,19 +89,28 @@ .column-details-content .form-group {margin-bottom: 12px;} +.column-details .checkbox { margin: 4px 0; } + //////////////////////////////////////////////////////////////////////////////// -// +// .column-details-action //////////////////////////////////////////////////////////////////////////////// -.column-details-actions { - display: flex; - display: flex; - flex-direction: row; - justify-content: space-between; +.sidebar-block-actions { align-items: center; border-top: 1px solid #ddd; - padding-top: 12px;; + padding-top: 12px; } -.column-details-actions .br-button {width: 50%;} +.sidebar-block-actions .actions-regular { + box-sizing: border-box; + margin-bottom: 12px; +} + +.sidebar-block-actions .actions-regular .br-button { + display: inline-block; + width: calc(50% - 6px); + margin: 0; +} -.column-details .checkbox { margin: 4px 0; } \ No newline at end of file +.sidebar-block-actions .actions-regular .br-button:first-child { + margin-right: 8px; +} \ No newline at end of file From b1f589efbf2f43bd788e379cd767e47d9443588a Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 17:15:23 +0100 Subject: [PATCH 17/54] Small adjustments to .sidebar-block-actions - Change the approach to deal space between regular and destructive actions --- app/sass/sidebarPannel.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index 2078c662..9c0d86ad 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -100,9 +100,13 @@ padding-top: 12px; } -.sidebar-block-actions .actions-regular { +.sidebar-block-actions .actions-regular, +.sidebar-block-actions .actions-destructive { box-sizing: border-box; - margin-bottom: 12px; +} + +.sidebar-block-actions .actions-destructive{ + padding-top: 12px; } .sidebar-block-actions .actions-regular .br-button { From 26f79b06ff68edb9d2d89a9644fa901e472ca46f Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 20:44:21 +0100 Subject: [PATCH 18/54] Rename .column-details to .card-item .column-detail is being reused in views. TO avoid confusion and use a more generic name, I'm changing it to .card-item. --- app/angular/logic/logic.html | 4 ++-- app/angular/view/view.html | 4 ++-- app/sass/sidebarPannel.scss | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/angular/logic/logic.html b/app/angular/logic/logic.html index 5f881a52..59fad23c 100644 --- a/app/angular/logic/logic.html +++ b/app/angular/logic/logic.html @@ -92,7 +92,7 @@

    {{ 'Columns' | translate }}

      -
    • +

    • {{column.name}}

      PK @@ -102,7 +102,7 @@

      {{column.name}}

    -
    +
    diff --git a/app/angular/view/view.html b/app/angular/view/view.html index d519ce2b..df66ef65 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -8,7 +8,7 @@ {{'Criar view' | translate }} -
    +
    {{ 'Based in' | translate }}
    -
    +
    - - - -
  • -
    -

    Patient

    -
    -
    • - -
    -

    - -
    -
    -

    Views

    - -
    -
    -
    - \ No newline at end of file From c1008da470d9e2aabaa4acc51c193a4d85f56325 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 20:56:36 +0100 Subject: [PATCH 20/54] Rename .yellow to .warning classname What if tomorrow the .yellow class have a purple color? --- app/angular/components/confirmationModal.html | 2 +- app/angular/components/createModelModal.html | 2 +- app/angular/components/deleteModelModal.html | 2 +- app/angular/components/duplicateModelModal.html | 2 +- app/angular/components/renameModelModal.html | 10 +++++----- app/angular/components/sqlGeneratorModal.html | 2 +- app/angular/logic/columnForm.html | 2 +- app/angular/view/view.html | 2 +- app/sass/buttons.scss | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/angular/components/confirmationModal.html b/app/angular/components/confirmationModal.html index fee9bbeb..2af59a72 100644 --- a/app/angular/components/confirmationModal.html +++ b/app/angular/components/confirmationModal.html @@ -7,6 +7,6 @@

    {{$ctrl.title}}

    - +
    \ No newline at end of file diff --git a/app/angular/components/createModelModal.html b/app/angular/components/createModelModal.html index 00aaf4e8..6168c378 100644 --- a/app/angular/components/createModelModal.html +++ b/app/angular/components/createModelModal.html @@ -31,6 +31,6 @@

    {{ 'New model' | translate }}

    - +
    \ No newline at end of file diff --git a/app/angular/components/deleteModelModal.html b/app/angular/components/deleteModelModal.html index e5029221..43272783 100644 --- a/app/angular/components/deleteModelModal.html +++ b/app/angular/components/deleteModelModal.html @@ -7,6 +7,6 @@

    {{ 'Delete model' | translate }}

    - +
    \ No newline at end of file diff --git a/app/angular/components/duplicateModelModal.html b/app/angular/components/duplicateModelModal.html index 6ecd9c69..cf6d276e 100644 --- a/app/angular/components/duplicateModelModal.html +++ b/app/angular/components/duplicateModelModal.html @@ -23,6 +23,6 @@

    {{ 'Duplicate model' | translate }}

    - +
    \ No newline at end of file diff --git a/app/angular/components/renameModelModal.html b/app/angular/components/renameModelModal.html index 20258d26..60dc0ff8 100644 --- a/app/angular/components/renameModelModal.html +++ b/app/angular/components/renameModelModal.html @@ -5,13 +5,13 @@

    {{ 'Rename model' | translate }}

    - +
    - {{ 'Rename model' | translate }}
    - +
    \ No newline at end of file diff --git a/app/angular/components/sqlGeneratorModal.html b/app/angular/components/sqlGeneratorModal.html index 2eb2bd29..466e1ce6 100644 --- a/app/angular/components/sqlGeneratorModal.html +++ b/app/angular/components/sqlGeneratorModal.html @@ -10,7 +10,7 @@

    {{ 'SQL' | translate }}

    - +
    diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html index f67410e5..fc49b735 100644 --- a/app/angular/logic/columnForm.html +++ b/app/angular/logic/columnForm.html @@ -95,7 +95,7 @@
    - +
    diff --git a/app/angular/view/view.html b/app/angular/view/view.html index df66ef65..e897aac0 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -65,7 +65,7 @@ {{ 'Save' | translate }}
    diff --git a/app/sass/app.scss b/app/sass/app.scss index ce7161fa..f93beb8e 100644 --- a/app/sass/app.scss +++ b/app/sass/app.scss @@ -13,6 +13,7 @@ @import 'print.scss'; @import 'joint-custom.scss'; @import 'sidebarPannel'; +@import 'table-preview.scss'; :root { accent-color: #3d9970; diff --git a/app/sass/table-preview.scss b/app/sass/table-preview.scss new file mode 100644 index 00000000..0d95de2b --- /dev/null +++ b/app/sass/table-preview.scss @@ -0,0 +1,36 @@ +//////////////////////////////////////////////////////////////////////////////// +// .table-preview +//////////////////////////////////////////////////////////////////////////////// +.table-preview { + border: 1px solid #bdbdbd; + border-radius: 2px 2px 0 0; +} + +.table-preview header { + padding: 12px 8px; + border-bottom: 1px solid #bdbdbd; + font-size: 1.3em; + background-color: rgba(#000, 0.1); // Fallback color +} + +.table-preview header h5 { + font-family: monospace; + font-weight: 500; + margin: 0; +} + +//////////////////////////////////////////////////////////////////////////////// +// .table-preview-body +//////////////////////////////////////////////////////////////////////////////// +.table-preview-body .checkbox { + padding: 6px 8px; + margin: 0; +} + +.table-preview-body .checkbox:not(:last-child) { + border-bottom: 1px solid #bdbdbd; +} + +.table-preview-body .checkbox label { + font-size: 0.9em; +} From 3d31ed34773f54d7da48b7ae397a76c0845bfa42 Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 23:23:50 +0100 Subject: [PATCH 22/54] Add .query-expression-textarea - Set min-height for .query-expression-textarea --- app/angular/view/view.html | 2 +- app/sass/form.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/angular/view/view.html b/app/angular/view/view.html index f35c1504..0ad045d8 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -58,7 +58,7 @@
    TableNameGoesHere
    diff --git a/app/sass/form.scss b/app/sass/form.scss index a60c5df6..051f2fee 100644 --- a/app/sass/form.scss +++ b/app/sass/form.scss @@ -183,4 +183,8 @@ input[type="checkbox"] { .checkbox > label { word-break: break-all; +} + +.query-expression-textarea { + min-height: 125px; } \ No newline at end of file From 1cc674393fd421e2559fb07968b86e1754afb64a Mon Sep 17 00:00:00 2001 From: "Idmar Ramos Jr. (Id)" Date: Sun, 5 Dec 2021 23:31:30 +0100 Subject: [PATCH 23/54] .sidebar-block-action -> .card-item-actions - Follow semantics and use .card-item-actions as part of .card-item :) - Fix markup at views.html --- app/angular/logic/columnForm.html | 2 +- app/angular/view/view.html | 19 +++++++------------ app/sass/sidebarPannel.scss | 14 +++++++------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html index fc49b735..3795b5ea 100644 --- a/app/angular/logic/columnForm.html +++ b/app/angular/logic/columnForm.html @@ -92,7 +92,7 @@ -
    +
    diff --git a/app/angular/view/view.html b/app/angular/view/view.html index 0ad045d8..82884e63 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -64,18 +64,13 @@
    TableNameGoesHere
    - - +
    + + +
    +
    + +
    diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index d0c3a22d..8339923b 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -92,29 +92,29 @@ .card-item .checkbox { margin: 4px 0; } //////////////////////////////////////////////////////////////////////////////// -// .card-item-action +// .card-item-actions //////////////////////////////////////////////////////////////////////////////// -.sidebar-block-actions { +.card-item-actions { align-items: center; border-top: 1px solid #ddd; padding-top: 12px; } -.sidebar-block-actions .actions-regular, -.sidebar-block-actions .actions-destructive { +.card-item-actions .actions-regular, +.card-item-actions .actions-destructive { box-sizing: border-box; } -.sidebar-block-actions .actions-destructive{ +.card-item-actions .actions-destructive{ padding-top: 12px; } -.sidebar-block-actions .actions-regular .br-button { +.card-item-actions .actions-regular .br-button { display: inline-block; width: calc(50% - 6px); margin: 0; } -.sidebar-block-actions .actions-regular .br-button:first-child { +.card-item-actions .actions-regular .br-button:first-child { margin-right: 8px; } \ No newline at end of file From 2d0225a6020b8313780bec7689f472ae119c43bb Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 5 Dec 2021 21:26:46 -0300 Subject: [PATCH 24/54] Create sidebarControlLogical component --- app/angular/logic/logic.html | 151 +------------------------- app/angular/logic/logic.js | 98 +---------------- app/angular/logic/sidebarControl.html | 91 ++++++++++++++++ app/angular/logic/sidebarControl.js | 124 +++++++++++++++++++++ 4 files changed, 219 insertions(+), 245 deletions(-) create mode 100644 app/angular/logic/sidebarControl.html create mode 100644 app/angular/logic/sidebarControl.js diff --git a/app/angular/logic/logic.html b/app/angular/logic/logic.html index 5f881a52..07de69f7 100644 --- a/app/angular/logic/logic.html +++ b/app/angular/logic/logic.html @@ -48,157 +48,10 @@

    {{ 'Logical model of:' | translate }} {{$ctrl.model.nam - - + + diff --git a/app/angular/logic/logic.js b/app/angular/logic/logic.js index 3ddb0c72..ef876b75 100644 --- a/app/angular/logic/logic.js +++ b/app/angular/logic/logic.js @@ -3,10 +3,10 @@ import template from "./logic.html"; import sqlGeneratorService from "../service/sqlGeneratorService"; import sqlGeneratorModal from "../components/sqlGeneratorModal"; import duplicateModelModal from "../components/duplicateModelModal"; -import Column from "../service/Column"; import preventExitServiceModule from "../service/preventExitService"; import view from "../view/view"; import columnForm from "./columnForm"; +import sidebarControlLogical from "./sidebarControl"; const controller = function ( $rootScope, @@ -47,20 +47,6 @@ const controller = function ( type: "success" } - ctrl.sections = { - tableProperties: true, - columns: false, - views: false, - } - - ctrl.toggleSection = (section) => { - ctrl.sections[section] = !ctrl.sections[section]; - } - - ctrl.changeVisible = function () { - ctrl.editionVisible = !ctrl.editionVisible; - } - ctrl.print = function () { window.print(); } @@ -74,12 +60,6 @@ const controller = function ( LogicService.buildWorkspace($stateParams.references.modelid, $rootScope.loggeduser, ctrl.stopLoading, $stateParams.references.conversionId); } - ctrl.closeAllColumns = function () { - for (var i = 0; i < ctrl.columns.length; i++) { - ctrl.columns[i].expanded = false; - } - } - ctrl.showFeedback = function (newMessage, show, type) { ctrl.feedback.message = $filter('translate')(newMessage); ctrl.feedback.showing = show; @@ -111,10 +91,6 @@ const controller = function ( $timeout(() => { ctrl.selectedLink = null; ctrl.selectedElement = element; - if (element != null) { - ctrl.selectedName = element.attributes.name; - ctrl.selectedType = element.attributes.type; - } }); }); @@ -169,76 +145,6 @@ const controller = function ( LogicService.editCardinalityB(card); } - ctrl.changeName = function () { - if (ctrl.selectedName != null && ctrl.selectedName != "") { - LogicService.editName(ctrl.selectedName); - } - } - - ctrl.deleteColumn = function (column, $index) { - LogicService.deleteColumn($index); - } - - ctrl.editionColumnMode = function (column) { - loadTables(); - ctrl.editColumnModel = JSON.parse(JSON.stringify(column)); - - ctrl.closeAllColumns(); - - column.expanded = true; - } - - ctrl.editColumn = function (editedColumn, $index) { - if (editedColumn.name == "") { - ctrl.showFeedback("The column name cannot be empty!", true, "error"); - return; - } - - LogicService.editColumn($index, editedColumn); - - ctrl.closeAllColumns(); - } - - ctrl.addColumn = function (column) { - if (column.name == "") { - ctrl.showFeedback("The column name cannot be empty!", true, "error"); - return; - } - - if (column.FK && column.tableOrigin.idName == "") { - ctrl.showFeedback("Select the foreign table source!", true, "error"); - return; - } else { - column.tableOrigin.idOrigin = ctrl.mapTables.get(column.tableOrigin.idName); - } - - LogicService.addColumn(column); - ctrl.addColumnModel = ctrl.newColumnObject(); - ctrl.addColumnVisible = false; - } - - const loadTables = () => { - ctrl.tableNames = []; - ctrl.mapTables = LogicService.getTablesMap(); - for (var key of ctrl.mapTables.keys()) { - ctrl.tableNames.push({"name": key, "type": key}); - } - } - - ctrl.showAddColumn = function (show) { - ctrl.addColumnVisible = show; - ctrl.addColumnModel = ctrl.newColumnObject(); - - loadTables(); - } - - ctrl.newColumnObject = function () { - return new Column(); - } - - ctrl.addColumnModel = ctrl.newColumnObject(); - ctrl.editColumnModel = ctrl.newColumnObject(); - ctrl.undoModel = function () { LogicService.undo(); } @@ -319,7 +225,7 @@ const controller = function ( }; export default angular - .module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule, view, columnForm]) + .module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule, view, columnForm, sidebarControlLogical]) .component("editorLogic", { template, controller, diff --git a/app/angular/logic/sidebarControl.html b/app/angular/logic/sidebarControl.html new file mode 100644 index 00000000..5e9cc2df --- /dev/null +++ b/app/angular/logic/sidebarControl.html @@ -0,0 +1,91 @@ + \ No newline at end of file diff --git a/app/angular/logic/sidebarControl.js b/app/angular/logic/sidebarControl.js new file mode 100644 index 00000000..c941351b --- /dev/null +++ b/app/angular/logic/sidebarControl.js @@ -0,0 +1,124 @@ +import angular from "angular"; +import template from "./sidebarControl.html"; +import Column from "../service/Column"; + +const app = angular.module("app.sidebarControl", []); + +const Controller = function (LogicService) { + const $ctrl = this; + + $ctrl.visible = true; + + $ctrl.sections = { + tableProperties: true, + columns: false, + views: false, + } + + $ctrl.toggleSection = (section) => { + $ctrl.sections[section] = !$ctrl.sections[section]; + } + + $ctrl.changeVisible = () => { + $ctrl.visible = !$ctrl.visible; + } + + $ctrl.changeName = () => { + if ($ctrl.selectedName) { + LogicService.editName($ctrl.selectedName); + } + } + + $ctrl.deleteColumn = ($index) => { + LogicService.deleteColumn($index); + } + + $ctrl.editionColumnMode = (column) => { + loadTables(); + $ctrl.editColumnModel = JSON.parse(JSON.stringify(column)); + $ctrl.closeAllColumns(); + column.expanded = true; + } + + $ctrl.editColumn = (editedColumn, $index) => { + if (editedColumn.name == "") { + $ctrl.showFeedback("The column name cannot be empty!", true, "error"); + return; + } + + LogicService.editColumn($index, editedColumn); + + $ctrl.closeAllColumns(); + } + + $ctrl.closeAllColumns = function () { + $ctrl.columns.forEach(column => { + column.expanded = false; + }); + } + + $ctrl.addColumn = function (column) { + if (column.name == "") { + $ctrl.showFeedback("The column name cannot be empty!", true, "error"); + return; + } + + if (column.FK && column.tableOrigin.idName == "") { + $ctrl.showFeedback("Select the foreign table source!", true, "error"); + return; + } else { + column.tableOrigin.idOrigin = $ctrl.mapTables.get(column.tableOrigin.idName); + } + + LogicService.addColumn(column); + $ctrl.addColumnModel = $ctrl.newColumnObject(); + $ctrl.addColumnVisible = false; + } + + $ctrl.showAddColumn = function (show) { + $ctrl.addColumnVisible = show; + $ctrl.addColumnModel = $ctrl.newColumnObject(); + loadTables(); + } + + const loadTables = () => { + $ctrl.tableNames = []; + $ctrl.mapTables = LogicService.getTablesMap(); + for (var key of $ctrl.mapTables.keys()) { + $ctrl.tableNames.push({ name: key, type: key }); + } + } + + $ctrl.newColumnObject = function () { + return new Column(); + } + + $ctrl.addColumnModel = $ctrl.newColumnObject(); + $ctrl.editColumnModel = $ctrl.newColumnObject(); + + const clearSidebar = () => { + $ctrl.selectedElement = null; + $ctrl.selectedName = null; + $ctrl.selectedType = null; + $ctrl.columns = null; + } + + $ctrl.$onChanges = (changes) => { + if (!changes.selected.currentValue) clearSidebar(); + if (changes.selected != null && changes.selected.currentValue != null) { + $ctrl.selectedElement = changes.selected.currentValue; + $ctrl.selectedName = changes.selected.currentValue.attributes.name; + $ctrl.selectedType = changes.selected.currentValue.attributes.type; + $ctrl.columns = changes.selected.currentValue.attributes.objects; + } + } +}; + +export default app.component("sidebarControlLogical", { + template: template, + bindings: { + selected: "<", + showFeedback: "<", + }, + controller: Controller, +}).name; From a6944516d29fd0ecef5151651b1b9a5bb4ec689c Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 5 Dec 2021 22:08:40 -0300 Subject: [PATCH 25/54] Add delete column function --- app/angular/logic/columnForm.html | 4 ++-- app/angular/logic/columnForm.js | 3 ++- app/angular/logic/sidebarControl.html | 22 +--------------------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html index 3795b5ea..d457905b 100644 --- a/app/angular/logic/columnForm.html +++ b/app/angular/logic/columnForm.html @@ -97,8 +97,8 @@ -
    - +
    +

    \ No newline at end of file diff --git a/app/angular/logic/columnForm.js b/app/angular/logic/columnForm.js index bc4bf31f..c06b3699 100644 --- a/app/angular/logic/columnForm.js +++ b/app/angular/logic/columnForm.js @@ -30,7 +30,8 @@ export default app.component("columnForm", { dismiss: "&", column: "<", index: "<", - tableNames: "<" + tableNames: "<", + delete: "<" }, controller: Controller, }).name; diff --git a/app/angular/logic/sidebarControl.html b/app/angular/logic/sidebarControl.html index 0436e74e..3c784f27 100644 --- a/app/angular/logic/sidebarControl.html +++ b/app/angular/logic/sidebarControl.html @@ -47,7 +47,7 @@

    {{column.name}}

    PK - + @@ -57,26 +57,6 @@

    {{column.name}}

    -
    -
    - - -
    - -
    - - -
    -
    -

    {{ 'Views' | translate }}

    From f0ff10b1377efbfd6d40a9c45a9bfb89fea5642b Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Tue, 7 Dec 2021 09:15:51 -0300 Subject: [PATCH 26/54] Add translates and fix label --- app/angular/logic/sidebarControl.js | 6 +++--- app/angular/view/view.html | 6 +++--- app/i18n/languages/en.js | 7 +++++++ app/i18n/languages/pt_BR.js | 7 +++++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/angular/logic/sidebarControl.js b/app/angular/logic/sidebarControl.js index c941351b..36e9cf52 100644 --- a/app/angular/logic/sidebarControl.js +++ b/app/angular/logic/sidebarControl.js @@ -34,7 +34,7 @@ const Controller = function (LogicService) { } $ctrl.editionColumnMode = (column) => { - loadTables(); + loadTableNames(); $ctrl.editColumnModel = JSON.parse(JSON.stringify(column)); $ctrl.closeAllColumns(); column.expanded = true; @@ -78,10 +78,10 @@ const Controller = function (LogicService) { $ctrl.showAddColumn = function (show) { $ctrl.addColumnVisible = show; $ctrl.addColumnModel = $ctrl.newColumnObject(); - loadTables(); + loadTableNames(); } - const loadTables = () => { + const loadTableNames = () => { $ctrl.tableNames = []; $ctrl.mapTables = LogicService.getTablesMap(); for (var key of $ctrl.mapTables.keys()) { diff --git a/app/angular/view/view.html b/app/angular/view/view.html index 82884e63..d172ce91 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -5,12 +5,12 @@ ng-show="!$ctrl.formVisible" ng-click="$ctrl.toggleForm()" > - {{'Criar view' | translate }} + {{'Create view' | translate }}
    - {{ 'Based in' | translate }} +
    - +
    diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 080c624a..27d1e0ac 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -95,4 +95,11 @@ 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', + 'Views': 'Views', + 'Columns': 'Columns', + 'Table properties': 'Table properties', + 'Based in': 'Based in', + 'View columns': 'View columns', + 'Query expression': 'Query expression', + 'Create view': 'Create view', }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index 014df058..1543e589 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -95,4 +95,11 @@ 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', + 'Views': 'Visões', + 'Columns': 'Colunas', + 'Table properties': 'Propriedades da tabela', + 'Based in': 'Tabela base', + 'View columns': 'Colunas da visão', + 'Query expression': 'Query expression', + 'Create view': 'Criar visão', }; \ No newline at end of file From fe9ef21aeb132af3124f240e7fa8ed715fd498fa Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sat, 18 Dec 2021 15:23:26 -0300 Subject: [PATCH 27/54] Edit view and show views list --- app/angular/logic/sidebarControl.html | 19 ++++++++++-- app/angular/logic/sidebarControl.js | 15 +++++++++ app/angular/service/logicService.js | 32 +++++++++++++++++++ app/angular/view/view.html | 35 ++++++++++++--------- app/angular/view/view.js | 44 ++++++++++++++++++++++----- app/joint/table.js | 30 +++++------------- app/sass/sidebarPannel.scss | 29 +++++++++++++++++- app/sass/table-preview.scss | 1 + 8 files changed, 158 insertions(+), 47 deletions(-) diff --git a/app/angular/logic/sidebarControl.html b/app/angular/logic/sidebarControl.html index 3c784f27..94cdf3a6 100644 --- a/app/angular/logic/sidebarControl.html +++ b/app/angular/logic/sidebarControl.html @@ -63,9 +63,24 @@

    {{ 'Views' | translate }}

    -
    - +
    +
      +
    • +
      + +

      {{view.name}}

      +
      + + +
      • +
    + +
    +
    + +
    +
    \ No newline at end of file diff --git a/app/angular/logic/sidebarControl.js b/app/angular/logic/sidebarControl.js index 36e9cf52..5cfa0d44 100644 --- a/app/angular/logic/sidebarControl.js +++ b/app/angular/logic/sidebarControl.js @@ -8,6 +8,7 @@ const Controller = function (LogicService) { const $ctrl = this; $ctrl.visible = true; + $ctrl.views = []; $ctrl.sections = { tableProperties: true, @@ -40,6 +41,17 @@ const Controller = function (LogicService) { column.expanded = true; } + $ctrl.closeAllViews = () => { + $ctrl.views.forEach(view => { + view.expanded = false; + }); + } + + $ctrl.editView = (view) => { + $ctrl.closeAllViews(); + view.expanded = true; + } + $ctrl.editColumn = (editedColumn, $index) => { if (editedColumn.name == "") { $ctrl.showFeedback("The column name cannot be empty!", true, "error"); @@ -110,6 +122,9 @@ const Controller = function (LogicService) { $ctrl.selectedName = changes.selected.currentValue.attributes.name; $ctrl.selectedType = changes.selected.currentValue.attributes.type; $ctrl.columns = changes.selected.currentValue.attributes.objects; + if ($ctrl.selectedType === 'uml.Class') { + $ctrl.views = LogicService.loadViewsByTable(changes.selected.currentValue.id); + } } } }; diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index 76cdbf0d..a90ba7a2 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -395,6 +395,11 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) $rootScope.$broadcast('element:update', ls.selectedElement); } + ls.save = function (view) { + ls.selectedElement.model.saveView(view); + $rootScope.$broadcast('element:update', ls.selectedElement); + } + ls.addColumn = function (column) { if (column.FK) { var myLink = new joint.shapes.erd.Line({ @@ -467,6 +472,33 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) return map; } + const isTable = (element) => element.attributes.type === 'uml.Class'; + + const isView = (element) => element.attributes.type === 'uml.Abstract'; + + const filterViewsByTableId = (views, tableId) => views.some(({ id }) => id === tableId); + + ls.loadTables = () => { + const elements = ls.graph.getElements(); + return elements.filter(isTable).map(element => ({ + name: element.attributes.name, + columns: element.attributes.objects.map(object => ({ ...object, selected: false })), + id: element.id + })); + }; + + ls.filterTablesWithRelationship = (tableId) => { + const tables = ls.loadTables(); + return tables.filter(table => table.columns.some(({ tableOrigin }) => tableOrigin.idOrigin === tableId)); + } + + ls.loadViewsByTable = (tableId) => { + const elements = ls.graph.getElements(); + return elements.filter(isView) + .filter(({ attributes }) => filterViewsByTableId(attributes.objects, tableId)) + .map(({ attributes }) => ({ name: attributes.name, tables: attributes.objects })); + } + ls.buildTablesJson = function () { var map = new Map(); var elements = ls.graph.getElements(); diff --git a/app/angular/view/view.html b/app/angular/view/view.html index d172ce91..5d2cc439 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -2,22 +2,26 @@ - +
    - + +
    + +
    @@ -27,24 +31,25 @@ type="text" class="form-control" ng-model="$ctrl.view.name" + ng-change="$ctrl.changeName()" />
    -
    +
    -
    TableNameGoesHere
    +
    {{ table.name }}
    -
    +
    @@ -66,12 +71,12 @@
    TableNameGoesHere
    - +
    - +
    \ No newline at end of file diff --git a/app/angular/view/view.js b/app/angular/view/view.js index f2fa2bea..2379d90e 100644 --- a/app/angular/view/view.js +++ b/app/angular/view/view.js @@ -3,14 +3,27 @@ import template from "./view.html"; const app = angular.module("app.view", []); -const Controller = function () { +const Controller = function (LogicService) { const $ctrl = this; - $ctrl.view = {}; + $ctrl.$onInit = () => { + const allTables = LogicService.loadTables(); + $ctrl.tables = $ctrl.view.tables; + allTables.forEach(table => { + if ($ctrl.tables.some(({ name }) => table.name === name)) return; + $ctrl.tables.push(table); + }); + }; + + $ctrl.changeName = () => { + if ($ctrl.view.name) { + LogicService.editName($ctrl.view.name); + } + } $ctrl.$onChanges = (changes) => { - if (changes.table != null && changes.table.currentValue != null) { - $ctrl.view = changes.table.currentValue; + if (changes.view != null && changes.view.currentValue != null) { + $ctrl.view = changes.view.currentValue; } } @@ -18,16 +31,33 @@ const Controller = function () { $ctrl.formVisible = !$ctrl.formVisible; }; + $ctrl.cancel = () => { + $ctrl.dismiss(); + }; + $ctrl.save = () => { - console.log($ctrl.view); + let columns = []; + const filteredTables = $ctrl.tables.filter(({ selected }) => selected); + filteredTables.forEach(table => { + table.columns.forEach(column => { + if (column.selected) columns.push(column); + }) + }) + const view = { + ...$ctrl.view, + basedIn: filteredTables, + columns, + } + LogicService.save(view); } }; export default app.component("view", { template: template, bindings: { - table: "<", - tables: "<", + view: "<", + isEdit: "<", + dismiss: "<" }, controller: Controller, }).name; diff --git a/app/joint/table.js b/app/joint/table.js index ffd63242..85bad49b 100644 --- a/app/joint/table.js +++ b/app/joint/table.js @@ -182,34 +182,20 @@ uml.Abstract = joint.shapes.basic.Generic.extend({ return this.get('name'); }, - addAttribute: function (obj) { - if (obj.PK) { - obj.name = obj.name + ": PK"; - } - - if (obj.FK) { - obj.name = obj.name + ": FK"; - } - - this.get('attributes').push(obj.name); - this.get('objects').push(obj); + saveView: function (view) { + this.set('attributes', view.columns.map(column => column.name)); + this.set('objects', view.basedIn); this.updateRectangles(); this.trigger('uml-update'); - }, + }, - deleteColumn: function (index) { - this.get('attributes').splice(index, 1); - this.get('objects').splice(index, 1); + addAttributes: function (objects) { + objects.forEach(({ name }) => this.get('attributes').push(name)); + this.get('objects').push(objects); this.updateRectangles(); this.trigger('uml-update'); - }, + }, - editColumn: function (index, name, object) { - this.get('attributes')[index] = name; - this.get('objects')[index] = object; - this.updateRectangles(); - this.trigger('uml-update'); - }, updateRectangles: function () { diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index 8339923b..7adab77c 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -65,7 +65,6 @@ flex-direction: row; align-items: center; justify-content: space-between; - ; } .card-item .table-title { @@ -117,4 +116,32 @@ .card-item-actions .actions-regular .br-button:first-child { margin-right: 8px; +} + +.views-list { + list-style: none; + padding: 0; +} + +.view-item { + padding: 12px 8px; + border: 1px solid #ddd; + border-radius: 3px; + margin-bottom: 8px; + cursor: pointer; +} + +.view-item header { + display: flex; + align-items: center; +} + +.view-item header i { + font-size: 16px; +} + +.view-item header h4 { + font-size: 14px; + font-weight: 400; + margin: 0 0 0 4px; } \ No newline at end of file diff --git a/app/sass/table-preview.scss b/app/sass/table-preview.scss index 0d95de2b..aa446fc6 100644 --- a/app/sass/table-preview.scss +++ b/app/sass/table-preview.scss @@ -4,6 +4,7 @@ .table-preview { border: 1px solid #bdbdbd; border-radius: 2px 2px 0 0; + margin-bottom: 12px; } .table-preview header { From dd5b936ba5021607f11186fcede02bf9c464ec85 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 9 Jan 2022 16:22:24 -0300 Subject: [PATCH 28/54] Add CheckConstraint component --- app/angular/components/dropdown.html | 4 +- app/angular/logic/checkConstraint.html | 41 +++++++++++ app/angular/logic/checkConstraint.js | 56 +++++++++++++++ app/angular/logic/columnForm.html | 98 ++++++++++++++------------ app/angular/logic/logic.js | 3 +- app/sass/sidebarPannel.scss | 13 ++++ 6 files changed, 165 insertions(+), 50 deletions(-) create mode 100644 app/angular/logic/checkConstraint.html create mode 100644 app/angular/logic/checkConstraint.js diff --git a/app/angular/components/dropdown.html b/app/angular/components/dropdown.html index 9b399acf..e1ff4900 100644 --- a/app/angular/components/dropdown.html +++ b/app/angular/components/dropdown.html @@ -1,8 +1,8 @@
    - +
      -
    • {{option.name}}
      • +
    • {{ option.name | translate }}
    diff --git a/app/angular/logic/checkConstraint.html b/app/angular/logic/checkConstraint.html new file mode 100644 index 00000000..6d1262f1 --- /dev/null +++ b/app/angular/logic/checkConstraint.html @@ -0,0 +1,41 @@ +
    +
    +
    + + + +
    + +
    + + + +
    +
    + +
    + + + +
    + + {{ $ctrl.isManual ? 'Show options to create constraint' : 'Create check constraint manually' | translate }} +
    \ No newline at end of file diff --git a/app/angular/logic/checkConstraint.js b/app/angular/logic/checkConstraint.js new file mode 100644 index 00000000..311f3b09 --- /dev/null +++ b/app/angular/logic/checkConstraint.js @@ -0,0 +1,56 @@ +import angular from "angular"; +import template from "./checkConstraint.html"; + +const app = angular.module("app.checkConstraint", []); + +const Controller = function () { + const $ctrl = this; + + $ctrl.isManual = true; + + $ctrl.toggleFormType = () => { + $ctrl.isManual = !$ctrl.isManual; + } + + $ctrl.checkConstraintOptions = { + NUMBER: [ + { name: 'Equal to', type: 'EQUAL_TO' }, + { name: 'Not equal to', type: 'NOT_EQUAL_TO' }, + { name: 'Greater than', type: 'GREATER_THAN' }, + { name: 'Less than', type: 'LESS_THAN' }, + { name: 'Between', type: 'BETWEEN' }, + { name: 'Greater than or equal to', type: 'GREATER_THAN_OR_EQUAL_TO' }, + { name: 'Less than or equal to', type: 'LESS_THAN_OR_EQUAL_TO' }, + ], + STRING: [ + { name: 'Is', type: 'IS' }, + { name: 'Is not', type: 'IS_NOT' }, + { name: 'Contains', type: 'CONTAINS' }, + { name: 'Does not contain', type: 'DOES_NOT_CONTAIN' }, + { name: 'Starts with', type: 'STARTS_WITH' }, + { name: 'Ends with', type: 'ENDS_WITH' }, + ] + }; + + $ctrl.selectCheckConstraint = (selected) => { + $ctrl.column.checkConstraint = { + type: selected.type, + name: selected.name, + }; + } + + $ctrl.$onChanges = (changes) => { + if (changes.column != null && changes.column.currentValue != null) { + $ctrl.column = changes.column.currentValue; + $ctrl.isManual = !$ctrl.column.checkConstraint; + } + } +} + +export default app.component("checkConstraint", { + template: template, + bindings: { + column: "<", + }, + controller: Controller, +}).name; \ No newline at end of file diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html index d457905b..c13db195 100644 --- a/app/angular/logic/columnForm.html +++ b/app/angular/logic/columnForm.html @@ -29,57 +29,61 @@ />
    -
    - -
    + -
    - -
    +
    +
    + +
    -
    - -
    +
    + +
    -
    - -
    +
    + +
    -
    - +
    + +
    + +
    + +
    diff --git a/app/angular/logic/logic.js b/app/angular/logic/logic.js index 976bc5be..185d0958 100644 --- a/app/angular/logic/logic.js +++ b/app/angular/logic/logic.js @@ -8,6 +8,7 @@ import statusBar from "../components/statusBar"; import preventExitServiceModule from "../service/preventExitService"; import view from "../view/view"; import columnForm from "./columnForm"; +import checkConstraint from "./checkConstraint"; import sidebarControlLogical from "./sidebarControl"; const controller = function ( @@ -234,7 +235,7 @@ const controller = function ( }; export default angular - .module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule, bugReportButton, statusBar, view, columnForm, sidebarControlLogical]) + .module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule, bugReportButton, statusBar, view, columnForm, sidebarControlLogical, checkConstraint]) .component("editorLogic", { template, controller, diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index 7adab77c..5337131e 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -144,4 +144,17 @@ font-size: 14px; font-weight: 400; margin: 0 0 0 4px; +} + +.check-constraint { + margin-bottom: 12px; +} + +.check-constraint .multiple-fields { + display: flex; + column-gap: 12px; +} + +.check-constraint .form-field { + margin-bottom: 12px; } \ No newline at end of file From f01fd1f3882e1e198ca10940ee6bd6635c0f6f0d Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 9 Jan 2022 16:22:34 -0300 Subject: [PATCH 29/54] Add check constraint translations --- app/i18n/languages/en.js | 19 ++++++++++++++++++- app/i18n/languages/pt_BR.js | 17 +++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index d17c28e3..ed3ec494 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -112,5 +112,22 @@ export default { 'Import': 'Import', 'Please select a .BRT file': 'Please select a .BRT file', 'Last save:': 'Last save:', - 'at': 'at' + 'at': 'at', + 'Equal to': 'Equal to', + 'Not equal to': 'Not equal to', + 'Greater than': 'Greater than', + 'Less than': 'Less than', + 'Between': 'Between', + 'Greater than or equal to': 'Greater than or equal to', + 'Less than or equal to': 'Less than or equal to', + 'Is': 'Is', + 'Is not': 'Is not', + 'Contains': 'Contains', + 'Does not contain': 'Does not contain', + 'Starts with': 'Starts with', + 'Ends with': 'Ends with', + 'Select a value': 'Select a value', + 'Type the expression check': 'Type the expression check', + 'Show options to create constraint': 'Show options to create constraint', + 'Create check constraint manually': 'Create check constraint manually', }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index b4f7a859..dcdef537 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -113,4 +113,21 @@ export default { 'Please select a .BRT file': 'Por favor selecione um arquivo .BRT', 'Last save:': 'Salvo por último:', 'at': 'às', + 'Equal to': 'Igual', + 'Not equal to': 'Diferente', + 'Greater than': 'Maior que', + 'Less than': 'Menor que', + 'Between': 'Entre', + 'Greater than or equal to': 'Maior ou igual que', + 'Less than or equal to': 'Menor ou igual que', + 'Is': 'É', + 'Is not': 'Não é', + 'Contains': 'Contém', + 'Does not contain': 'Não contém', + 'Starts with': 'Começa com', + 'Ends with': 'Termina com', + 'Select a value': 'Selecione um valor', + 'Type the expression check': 'Digite a expressão check', + 'Show options to create constraint': 'Exibir opções para criar restrição', + 'Create check constraint manually': 'Criar restrição check manualmente', }; \ No newline at end of file From f0df83673bd5ce13c99abeaecf473fcad21891e9 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 16 Jan 2022 17:37:37 -0300 Subject: [PATCH 30/54] Creating sql comparasion dropdown component --- .../sqlComparasionDropdown/index.js | 41 +++++++++++++++++++ .../sqlComparasionDropdown/template.html | 5 +++ app/angular/logic/checkConstraint.html | 9 ++-- app/angular/logic/checkConstraint.js | 20 --------- 4 files changed, 51 insertions(+), 24 deletions(-) create mode 100644 app/angular/components/sqlComparasionDropdown/index.js create mode 100644 app/angular/components/sqlComparasionDropdown/template.html diff --git a/app/angular/components/sqlComparasionDropdown/index.js b/app/angular/components/sqlComparasionDropdown/index.js new file mode 100644 index 00000000..9c2b4a89 --- /dev/null +++ b/app/angular/components/sqlComparasionDropdown/index.js @@ -0,0 +1,41 @@ +import angular from "angular"; +import template from "./template.html"; + +const Controller = function () { + const $ctrl = this; + + $ctrl.select = selected => { + $ctrl.selected = selected; + $ctrl.onSelect({ selected }); + } + + $ctrl.checkConstraintOptions = { + NUMBER: [ + { name: 'Equal to', type: 'EQUAL_TO' }, + { name: 'Not equal to', type: 'NOT_EQUAL_TO' }, + { name: 'Greater than', type: 'GREATER_THAN' }, + { name: 'Less than', type: 'LESS_THAN' }, + { name: 'Between', type: 'BETWEEN' }, + { name: 'Greater than or equal to', type: 'GREATER_THAN_OR_EQUAL_TO' }, + { name: 'Less than or equal to', type: 'LESS_THAN_OR_EQUAL_TO' }, + ], + STRING: [ + { name: 'Is', type: 'IS' }, + { name: 'Is not', type: 'IS_NOT' }, + { name: 'Contains', type: 'CONTAINS' }, + { name: 'Does not contain', type: 'DOES_NOT_CONTAIN' }, + { name: 'Starts with', type: 'STARTS_WITH' }, + { name: 'Ends with', type: 'ENDS_WITH' }, + ] + }; +}; + +export default angular.module("app.sqlComparasionDropdown", []).component("sqlComparasionDropdown", { + template, + controller: Controller, + bindings: { + type: "<", + selected: "<", + onSelect: "&" + }, +}).name; diff --git a/app/angular/components/sqlComparasionDropdown/template.html b/app/angular/components/sqlComparasionDropdown/template.html new file mode 100644 index 00000000..de1324ac --- /dev/null +++ b/app/angular/components/sqlComparasionDropdown/template.html @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/app/angular/logic/checkConstraint.html b/app/angular/logic/checkConstraint.html index 6d1262f1..56656f99 100644 --- a/app/angular/logic/checkConstraint.html +++ b/app/angular/logic/checkConstraint.html @@ -2,11 +2,12 @@
    - - + type="$ctrl.column.type"> +
    diff --git a/app/angular/logic/checkConstraint.js b/app/angular/logic/checkConstraint.js index 311f3b09..27ab21f2 100644 --- a/app/angular/logic/checkConstraint.js +++ b/app/angular/logic/checkConstraint.js @@ -12,26 +12,6 @@ const Controller = function () { $ctrl.isManual = !$ctrl.isManual; } - $ctrl.checkConstraintOptions = { - NUMBER: [ - { name: 'Equal to', type: 'EQUAL_TO' }, - { name: 'Not equal to', type: 'NOT_EQUAL_TO' }, - { name: 'Greater than', type: 'GREATER_THAN' }, - { name: 'Less than', type: 'LESS_THAN' }, - { name: 'Between', type: 'BETWEEN' }, - { name: 'Greater than or equal to', type: 'GREATER_THAN_OR_EQUAL_TO' }, - { name: 'Less than or equal to', type: 'LESS_THAN_OR_EQUAL_TO' }, - ], - STRING: [ - { name: 'Is', type: 'IS' }, - { name: 'Is not', type: 'IS_NOT' }, - { name: 'Contains', type: 'CONTAINS' }, - { name: 'Does not contain', type: 'DOES_NOT_CONTAIN' }, - { name: 'Starts with', type: 'STARTS_WITH' }, - { name: 'Ends with', type: 'ENDS_WITH' }, - ] - }; - $ctrl.selectCheckConstraint = (selected) => { $ctrl.column.checkConstraint = { type: selected.type, From c47c7213c24c701773bcb38971d7c736b156d6c2 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 16 Jan 2022 20:49:16 -0300 Subject: [PATCH 31/54] Add translations --- app/i18n/languages/en.js | 5 +++++ app/i18n/languages/pt_BR.js | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index ed3ec494..44740811 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -130,4 +130,9 @@ export default { 'Type the expression check': 'Type the expression check', 'Show options to create constraint': 'Show options to create constraint', 'Create check constraint manually': 'Create check constraint manually', + 'Add condition': 'Add condition', + 'Create query expression': 'Create query expression', + 'Show options to create query': 'Show options to create query', + 'Add conditions to create query expression that will be used in the where clause when creating the view.': 'Add conditions to create query expression that will be used in the where clause when creating the view.', + 'and': 'and', }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index dcdef537..0a4bf19e 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -130,4 +130,9 @@ export default { 'Type the expression check': 'Digite a expressão check', 'Show options to create constraint': 'Exibir opções para criar restrição', 'Create check constraint manually': 'Criar restrição check manualmente', + 'Add condition': 'Adicionar condição', + 'Create query expression': 'Criar expressão de consulta', + 'Show options to create query': 'Exibir opções para criar consulta', + 'Add conditions to create query expression that will be used in the where clause when creating the view.': 'Adicione condições para criar expressão de consulta que será utilizada na cláusula where na criação da view.', + 'and': 'e', }; \ No newline at end of file From 8d5e3dafbea9e0054c5bda021b32c82723d4d447 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 16 Jan 2022 20:50:12 -0300 Subject: [PATCH 32/54] Create query expression modal component --- .../components/queryExpressionModal/index.js | 98 +++++++++++++++++++ .../queryExpressionModal/styles.scss | 30 ++++++ .../queryExpressionModal/template.html | 60 ++++++++++++ app/angular/logic/logic.js | 4 +- app/angular/view/view.html | 2 + app/angular/view/view.js | 18 +++- 6 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 app/angular/components/queryExpressionModal/index.js create mode 100644 app/angular/components/queryExpressionModal/styles.scss create mode 100644 app/angular/components/queryExpressionModal/template.html diff --git a/app/angular/components/queryExpressionModal/index.js b/app/angular/components/queryExpressionModal/index.js new file mode 100644 index 00000000..e5f0e8b4 --- /dev/null +++ b/app/angular/components/queryExpressionModal/index.js @@ -0,0 +1,98 @@ +import angular from "angular"; +import template from "./template.html"; +import "./styles.scss"; + +const app = angular.module("app.queryExpressionModalController", []); + +const Controller = function ($filter) { + const $ctrl = this; + $ctrl.submitted = false; + $ctrl.conditions = []; + $ctrl.tableColumns = []; + + const defaultCondition = { + columnName: null, + columnType: null, + type: null, + comparativeValue: null, + submitted: false, + }; + + $ctrl.createLabel = condition => { + return `${condition.columnName} ${$filter('translate')(condition.name)} ${condition.comparativeValue} ${condition.comparativeValue2 ? `${$filter('translate')('and')} ${condition.comparativeValue2}` : '' }`; + } + + $ctrl.selectComparasion = (selected, index) => { + const selectedCondition = $ctrl.conditions[index]; + $ctrl.conditions[index] = { + ...selectedCondition, + name: selected.name, + type: selected.type, + }; + }; + + $ctrl.removeCondition = (index) => { + $ctrl.conditions.splice(index, 1); + } + + $ctrl.saveCondition = (index) => { + const selectedCondition = $ctrl.conditions[index]; + $ctrl.conditions[index] = { + ...selectedCondition, + submitted: true, + }; + } + + $ctrl.selectColumn = (selected, index) => { + const selectedCondition = $ctrl.conditions[index]; + $ctrl.conditions[index] = { + ...selectedCondition, + columnName: selected.name, + columnType: selected.type + }; + } + + $ctrl.addCondition = () => { + $ctrl.conditions.push(defaultCondition); + }; + + $ctrl.$onInit = () => { + $ctrl.tables.forEach(table => { + table.columns.forEach(column => { + $ctrl.tableColumns.push({ + name: `${table.name}.${column.name}`, + type: column.type, + }); + }); + }); + }; + + $ctrl.$onChanges = (changes) => { + if (changes.queryConditions != null && changes.queryConditions.currentValue != null) { + $ctrl.conditions = changes.queryConditions.currentValue || []; + } + } + + $ctrl.save = function () { + $ctrl.close({ + result: $ctrl.conditions.filter(condition => condition.submitted), + }); + }; + + $ctrl.cancel = function () { + $ctrl.dismiss({ + reason: "cancel", + }); + }; +}; + +export default app.component("queryExpressionModal", { + template, + bindings: { + close: "&", + dismiss: "&", + tables: "<", + queryConditions: '<' + }, + controller: Controller, +}).name; \ No newline at end of file diff --git a/app/angular/components/queryExpressionModal/styles.scss b/app/angular/components/queryExpressionModal/styles.scss new file mode 100644 index 00000000..7174bf4e --- /dev/null +++ b/app/angular/components/queryExpressionModal/styles.scss @@ -0,0 +1,30 @@ +.query-expression-modal { + .labels-wrapper { + margin-bottom: 12px; + display: flex; + flex-wrap: wrap; + column-gap: 8px; + + .condition-label { + padding: 6px; + background: #3d9970; + color: white; + border-radius: 4px; + + i { + margin-left: 8px; + cursor: pointer; + } + } + } + .form-content { + display: flex; + align-items: center; + column-gap: 8px; + margin-bottom: 12px; + + button { + min-width: 180px; + } + } +} \ No newline at end of file diff --git a/app/angular/components/queryExpressionModal/template.html b/app/angular/components/queryExpressionModal/template.html new file mode 100644 index 00000000..cbce6d64 --- /dev/null +++ b/app/angular/components/queryExpressionModal/template.html @@ -0,0 +1,60 @@ +
    +

    {{ 'Create query expression' | translate }}

    +
    + +
    +

    {{ 'Add conditions to create query expression that will be used in the where clause when creating the view.' | translate }}

    + +
    +
    + + {{ $ctrl.createLabel(condition) }} + + +
    +
    + +
    +
    + + + + + + + + + + + + + +
    +
    + + + +
    + +
    + + +
    \ No newline at end of file diff --git a/app/angular/logic/logic.js b/app/angular/logic/logic.js index 185d0958..ad26645f 100644 --- a/app/angular/logic/logic.js +++ b/app/angular/logic/logic.js @@ -3,6 +3,8 @@ import template from "./logic.html"; import sqlGeneratorService from "../service/sqlGeneratorService"; import sqlGeneratorModal from "../components/sqlGeneratorModal"; import duplicateModelModal from "../components/duplicateModelModal"; +import queryExpressionModal from "../components/queryExpressionModal"; +import sqlComparasionDropdown from "../components/sqlComparasionDropdown"; import bugReportButton from "../components/bugReportButton"; import statusBar from "../components/statusBar"; import preventExitServiceModule from "../service/preventExitService"; @@ -235,7 +237,7 @@ const controller = function ( }; export default angular - .module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule, bugReportButton, statusBar, view, columnForm, sidebarControlLogical, checkConstraint]) + .module("app.workspace.logic", [sqlGeneratorService, sqlGeneratorModal, duplicateModelModal, preventExitServiceModule, bugReportButton, statusBar, view, columnForm, sidebarControlLogical, checkConstraint, queryExpressionModal, sqlComparasionDropdown]) .component("editorLogic", { template, controller, diff --git a/app/angular/view/view.html b/app/angular/view/view.html index 5d2cc439..e54e20a3 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -68,6 +68,8 @@
    {{ table.name }}
    >
    + {{ 'Show options to create query' | translate }} +
    diff --git a/app/angular/view/view.js b/app/angular/view/view.js index 2379d90e..37151487 100644 --- a/app/angular/view/view.js +++ b/app/angular/view/view.js @@ -3,7 +3,7 @@ import template from "./view.html"; const app = angular.module("app.view", []); -const Controller = function (LogicService) { +const Controller = function (LogicService, $uibModal) { const $ctrl = this; $ctrl.$onInit = () => { @@ -15,6 +15,22 @@ const Controller = function (LogicService) { }); }; + $ctrl.queryExpressionModal = () => { + const modalInstance = $uibModal.open({ + animation: true, + template: '', + controller: function () { + const ctrl = this; + ctrl.tables = $ctrl.tables.filter(({ selected }) => selected); + ctrl.queryConditions = $ctrl.view.queryConditions; + }, + controllerAs: '$ctrl', + }); + modalInstance.result.then((conditions) => { + $ctrl.view.queryConditions = conditions; + }); + }; + $ctrl.changeName = () => { if ($ctrl.view.name) { LogicService.editName($ctrl.view.name); From f6202e5b27681d0aed9bffc02642c2de3e872fc2 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 6 Feb 2022 16:40:49 -0300 Subject: [PATCH 33/54] Add translations --- app/angular/login/login.html | 4 ++-- app/angular/service/logicFactory.js | 8 ++++---- app/angular/view/view.html | 4 ++-- app/i18n/languages/en.js | 9 +++++++++ app/i18n/languages/pt_BR.js | 9 +++++++++ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/app/angular/login/login.html b/app/angular/login/login.html index 47451a61..2d071623 100644 --- a/app/angular/login/login.html +++ b/app/angular/login/login.html @@ -59,8 +59,8 @@

    {{'Language' | translate}}

    diff --git a/app/angular/service/logicFactory.js b/app/angular/service/logicFactory.js index ece09952..86a4873e 100644 --- a/app/angular/service/logicFactory.js +++ b/app/angular/service/logicFactory.js @@ -3,14 +3,14 @@ import angular from "angular"; import * as joint from "jointjs/dist/joint"; import "jointjs/dist/joint.min.css"; -const logicFactory = () => { +const logicFactory = ($filter) => { var logic = joint.shapes.uml; const _createTable = function () { var table = new logic.Class({ position: { x: 12, y: 15 }, size: { width: 100, height: 100 }, - name: 'Tabela', + name: $filter('translate')('Table'), attributes: [], attrs: { '.uml-class-name-rect': { @@ -42,11 +42,11 @@ const logicFactory = () => { var table = new logic.Abstract({ position: { x: 12, y: 155 }, size: { width: 100, height: 100 }, - name: 'View', + name: $filter('translate')('View'), attributes: [], attrs: { '.uml-class-name-rect': { - fill: 'red', + fill: 'lightgray', stroke: '#000', 'stroke-width': 0.5, }, diff --git a/app/angular/view/view.html b/app/angular/view/view.html index e54e20a3..f5a16b2e 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -64,11 +64,11 @@
    {{ table.name }}
    id="view-query" type="text" class="form-control query-expression-textarea" - ng-model="$ctrl.view.query" + ng-model="$ctrl.view.queryConditions.text" > - {{ 'Show options to create query' | translate }} + {{ $ctrl.view.queryConditions.values ? 'Edit options to create query' : 'Show options to create query' | translate }}
    diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 44740811..9bdcc509 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -133,6 +133,15 @@ export default { 'Add condition': 'Add condition', 'Create query expression': 'Create query expression', 'Show options to create query': 'Show options to create query', + 'Edit options to create query': 'Edit options to create query', 'Add conditions to create query expression that will be used in the where clause when creating the view.': 'Add conditions to create query expression that will be used in the where clause when creating the view.', 'and': 'and', + 'Add new column': 'Add new column', + 'Table': 'Table', + 'View': 'View', + 'Confirm': 'Confirm', + 'Portuguese (Brazil)': 'Portuguese (Brazil)', + 'English': 'English', + 'AND': 'AND', + 'OR': 'OR' }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index 0a4bf19e..fbbe6304 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -133,6 +133,15 @@ export default { 'Add condition': 'Adicionar condição', 'Create query expression': 'Criar expressão de consulta', 'Show options to create query': 'Exibir opções para criar consulta', + 'Edit options to create query': 'Editar opções para criar consulta', 'Add conditions to create query expression that will be used in the where clause when creating the view.': 'Adicione condições para criar expressão de consulta que será utilizada na cláusula where na criação da view.', 'and': 'e', + 'Add new column': 'Adicionar coluna', + 'Table': 'Tabela', + 'View': 'Visão', + 'Confirm': 'Confirmar', + 'Portuguese (Brazil)': 'Português (Brasil)', + 'English': 'Inglês', + 'AND': 'E', + 'OR': 'OU' }; \ No newline at end of file From 66526f0b45c46f032c3a9e06524393a6be142d6a Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 6 Feb 2022 16:46:23 -0300 Subject: [PATCH 34/54] View - query expression --- .../components/queryExpressionModal/index.js | 13 ++++++++++-- .../queryExpressionModal/styles.scss | 5 +++-- .../queryExpressionModal/template.html | 13 ++++++++---- app/angular/logic/sidebarControl.html | 8 +++---- app/angular/logic/sidebarControl.js | 1 + app/angular/service/logicService.js | 2 +- app/angular/service/queryExpressionService.js | 15 +++++++++++++ app/angular/view/view.js | 21 ++++++++++++++----- app/joint/table.js | 3 ++- app/sass/form.scss | 2 +- 10 files changed, 63 insertions(+), 20 deletions(-) create mode 100644 app/angular/service/queryExpressionService.js diff --git a/app/angular/components/queryExpressionModal/index.js b/app/angular/components/queryExpressionModal/index.js index e5f0e8b4..f998c35d 100644 --- a/app/angular/components/queryExpressionModal/index.js +++ b/app/angular/components/queryExpressionModal/index.js @@ -16,10 +16,19 @@ const Controller = function ($filter) { type: null, comparativeValue: null, submitted: false, + logicalOperator: 'AND', }; $ctrl.createLabel = condition => { - return `${condition.columnName} ${$filter('translate')(condition.name)} ${condition.comparativeValue} ${condition.comparativeValue2 ? `${$filter('translate')('and')} ${condition.comparativeValue2}` : '' }`; + return `${condition.columnName} ${$filter('translate')(condition.name).toLowerCase()} ${condition.comparativeValue} ${condition.comparativeValue2 ? `${$filter('translate')('and')} ${condition.comparativeValue2}` : '' }`; + } + + $ctrl.changeOperator = (index) => { + const selectedCondition = $ctrl.conditions[index]; + $ctrl.conditions[index] = { + ...selectedCondition, + logicalOperator: selectedCondition.logicalOperator === 'AND' ? 'OR' : 'AND', + }; } $ctrl.selectComparasion = (selected, index) => { @@ -69,7 +78,7 @@ const Controller = function ($filter) { $ctrl.$onChanges = (changes) => { if (changes.queryConditions != null && changes.queryConditions.currentValue != null) { - $ctrl.conditions = changes.queryConditions.currentValue || []; + $ctrl.conditions = changes.queryConditions.currentValue.values || []; } } diff --git a/app/angular/components/queryExpressionModal/styles.scss b/app/angular/components/queryExpressionModal/styles.scss index 7174bf4e..2967cb7a 100644 --- a/app/angular/components/queryExpressionModal/styles.scss +++ b/app/angular/components/queryExpressionModal/styles.scss @@ -3,16 +3,17 @@ margin-bottom: 12px; display: flex; flex-wrap: wrap; - column-gap: 8px; + row-gap: 18px; .condition-label { padding: 6px; background: #3d9970; color: white; border-radius: 4px; + margin-right: 8px; i { - margin-left: 8px; + margin-left: 4px; cursor: pointer; } } diff --git a/app/angular/components/queryExpressionModal/template.html b/app/angular/components/queryExpressionModal/template.html index cbce6d64..efd68696 100644 --- a/app/angular/components/queryExpressionModal/template.html +++ b/app/angular/components/queryExpressionModal/template.html @@ -6,12 +6,17 @@

    {{ 'Create query expression' | translate }}

    {{ 'Add conditions to create query expression that will be used in the where clause when creating the view.' | translate }}

    -
    + {{ $ctrl.createLabel(condition) }} -
    + + + {{ condition.logicalOperator | translate }} + + +
    @@ -45,7 +50,7 @@

    {{ 'Create query expression' | translate }}

    /> - +
    @@ -56,5 +61,5 @@

    {{ 'Create query expression' | translate }}

    - +
    \ No newline at end of file diff --git a/app/angular/logic/sidebarControl.html b/app/angular/logic/sidebarControl.html index 94cdf3a6..aa6c5857 100644 --- a/app/angular/logic/sidebarControl.html +++ b/app/angular/logic/sidebarControl.html @@ -65,13 +65,13 @@

    {{ 'Views' | translate }}

      -
    • -
      +
    • +

      {{view.name}}

      - +
    @@ -80,7 +80,7 @@

    {{view.name}}

    - +
    \ No newline at end of file diff --git a/app/angular/logic/sidebarControl.js b/app/angular/logic/sidebarControl.js index 5cfa0d44..03191a4d 100644 --- a/app/angular/logic/sidebarControl.js +++ b/app/angular/logic/sidebarControl.js @@ -122,6 +122,7 @@ const Controller = function (LogicService) { $ctrl.selectedName = changes.selected.currentValue.attributes.name; $ctrl.selectedType = changes.selected.currentValue.attributes.type; $ctrl.columns = changes.selected.currentValue.attributes.objects; + $ctrl.queryConditions = changes.selected.currentValue.attributes.queryConditions; if ($ctrl.selectedType === 'uml.Class') { $ctrl.views = LogicService.loadViewsByTable(changes.selected.currentValue.id); } diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index 8ec25f68..e23c1d84 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -495,7 +495,7 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) const elements = ls.graph.getElements(); return elements.filter(isView) .filter(({ attributes }) => filterViewsByTableId(attributes.objects, tableId)) - .map(({ attributes }) => ({ name: attributes.name, tables: attributes.objects })); + .map(({ attributes }) => ({ name: attributes.name, tables: attributes.objects, queryConditions: attributes.queryConditions })); } ls.buildTablesJson = function () { diff --git a/app/angular/service/queryExpressionService.js b/app/angular/service/queryExpressionService.js new file mode 100644 index 00000000..04100af6 --- /dev/null +++ b/app/angular/service/queryExpressionService.js @@ -0,0 +1,15 @@ +export const comparasionOperators = { + EQUAL_TO: (value) => `= ${value}`, + NOT_EQUAL_TO: (value) => `<> ${value}`, + GREATER_THAN: (value) => `> ${value}`, + LESS_THAN: (value) => `< ${value}`, + BETWEEN: (value, otherValue) => `BETWEEN ${value} AND ${otherValue}`, + GREATER_THAN_OR_EQUAL_TO: (value) => `>= ${value}`, + LESS_THAN_OR_EQUAL_TO: (value) => `<= ${value}`, + IS: (value) => `= ${value}`, + IS_NOT: (value) => `<> ${value}`, + CONTAINS: (value) => `LIKE '%${value}%'`, + DOES_NOT_CONTAIN: (value) => `NOT LIKE '%${value}%'`, + STARTS_WITH: (value) => `LIKE '${value}%'`, + ENDS_WITH: (value) => `LIKE '%${value}'`, +} \ No newline at end of file diff --git a/app/angular/view/view.js b/app/angular/view/view.js index 37151487..bc84d6d2 100644 --- a/app/angular/view/view.js +++ b/app/angular/view/view.js @@ -1,4 +1,5 @@ import angular from "angular"; +import { comparasionOperators } from "../service/queryExpressionService"; import template from "./view.html"; const app = angular.module("app.view", []); @@ -6,19 +7,24 @@ const app = angular.module("app.view", []); const Controller = function (LogicService, $uibModal) { const $ctrl = this; - $ctrl.$onInit = () => { + const updateViewInfo = (view) => { const allTables = LogicService.loadTables(); - $ctrl.tables = $ctrl.view.tables; + $ctrl.tables = view.tables; + $ctrl.queryConditions = view.queryConditions; allTables.forEach(table => { if ($ctrl.tables.some(({ name }) => table.name === name)) return; $ctrl.tables.push(table); }); + } + + $ctrl.$onInit = () => { + updateViewInfo($ctrl.view); }; $ctrl.queryExpressionModal = () => { const modalInstance = $uibModal.open({ animation: true, - template: '', + template: '', controller: function () { const ctrl = this; ctrl.tables = $ctrl.tables.filter(({ selected }) => selected); @@ -27,7 +33,11 @@ const Controller = function (LogicService, $uibModal) { controllerAs: '$ctrl', }); modalInstance.result.then((conditions) => { - $ctrl.view.queryConditions = conditions; + $ctrl.view.queryConditions = { + values: conditions, + text: `${conditions.map(({ columnName, type, comparativeValue, comparativeValue2, logicalOperator }, index) => + `${columnName} ${comparasionOperators[type](comparativeValue, comparativeValue2)} ${conditions.length - 1 === index ? '' : logicalOperator}`).join(" ")}` + } }); }; @@ -39,7 +49,7 @@ const Controller = function (LogicService, $uibModal) { $ctrl.$onChanges = (changes) => { if (changes.view != null && changes.view.currentValue != null) { - $ctrl.view = changes.view.currentValue; + updateViewInfo({ ...changes.view.currentValue }); } } @@ -65,6 +75,7 @@ const Controller = function (LogicService, $uibModal) { columns, } LogicService.save(view); + } }; diff --git a/app/joint/table.js b/app/joint/table.js index 85bad49b..fd6a98a3 100644 --- a/app/joint/table.js +++ b/app/joint/table.js @@ -141,7 +141,7 @@ uml.Abstract = joint.shapes.basic.Generic.extend({ attrs: { rect: { 'width': 200 }, - '.uml-class-name-rect': { 'stroke': 'black', 'stroke-width': 0.5, 'fill': 'red' }, + '.uml-class-name-rect': { 'stroke': 'black', 'stroke-width': 0.5, 'fill': 'lightgray' }, '.uml-class-attrs-rect': { 'stroke': 'black', 'stroke-width': 0.5, 'fill': '#fff' }, '.uml-class-methods-rect': { 'stroke': 'black', 'stroke-width': 0.5, 'fill': '#fff' }, @@ -185,6 +185,7 @@ uml.Abstract = joint.shapes.basic.Generic.extend({ saveView: function (view) { this.set('attributes', view.columns.map(column => column.name)); this.set('objects', view.basedIn); + this.set('queryConditions', view.queryConditions); this.updateRectangles(); this.trigger('uml-update'); }, diff --git a/app/sass/form.scss b/app/sass/form.scss index 051f2fee..2d3c546c 100644 --- a/app/sass/form.scss +++ b/app/sass/form.scss @@ -25,7 +25,7 @@ input[type="button"]:focus, input[type="submit"]:focus { outline: 0; box-shadow: 0 0 0 2px rgba(#fff, 1), - 0 0 0 8px rgba(#3d9970, 0.4); + 0 0 0 4px rgba(#3d9970, 0.4); } //////////////////////////////////////////////////////////////////////////////// From 4cc8683ae5b0b2fba72fb540e122748608c335ad Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Mon, 7 Feb 2022 18:58:35 -0300 Subject: [PATCH 35/54] Filter tables --- app/angular/service/logicService.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index e23c1d84..76baaa45 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -501,13 +501,13 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) ls.buildTablesJson = function () { var map = new Map(); var elements = ls.graph.getElements(); - for (var i = 0; i < elements.length; i++) { + elements.filter(isTable).forEach(element => { var obj = { - "name": elements[i].attributes.name, - "columns": elements[i].attributes.objects + name: element.attributes.name, + columns: element.attributes.objects } - map.set(elements[i].id, obj); - } + map.set(element.id, obj); + }); return map; } From e931053efe11dcf05da17bb0ecb54954ae67ecf8 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Mon, 7 Feb 2022 18:59:05 -0300 Subject: [PATCH 36/54] Clear sidebar --- app/angular/logic/columnForm.html | 2 +- app/angular/logic/sidebarControl.html | 2 +- app/angular/logic/sidebarControl.js | 4 ++-- app/angular/service/sqlGeneratorService.js | 6 +++--- app/sass/sidebarPannel.scss | 8 +++++++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html index c13db195..f9c0609f 100644 --- a/app/angular/logic/columnForm.html +++ b/app/angular/logic/columnForm.html @@ -1,4 +1,4 @@ -
    +
    {{view.name}}
    - +
    \ No newline at end of file diff --git a/app/angular/logic/sidebarControl.js b/app/angular/logic/sidebarControl.js index 03191a4d..423c6eca 100644 --- a/app/angular/logic/sidebarControl.js +++ b/app/angular/logic/sidebarControl.js @@ -108,7 +108,7 @@ const Controller = function (LogicService) { $ctrl.addColumnModel = $ctrl.newColumnObject(); $ctrl.editColumnModel = $ctrl.newColumnObject(); - const clearSidebar = () => { + $ctrl.clearSidebar = () => { $ctrl.selectedElement = null; $ctrl.selectedName = null; $ctrl.selectedType = null; @@ -116,7 +116,7 @@ const Controller = function (LogicService) { } $ctrl.$onChanges = (changes) => { - if (!changes.selected.currentValue) clearSidebar(); + if (!changes.selected.currentValue) $ctrl.clearSidebar(); if (changes.selected != null && changes.selected.currentValue != null) { $ctrl.selectedElement = changes.selected.currentValue; $ctrl.selectedName = changes.selected.currentValue.attributes.name; diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js index 0adc9b57..b7fe33ea 100644 --- a/app/angular/service/sqlGeneratorService.js +++ b/app/angular/service/sqlGeneratorService.js @@ -51,17 +51,17 @@ const sqlGeneratorService = () => { var alreadyCreated = createdMap.get(key); create += " " + cleanString(column.name) + " " + column.type; - + constraints.forEach(({ key, sqlValue }) => { if (column[key]) create += ` ${sqlValue}`; }); - if(column.defaultValue) { + if (column.defaultValue) { create += ` DEFAULT '${column.defaultValue}'` } create += ", " + " \n"; - if(column.FK){ + if (column.FK){ pending.set(key, table); } } diff --git a/app/sass/sidebarPannel.scss b/app/sass/sidebarPannel.scss index 5337131e..749662bf 100644 --- a/app/sass/sidebarPannel.scss +++ b/app/sass/sidebarPannel.scss @@ -54,17 +54,23 @@ // .card-item //////////////////////////////////////////////////////////////////////////////// .card-item { - padding: 12px 8px; border: 1px solid #ddd; border-radius: 3px; margin-bottom: 8px; } +.card-item .column-form, +.card-item.views { + padding: 12px 8px; +} + .card-item header { display: flex; flex-direction: row; align-items: center; justify-content: space-between; + padding: 12px 8px; + cursor: pointer; } .card-item .table-title { From 0734138ac149f10654f59e2f30b34867e4ee2088 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Tue, 8 Feb 2022 08:15:42 -0300 Subject: [PATCH 37/54] Add check constraint to sql generator --- app/angular/service/sqlGeneratorService.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js index b7fe33ea..5acc2947 100644 --- a/app/angular/service/sqlGeneratorService.js +++ b/app/angular/service/sqlGeneratorService.js @@ -1,10 +1,10 @@ import angular from "angular"; +import { comparasionOperators } from "./queryExpressionService"; const sqlGeneratorService = () => { const constraints = [ { key: 'PK', sqlValue: "PRIMARY KEY" }, { key: 'NOT_NULL', sqlValue: "NOT NULL" }, - { key: 'UNIQUE', sqlValue: "UNIQUE" }, { key: 'AUTO_INCREMENT', sqlValue: "AUTO_INCREMENT" }, ]; @@ -47,7 +47,10 @@ const sqlGeneratorService = () => { const createTable = function(key, table){ var create = "CREATE TABLE " + table.name + " \n"; create += "( \n"; - for (const column of table.columns) { + const hasCheckConstraint = table.columns.some(column => column.checkConstraint); + const hasUniqueConstraint = table.columns.some(column => column.UNIQUE); + let checkConstraint = ''; + table.columns.forEach((column, index) => { var alreadyCreated = createdMap.get(key); create += " " + cleanString(column.name) + " " + column.type; @@ -64,7 +67,18 @@ const sqlGeneratorService = () => { if (column.FK){ pending.set(key, table); } + }) + + if (hasCheckConstraint) { + checkConstraint = ` CHECK (${table.columns.filter(column => column.checkConstraint) + .map(({ name, checkConstraint }, index) => `${index === 0 ? '': ' AND '}${name} ${comparasionOperators[checkConstraint.type](checkConstraint.comparativeValue, checkConstraint.comparativeValue2)}`).join("")})${hasUniqueConstraint ? ',' : ''}` + create += checkConstraint + "\n"; } + + if (hasUniqueConstraint) { + create += ` UNIQUE (${table.columns.filter(column => column.UNIQUE).map(({ name }) => `${name}`)})` + "\n"; + } + create += "); \n\n" return create; } From 3306ceb8110ae8edcc97c7cfdd8d833c8e5ab285 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 13 Feb 2022 17:13:14 -0300 Subject: [PATCH 38/54] Fix column/table id --- app/angular/view/view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/angular/view/view.html b/app/angular/view/view.html index f5a16b2e..d6be9ea5 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -45,9 +45,9 @@
    {{ table.name }}
    -
    -

    {{ 'Add conditions to create query expression that will be used in the where clause when creating the view.' | translate }}

    +
    +

    {{ 'You have chosen more than one table to create the View. It is necessary to select the attributes that will compose the JOIN.' | translate }}

    + +
    + + + {{ join.columnName + ' = ' + join.columnName2 }} + + + +
    + +
    +
    + + + + + + + + + +
    +
    + + +
    + +

    {{ 'Add conditions to create query expression that will be used in the where clause when creating the view.' | translate }}

    - {{ $ctrl.createLabel(condition) }} + {{ $ctrl.createLabel(condition) }} - {{ condition.logicalOperator | translate }} + {{ condition.logicalOperator | translate }} diff --git a/app/angular/logic/logic.js b/app/angular/logic/logic.js index ad26645f..2e135bcd 100644 --- a/app/angular/logic/logic.js +++ b/app/angular/logic/logic.js @@ -178,7 +178,7 @@ const controller = function ( } ctrl.generateSQL = function () { - var sql = SqlGeneratorService.generate(LogicService.buildTablesJson()); + var sql = SqlGeneratorService.generate(LogicService.buildTablesJson(), LogicService.loadViews()); console.log(sql); diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index 76baaa45..0d9dc7f9 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -498,6 +498,12 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) .map(({ attributes }) => ({ name: attributes.name, tables: attributes.objects, queryConditions: attributes.queryConditions })); } + ls.loadViews = () => { + const elements = ls.graph.getElements(); + return elements.filter(isView) + .map(({ attributes }) => ({ name: attributes.name, tables: attributes.objects, queryConditions: attributes.queryConditions })); + } + ls.buildTablesJson = function () { var map = new Map(); var elements = ls.graph.getElements(); diff --git a/app/angular/service/queryExpressionService.js b/app/angular/service/queryExpressionService.js index 04100af6..11d04b64 100644 --- a/app/angular/service/queryExpressionService.js +++ b/app/angular/service/queryExpressionService.js @@ -6,8 +6,8 @@ export const comparasionOperators = { BETWEEN: (value, otherValue) => `BETWEEN ${value} AND ${otherValue}`, GREATER_THAN_OR_EQUAL_TO: (value) => `>= ${value}`, LESS_THAN_OR_EQUAL_TO: (value) => `<= ${value}`, - IS: (value) => `= ${value}`, - IS_NOT: (value) => `<> ${value}`, + IS: (value) => `= '${value}'`, + IS_NOT: (value) => `<> '${value}'`, CONTAINS: (value) => `LIKE '%${value}%'`, DOES_NOT_CONTAIN: (value) => `NOT LIKE '%${value}%'`, STARTS_WITH: (value) => `LIKE '${value}%'`, diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js index 5acc2947..29daea20 100644 --- a/app/angular/service/sqlGeneratorService.js +++ b/app/angular/service/sqlGeneratorService.js @@ -1,6 +1,8 @@ import angular from "angular"; import { comparasionOperators } from "./queryExpressionService"; +const REGEX_TABLE_COLUMN_NAME = /^(?[^.]+)\.(?[^.]+)$/; + const sqlGeneratorService = () => { const constraints = [ { key: 'PK', sqlValue: "PRIMARY KEY" }, @@ -11,7 +13,7 @@ const sqlGeneratorService = () => { var pending = {}; var createdMap = {}; - const _generate = function (model) { + const _generate = function (model, views) { pending = new Map(); createdMap = new Map(); @@ -30,9 +32,32 @@ const sqlGeneratorService = () => { var table = model.get(key); sql += createAlterTable(key, table); } + + views.forEach(view => { + sql += createViewScript(view); + }); + return sql; } + const filterSelectedItem = item => item.selected; + + const mapViewSelectedColumn = table => table.columns.filter(filterSelectedItem).map(column => `${table.name}.${cleanString(column.name)}`).join(", "); + + const getJoinTable = (join, baseTable) => { + const attributeName = `columnName${join.columnName.includes(baseTable) ? '2' : ''}`; + return join[attributeName].match(REGEX_TABLE_COLUMN_NAME).groups.table; + } + + const createViewJoins = (view, baseTable) => view.queryConditions.joins.map(join => `\nINNER JOIN ${getJoinTable(join, baseTable)} ON ${cleanString(join.columnName)} = ${cleanString(join.columnName2)}`) + + const createViewScript = (view) => { + const selectedTables = view.tables.filter(filterSelectedItem); + const baseTable = selectedTables[0].name; + + return `\nCREATE VIEW ${view.name} AS \nSELECT ${selectedTables.map(mapViewSelectedColumn).join(", ")}\nFROM ${baseTable}${createViewJoins(view, baseTable)}\nWHERE ${view.queryConditions.text}\n` + } + const createAlterTable = function(key, table){ var alter = ""; for (const column of table.columns) { @@ -44,6 +69,10 @@ const sqlGeneratorService = () => { return alter; } + const buildConstraintCheck = (name, checkConstraint) => { + return `${cleanString(name)} ${checkConstraint.checkExpression || comparasionOperators[checkConstraint.type](checkConstraint.comparativeValue, checkConstraint.comparativeValue2)}` + } + const createTable = function(key, table){ var create = "CREATE TABLE " + table.name + " \n"; create += "( \n"; @@ -71,7 +100,7 @@ const sqlGeneratorService = () => { if (hasCheckConstraint) { checkConstraint = ` CHECK (${table.columns.filter(column => column.checkConstraint) - .map(({ name, checkConstraint }, index) => `${index === 0 ? '': ' AND '}${name} ${comparasionOperators[checkConstraint.type](checkConstraint.comparativeValue, checkConstraint.comparativeValue2)}`).join("")})${hasUniqueConstraint ? ',' : ''}` + .map(({ name, checkConstraint }, index) => `${index === 0 ? '': ' AND '}${buildConstraintCheck(name, checkConstraint)}`).join("")})${hasUniqueConstraint ? ',' : ''}` create += checkConstraint + "\n"; } diff --git a/app/angular/view/view.js b/app/angular/view/view.js index bc84d6d2..a494857f 100644 --- a/app/angular/view/view.js +++ b/app/angular/view/view.js @@ -32,8 +32,9 @@ const Controller = function (LogicService, $uibModal) { }, controllerAs: '$ctrl', }); - modalInstance.result.then((conditions) => { + modalInstance.result.then(({ conditions, joins }) => { $ctrl.view.queryConditions = { + joins, values: conditions, text: `${conditions.map(({ columnName, type, comparativeValue, comparativeValue2, logicalOperator }, index) => `${columnName} ${comparasionOperators[type](comparativeValue, comparativeValue2)} ${conditions.length - 1 === index ? '' : logicalOperator}`).join(" ")}` diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 9bdcc509..025ac4b5 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -143,5 +143,7 @@ export default { 'Portuguese (Brazil)': 'Portuguese (Brazil)', 'English': 'English', 'AND': 'AND', - 'OR': 'OR' + 'OR': 'OR', + 'You have chosen more than one table to create the View. It is necessary to select the attributes that will compose the JOIN.': 'You have chosen more than one table to create the View. It is necessary to select the attributes that will compose the JOIN.', + 'Add join': 'Add join', }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index fbbe6304..ab3b7a2f 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -143,5 +143,7 @@ export default { 'Portuguese (Brazil)': 'Português (Brasil)', 'English': 'Inglês', 'AND': 'E', - 'OR': 'OU' + 'OR': 'OU', + 'You have chosen more than one table to create the View. It is necessary to select the attributes that will compose the JOIN.': 'Você escolheu mais de uma tabela para a criação da Visão. É necessário selecionar os atributos que irão compor o JOIN.', + 'Add join': 'Adicionar join', }; \ No newline at end of file From 16deccf8a5cb96fe97c42b3d40668237e65cf389 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 20 Feb 2022 23:46:05 -0300 Subject: [PATCH 41/54] Edit translation --- app/angular/view/view.html | 2 +- app/i18n/languages/en.js | 4 ++-- app/i18n/languages/pt_BR.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/angular/view/view.html b/app/angular/view/view.html index d6be9ea5..fbab5e89 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -68,7 +68,7 @@
    {{ table.name }}
    > - {{ $ctrl.view.queryConditions.values ? 'Edit options to create query' : 'Show options to create query' | translate }} + {{ $ctrl.view.queryConditions.values ? 'Edit query for view creation' : 'Include query for view creation' | translate }}
    diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 025ac4b5..91086e12 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -132,8 +132,8 @@ export default { 'Create check constraint manually': 'Create check constraint manually', 'Add condition': 'Add condition', 'Create query expression': 'Create query expression', - 'Show options to create query': 'Show options to create query', - 'Edit options to create query': 'Edit options to create query', + 'Include query for view creation': 'Include query for view creation', + 'Edit query for view creation': 'Edit query for view creation', 'Add conditions to create query expression that will be used in the where clause when creating the view.': 'Add conditions to create query expression that will be used in the where clause when creating the view.', 'and': 'and', 'Add new column': 'Add new column', diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index ab3b7a2f..12c37c99 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -132,8 +132,8 @@ export default { 'Create check constraint manually': 'Criar restrição check manualmente', 'Add condition': 'Adicionar condição', 'Create query expression': 'Criar expressão de consulta', - 'Show options to create query': 'Exibir opções para criar consulta', - 'Edit options to create query': 'Editar opções para criar consulta', + 'Include query for view creation': 'Incluir consulta para criação da visão', + 'Edit query for view creation': 'Editar consulta para criação da visão', 'Add conditions to create query expression that will be used in the where clause when creating the view.': 'Adicione condições para criar expressão de consulta que será utilizada na cláusula where na criação da view.', 'and': 'e', 'Add new column': 'Adicionar coluna', From cbd7d0ea2bc270d894083306e26efdb5a9d40c14 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 20 Feb 2022 23:46:33 -0300 Subject: [PATCH 42/54] Views/joins/sql adjustments --- .../components/queryExpressionModal/styles.scss | 10 ++++++++++ .../components/queryExpressionModal/template.html | 2 +- app/angular/logic/sidebarControl.html | 2 +- app/angular/service/logicService.js | 2 +- app/angular/service/sqlGeneratorService.js | 5 +++-- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/angular/components/queryExpressionModal/styles.scss b/app/angular/components/queryExpressionModal/styles.scss index 2967cb7a..8c970d24 100644 --- a/app/angular/components/queryExpressionModal/styles.scss +++ b/app/angular/components/queryExpressionModal/styles.scss @@ -27,5 +27,15 @@ button { min-width: 180px; } + + .dropdown-tmp-list { + max-height: 400px; + overflow: auto; + } + } + .form-content-joins { + dropdown { + width: 100%; + } } } \ No newline at end of file diff --git a/app/angular/components/queryExpressionModal/template.html b/app/angular/components/queryExpressionModal/template.html index 63b8763b..97f7148c 100644 --- a/app/angular/components/queryExpressionModal/template.html +++ b/app/angular/components/queryExpressionModal/template.html @@ -16,7 +16,7 @@

    {{ 'Create query expression' | translate }}

    -
    +
    {{ 'Columns' | translate }}

  • {{column.name}}

    - PK + {{column.PK ? 'PK' : 'FK'}}
    diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index 0d9dc7f9..da3939c2 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -475,7 +475,7 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) const isView = (element) => element.attributes.type === 'uml.Abstract'; - const filterViewsByTableId = (views, tableId) => views.some(({ id }) => id === tableId); + const filterViewsByTableId = (tables, tableId) => tables.filter(table => table.selected).some(({ id }) => id === tableId); ls.loadTables = () => { const elements = ls.graph.getElements(); diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js index 29daea20..509fac4f 100644 --- a/app/angular/service/sqlGeneratorService.js +++ b/app/angular/service/sqlGeneratorService.js @@ -42,7 +42,7 @@ const sqlGeneratorService = () => { const filterSelectedItem = item => item.selected; - const mapViewSelectedColumn = table => table.columns.filter(filterSelectedItem).map(column => `${table.name}.${cleanString(column.name)}`).join(", "); + const mapViewSelectedColumn = (table, hasMultipleTables) => table.columns.filter(filterSelectedItem).map(column => `${hasMultipleTables ? table.name + '.' : ''}${cleanString(column.name)}`).join(", "); const getJoinTable = (join, baseTable) => { const attributeName = `columnName${join.columnName.includes(baseTable) ? '2' : ''}`; @@ -53,9 +53,10 @@ const sqlGeneratorService = () => { const createViewScript = (view) => { const selectedTables = view.tables.filter(filterSelectedItem); + const hasMultipleTables = selectedTables.length > 1; const baseTable = selectedTables[0].name; - return `\nCREATE VIEW ${view.name} AS \nSELECT ${selectedTables.map(mapViewSelectedColumn).join(", ")}\nFROM ${baseTable}${createViewJoins(view, baseTable)}\nWHERE ${view.queryConditions.text}\n` + return `\nCREATE VIEW ${view.name} AS \nSELECT ${selectedTables.map(table => mapViewSelectedColumn(table, hasMultipleTables)).join(", ")}\nFROM ${baseTable}${createViewJoins(view, baseTable)}\nWHERE ${view.queryConditions.text}\n` } const createAlterTable = function(key, table){ From 716b0addd5df2c4cdfec49e8969572702573528f Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Tue, 22 Feb 2022 20:40:31 -0300 Subject: [PATCH 43/54] Show only tables to FK origin dropdown --- app/angular/service/logicService.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index da3939c2..9b685e7f 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -464,10 +464,10 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) ls.getTablesMap = function () { var map = new Map(); - var elements = ls.graph.getElements(); - for (var i = 0; i < elements.length; i++) { - map.set(elements[i].attributes.name, elements[i].id); - } + var elements = ls.graph.getElements().filter(isTable); + elements.forEach(element => { + map.set(element.attributes.name, element.id) + }); return map; } From fa5e1a5e660086475128c0744bd69048eea41b08 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Thu, 24 Feb 2022 13:48:43 -0300 Subject: [PATCH 44/54] Add some validations to sql generator --- app/angular/service/sqlGeneratorService.js | 20 ++++++++++++++++++-- app/i18n/languages/en.js | 1 + app/i18n/languages/pt_BR.js | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js index 509fac4f..37006dec 100644 --- a/app/angular/service/sqlGeneratorService.js +++ b/app/angular/service/sqlGeneratorService.js @@ -49,14 +49,30 @@ const sqlGeneratorService = () => { return join[attributeName].match(REGEX_TABLE_COLUMN_NAME).groups.table; } - const createViewJoins = (view, baseTable) => view.queryConditions.joins.map(join => `\nINNER JOIN ${getJoinTable(join, baseTable)} ON ${cleanString(join.columnName)} = ${cleanString(join.columnName2)}`) + const filterTableWithColunmsSelected = table => table.columns.some(filterSelectedItem); + + const createViewJoins = (view, baseTable) => { + if (view.queryConditions && view.queryConditions.joins) { + return view.queryConditions.joins.map(join => `\nINNER JOIN ${getJoinTable(join, baseTable)} ON ${cleanString(join.columnName)} = ${cleanString(join.columnName2)}`) + } else { + return ''; + } + }; + + const getWhereCondition = view => { + if (view.queryConditions && view.queryConditions.text) { + return `WHERE ${view.queryConditions.text}\n`; + } else { + return ''; + } + }; const createViewScript = (view) => { const selectedTables = view.tables.filter(filterSelectedItem); const hasMultipleTables = selectedTables.length > 1; const baseTable = selectedTables[0].name; - return `\nCREATE VIEW ${view.name} AS \nSELECT ${selectedTables.map(table => mapViewSelectedColumn(table, hasMultipleTables)).join(", ")}\nFROM ${baseTable}${createViewJoins(view, baseTable)}\nWHERE ${view.queryConditions.text}\n` + return `\nCREATE VIEW ${view.name} AS \nSELECT ${selectedTables.filter(filterTableWithColunmsSelected).map(table => mapViewSelectedColumn(table, hasMultipleTables)).join(", ")}\nFROM ${baseTable}${createViewJoins(view, baseTable)}\n${getWhereCondition(view)}` } const createAlterTable = function(key, table){ diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index 91086e12..db590602 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -6,6 +6,7 @@ export default { 'Change language': 'Change language', 'Language': 'Language', 'Recovery password': 'Recovery password', + 'Recovery': 'Recovery', 'Report a bug or request a feature': 'Report a bug or request a feature', 'Back': 'Back', 'Redefine password': 'Redefine password', diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index 12c37c99..09ca5dda 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -6,6 +6,7 @@ export default { 'Change language': 'Mudar idioma', 'Language': 'Idioma', 'Recovery password': 'Recuperar senha', + 'Recovery': 'Recuperar', 'Report a bug or request a feature': 'Reportar bug ou requisitar funcionalidade', 'Back': 'Voltar', 'Redefine password': 'Redefinir senha', From 1ea0408516700529a1726bc376623f0885759800 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Thu, 24 Feb 2022 19:45:55 -0300 Subject: [PATCH 45/54] Adjustments in the creation of the joins --- app/angular/service/sqlGeneratorService.js | 17 +++++++++++------ app/angular/view/view.html | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js index 37006dec..d518ab44 100644 --- a/app/angular/service/sqlGeneratorService.js +++ b/app/angular/service/sqlGeneratorService.js @@ -40,20 +40,25 @@ const sqlGeneratorService = () => { return sql; } + const filterTableColumn = (tables, column) => tables.some(table => column.includes(table)); + const filterSelectedItem = item => item.selected; const mapViewSelectedColumn = (table, hasMultipleTables) => table.columns.filter(filterSelectedItem).map(column => `${hasMultipleTables ? table.name + '.' : ''}${cleanString(column.name)}`).join(", "); - const getJoinTable = (join, baseTable) => { - const attributeName = `columnName${join.columnName.includes(baseTable) ? '2' : ''}`; - return join[attributeName].match(REGEX_TABLE_COLUMN_NAME).groups.table; - } - const filterTableWithColunmsSelected = table => table.columns.some(filterSelectedItem); const createViewJoins = (view, baseTable) => { if (view.queryConditions && view.queryConditions.joins) { - return view.queryConditions.joins.map(join => `\nINNER JOIN ${getJoinTable(join, baseTable)} ON ${cleanString(join.columnName)} = ${cleanString(join.columnName2)}`) + let tables = [baseTable]; + const joins = view.queryConditions.joins.map(join => { + let joinTable; + const attributeName = `columnName${filterTableColumn(tables, join.columnName) ? '2' : ''}`; + joinTable = join[attributeName].match(REGEX_TABLE_COLUMN_NAME).groups.table;; + tables.push(joinTable); + return ({ ...join, table: joinTable }); + }); + return joins.map(join => `\nINNER JOIN ${join.table} ON ${cleanString(join.columnName)} = ${cleanString(join.columnName2)}`) } else { return ''; } diff --git a/app/angular/view/view.html b/app/angular/view/view.html index fbab5e89..f29eda20 100644 --- a/app/angular/view/view.html +++ b/app/angular/view/view.html @@ -75,9 +75,9 @@
    {{ table.name }}
    • -
    +
    From f44df0fcfb42f35ade91684c2da259603f42e7cd Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Fri, 25 Feb 2022 21:47:12 -0300 Subject: [PATCH 46/54] Adjustments in sql script generation --- app/angular/components/sqlGeneratorModal.html | 2 +- app/angular/service/sqlGeneratorService.js | 17 +++++++++-------- app/angular/view/view.js | 2 +- app/sass/form.scss | 4 ++++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/angular/components/sqlGeneratorModal.html b/app/angular/components/sqlGeneratorModal.html index 466e1ce6..c0d4dad4 100644 --- a/app/angular/components/sqlGeneratorModal.html +++ b/app/angular/components/sqlGeneratorModal.html @@ -6,7 +6,7 @@

    {{ 'SQL' | translate }}

    - +
    diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js index d518ab44..fb63b304 100644 --- a/app/angular/service/sqlGeneratorService.js +++ b/app/angular/service/sqlGeneratorService.js @@ -51,10 +51,9 @@ const sqlGeneratorService = () => { const createViewJoins = (view, baseTable) => { if (view.queryConditions && view.queryConditions.joins) { let tables = [baseTable]; - const joins = view.queryConditions.joins.map(join => { - let joinTable; - const attributeName = `columnName${filterTableColumn(tables, join.columnName) ? '2' : ''}`; - joinTable = join[attributeName].match(REGEX_TABLE_COLUMN_NAME).groups.table;; + const joins = view.queryConditions.joins.filter(join => join.submitted).map(join => { + const attributeName = `columnName${filterTableColumn(tables, join.columnName.match(REGEX_TABLE_COLUMN_NAME).groups.table) ? '2' : ''}`; + const joinTable = join[attributeName].match(REGEX_TABLE_COLUMN_NAME).groups.table; tables.push(joinTable); return ({ ...join, table: joinTable }); }); @@ -73,11 +72,13 @@ const sqlGeneratorService = () => { }; const createViewScript = (view) => { + console.log(view); const selectedTables = view.tables.filter(filterSelectedItem); - const hasMultipleTables = selectedTables.length > 1; - const baseTable = selectedTables[0].name; - - return `\nCREATE VIEW ${view.name} AS \nSELECT ${selectedTables.filter(filterTableWithColunmsSelected).map(table => mapViewSelectedColumn(table, hasMultipleTables)).join(", ")}\nFROM ${baseTable}${createViewJoins(view, baseTable)}\n${getWhereCondition(view)}` + if (selectedTables.length > 0) { + const hasMultipleTables = selectedTables.length > 1; + const baseTable = selectedTables[0].name; + return `\nCREATE VIEW ${view.name} AS \nSELECT ${selectedTables.filter(filterTableWithColunmsSelected).map(table => mapViewSelectedColumn(table, hasMultipleTables)).join(", ")}\nFROM ${baseTable}${createViewJoins(view, baseTable)}\n${getWhereCondition(view)}` + } } const createAlterTable = function(key, table){ diff --git a/app/angular/view/view.js b/app/angular/view/view.js index a494857f..bec91518 100644 --- a/app/angular/view/view.js +++ b/app/angular/view/view.js @@ -34,7 +34,7 @@ const Controller = function (LogicService, $uibModal) { }); modalInstance.result.then(({ conditions, joins }) => { $ctrl.view.queryConditions = { - joins, + joins: joins.filter(join => join.submitted), values: conditions, text: `${conditions.map(({ columnName, type, comparativeValue, comparativeValue2, logicalOperator }, index) => `${columnName} ${comparasionOperators[type](comparativeValue, comparativeValue2)} ${conditions.length - 1 === index ? '' : logicalOperator}`).join(" ")}` diff --git a/app/sass/form.scss b/app/sass/form.scss index 2d3c546c..db786d8b 100644 --- a/app/sass/form.scss +++ b/app/sass/form.scss @@ -177,6 +177,10 @@ textarea { resize: vertical; } +textarea.sql-script { + min-height: 500px; +} + input[type="checkbox"] { cursor: pointer; } From 27bc2e48a6aaeffa9fc51377e93319876d069920 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sat, 26 Feb 2022 22:59:29 -0300 Subject: [PATCH 47/54] Add links to view when save --- app/angular/service/logicService.js | 27 ++++++++++++++++++++++++- app/angular/service/toolsViewService.js | 11 +++++----- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index 9b685e7f..9ed3b23b 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -184,8 +184,13 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) } }); + ls.getConnectionType = link => { + const target = link.graph.getCell(link.get('target').id); + return target?.attributes?.type === 'uml.Abstract' ? 'Table-View' : ''; + } + ls.paper.on('link:mouseenter', (linkView) => { - const toolsView = ls.toolsViewService.getToolsView(); + const toolsView = ls.toolsViewService.getToolsView(ls.getConnectionType(linkView.model)); linkView.addTools(toolsView); }); @@ -394,7 +399,27 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) $rootScope.$broadcast('element:update', ls.selectedElement); } + ls.createLink = function (tableId) { + const myLink = new joint.shapes.erd.Line({ + source: { id: tableId }, + target: { id: ls.selectedElement.model.id } + }); + myLink.addTo(ls.graph); + } + + ls.removeLink = function (tableId, graph) { + const link = graph.getLinks(ls.selectedElement.model).find(({ attributes: { source, target } }) => source.id === tableId && target.id === ls.selectedElement.model.id); + link.remove(); + } + ls.save = function (view) { + const graph = ls.selectedElement.model.graph; + const neighbors = graph.getNeighbors(ls.selectedElement.model); + view.tables.forEach(table => { + let linkedTable = neighbors.find(({ attributes: { id } }) => id === table.id); + if (!table.selected && linkedTable) ls.removeLink(table.id, graph); + if (table.selected && !linkedTable) ls.createLink(table.id); + }); ls.selectedElement.model.saveView(view); $rootScope.$broadcast('element:update', ls.selectedElement); } diff --git a/app/angular/service/toolsViewService.js b/app/angular/service/toolsViewService.js index 703e744f..afadf3ae 100644 --- a/app/angular/service/toolsViewService.js +++ b/app/angular/service/toolsViewService.js @@ -3,14 +3,14 @@ import * as joint from "jointjs/dist/joint"; export default class ToolsViewService { constructor() { const defaultTools = this.#createDefaultTools(); - this.toolsWithInfo = new joint.dia.ToolsView({ tools: [...defaultTools, new joint.shapes.erd.InfoButton()] }); - this.tools = new joint.dia.ToolsView({ tools: defaultTools }) + this.toolsWithInfo = new joint.dia.ToolsView({ tools: [...defaultTools, new joint.shapes.erd.InfoButton(), new joint.linkTools.Remove()] }); + this.tools = new joint.dia.ToolsView({ tools: [...defaultTools, new joint.linkTools.Remove()] }) + this.toolsWithoutRemove = new joint.dia.ToolsView({ tools: defaultTools }); } getToolsView(conectionType = "") { - if (conectionType === "Entity-Relationship") { - return this.toolsWithInfo; - } + if (conectionType === "Entity-Relationship") return this.toolsWithInfo; + if (conectionType === "Table-View") return this.toolsWithoutRemove; return this.tools; } @@ -21,7 +21,6 @@ export default class ToolsViewService { new joint.linkTools.SourceArrowhead(), new joint.linkTools.TargetArrowhead(), new joint.linkTools.Boundary(), - new joint.linkTools.Remove() ] } From 52598cd6a6154ce27622d249424b528fb5e6a63d Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sun, 10 Apr 2022 11:26:52 -0300 Subject: [PATCH 48/54] Fix - code review --- .../components/queryExpressionModal/index.js | 7 +++-- .../queryExpressionModal/styles.scss | 3 ++ .../queryExpressionModal/template.html | 2 +- app/angular/logic/columnForm.js | 10 +++---- app/angular/service/logicService.js | 5 ---- app/angular/service/sqlGeneratorService.js | 1 - app/angular/view/view.js | 5 ++-- app/joint/table.js | 29 +++++++++---------- app/sass/selectOptions.scss | 4 +-- 9 files changed, 32 insertions(+), 34 deletions(-) diff --git a/app/angular/components/queryExpressionModal/index.js b/app/angular/components/queryExpressionModal/index.js index 28e4c1e1..b520835e 100644 --- a/app/angular/components/queryExpressionModal/index.js +++ b/app/angular/components/queryExpressionModal/index.js @@ -4,6 +4,9 @@ import "./styles.scss"; const app = angular.module("app.queryExpressionModalController", []); +const AND_OPERATOR = 'AND'; +const OR_OPERATOR = 'OR'; + const Controller = function ($filter) { const $ctrl = this; $ctrl.submitted = false; @@ -22,7 +25,7 @@ const Controller = function ($filter) { type: null, comparativeValue: null, submitted: false, - logicalOperator: 'AND', + logicalOperator: AND_OPERATOR, }; $ctrl.selectColumnJoin = (selected, attribute, index) => { @@ -53,7 +56,7 @@ const Controller = function ($filter) { const selectedCondition = $ctrl.conditions[index]; $ctrl.conditions[index] = { ...selectedCondition, - logicalOperator: selectedCondition.logicalOperator === 'AND' ? 'OR' : 'AND', + logicalOperator: selectedCondition.logicalOperator === AND_OPERATOR ? OR_OPERATOR : AND_OPERATOR, }; } diff --git a/app/angular/components/queryExpressionModal/styles.scss b/app/angular/components/queryExpressionModal/styles.scss index 8c970d24..865f21a0 100644 --- a/app/angular/components/queryExpressionModal/styles.scss +++ b/app/angular/components/queryExpressionModal/styles.scss @@ -38,4 +38,7 @@ width: 100%; } } + .modal-message { + margin-top: 16px; + } } \ No newline at end of file diff --git a/app/angular/components/queryExpressionModal/template.html b/app/angular/components/queryExpressionModal/template.html index 97f7148c..dbd9a096 100644 --- a/app/angular/components/queryExpressionModal/template.html +++ b/app/angular/components/queryExpressionModal/template.html @@ -38,7 +38,7 @@

    {{ 'Create query expression' | translate }}

    -

    {{ 'Add conditions to create query expression that will be used in the where clause when creating the view.' | translate }}

    +

    {{ 'Add conditions to create query expression that will be used in the where clause when creating the view.' | translate }}

    diff --git a/app/angular/logic/columnForm.js b/app/angular/logic/columnForm.js index c06b3699..c6bed617 100644 --- a/app/angular/logic/columnForm.js +++ b/app/angular/logic/columnForm.js @@ -10,7 +10,7 @@ const Controller = function () { $ctrl.dismiss(); }; - $ctrl.selectType = function (selected) { + $ctrl.selectType = function (selected) { if (!$ctrl.column.PK && !$ctrl.column.FK) { $ctrl.column.type = selected.type; } else { @@ -18,7 +18,7 @@ const Controller = function () { } } - $ctrl.selectTableOrigin = function (selected) { + $ctrl.selectTableOrigin = function (selected) { $ctrl.column.tableOrigin.idName = selected.name; } }; @@ -28,9 +28,9 @@ export default app.component("columnForm", { bindings: { save: "<", dismiss: "&", - column: "<", - index: "<", - tableNames: "<", + column: "<", + index: "<", + tableNames: "<", delete: "<" }, controller: Controller, diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index 9ed3b23b..9158ef95 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -511,11 +511,6 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) })); }; - ls.filterTablesWithRelationship = (tableId) => { - const tables = ls.loadTables(); - return tables.filter(table => table.columns.some(({ tableOrigin }) => tableOrigin.idOrigin === tableId)); - } - ls.loadViewsByTable = (tableId) => { const elements = ls.graph.getElements(); return elements.filter(isView) diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js index fb63b304..5db74c0e 100644 --- a/app/angular/service/sqlGeneratorService.js +++ b/app/angular/service/sqlGeneratorService.js @@ -72,7 +72,6 @@ const sqlGeneratorService = () => { }; const createViewScript = (view) => { - console.log(view); const selectedTables = view.tables.filter(filterSelectedItem); if (selectedTables.length > 0) { const hasMultipleTables = selectedTables.length > 1; diff --git a/app/angular/view/view.js b/app/angular/view/view.js index bec91518..e7205df5 100644 --- a/app/angular/view/view.js +++ b/app/angular/view/view.js @@ -68,15 +68,14 @@ const Controller = function (LogicService, $uibModal) { filteredTables.forEach(table => { table.columns.forEach(column => { if (column.selected) columns.push(column); - }) - }) + }); + }); const view = { ...$ctrl.view, basedIn: filteredTables, columns, } LogicService.save(view); - } }; diff --git a/app/joint/table.js b/app/joint/table.js index fd6a98a3..0a44f3c5 100644 --- a/app/joint/table.js +++ b/app/joint/table.js @@ -117,9 +117,9 @@ uml.Class = joint.shapes.basic.Generic.extend({ }, - getType: function() { - return "Class" - } + getType: function() { + return "Class" + } }); @@ -182,21 +182,20 @@ uml.Abstract = joint.shapes.basic.Generic.extend({ return this.get('name'); }, - saveView: function (view) { - this.set('attributes', view.columns.map(column => column.name)); - this.set('objects', view.basedIn); - this.set('queryConditions', view.queryConditions); + saveView: function (view) { + this.set('attributes', view.columns.map(column => column.name)); + this.set('objects', view.basedIn); + this.set('queryConditions', view.queryConditions); this.updateRectangles(); this.trigger('uml-update'); - }, + }, - addAttributes: function (objects) { - objects.forEach(({ name }) => this.get('attributes').push(name)); + addAttributes: function (objects) { + objects.forEach(({ name }) => this.get('attributes').push(name)); this.get('objects').push(objects); this.updateRectangles(); this.trigger('uml-update'); - }, - + }, updateRectangles: function () { @@ -224,9 +223,9 @@ uml.Abstract = joint.shapes.basic.Generic.extend({ }, - getType: function() { - return "View" - } + getType: function() { + return "View" + } }); diff --git a/app/sass/selectOptions.scss b/app/sass/selectOptions.scss index c2a21af0..5f065e91 100644 --- a/app/sass/selectOptions.scss +++ b/app/sass/selectOptions.scss @@ -2,7 +2,7 @@ // MODULES / DROPDOWN - OLD //////////////////////////////////////////////////////////////////////////////// .dropdown-tmp { - position: relative; + position: relative; width: 100%; } @@ -41,7 +41,7 @@ } .dropdown-tmp-trigger > button:disabled { - color: #c0c0c0; + color: #c0c0c0; background-color: #ddd; } From 53b4993d32503eb46a3a4d82b7d9ad09a32f1712 Mon Sep 17 00:00:00 2001 From: Arthur Mota Date: Sat, 30 Apr 2022 15:44:18 -0300 Subject: [PATCH 49/54] Code review adjustments --- .../components/queryExpressionModal/index.js | 4 ++-- .../components/queryExpressionModal/template.html | 14 +++++++------- app/angular/logic/columnForm.html | 2 +- app/angular/logic/columnForm.js | 8 ++++++++ app/angular/logic/logic.js | 4 +--- app/angular/service/sqlGeneratorService.js | 4 ++-- app/i18n/languages/en.js | 2 +- app/i18n/languages/pt_BR.js | 2 +- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/app/angular/components/queryExpressionModal/index.js b/app/angular/components/queryExpressionModal/index.js index b520835e..ec8e931b 100644 --- a/app/angular/components/queryExpressionModal/index.js +++ b/app/angular/components/queryExpressionModal/index.js @@ -15,8 +15,8 @@ const Controller = function ($filter) { $ctrl.tableColumns = []; const defaultJoin = { - columnName: null, - columnName2: null, + columnNameOrigin: null, + columnNameTarget: null, } const defaultCondition = { diff --git a/app/angular/components/queryExpressionModal/template.html b/app/angular/components/queryExpressionModal/template.html index dbd9a096..b5bd757c 100644 --- a/app/angular/components/queryExpressionModal/template.html +++ b/app/angular/components/queryExpressionModal/template.html @@ -4,12 +4,12 @@

    {{ 'Create query expression' | translate }}

    -

    {{ 'You have chosen more than one table to create the View. It is necessary to select the attributes that will compose the JOIN.' | translate }}

    +

    {{ 'You have chosen multiple tables to create the View. It is necessary to select the attributes that will compose the JOIN clause.' | translate }}

    - {{ join.columnName + ' = ' + join.columnName2 }} + {{ join.columnNameOrigin + ' = ' + join.columnNameTarget }} @@ -18,18 +18,18 @@

    {{ 'Create query expression' | translate }}

    - +
    diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html index f9c0609f..ac3de910 100644 --- a/app/angular/logic/columnForm.html +++ b/app/angular/logic/columnForm.html @@ -14,7 +14,7 @@ + options="$ctrl.columnTypes">
    diff --git a/app/angular/logic/columnForm.js b/app/angular/logic/columnForm.js index c6bed617..57bc7e9a 100644 --- a/app/angular/logic/columnForm.js +++ b/app/angular/logic/columnForm.js @@ -6,6 +6,14 @@ const app = angular.module("app.columnForm", []); const Controller = function () { const $ctrl = this; + $ctrl.columnTypes = [ + { name: 'DATE', type: 'DATE' }, + { name: 'FLOAT', type: 'FLOAT' }, + { name: 'VARCHAR(n)', type: 'VARCHAR(n)' }, + { name: 'CHAR(n)', type: 'CHAR(n)' }, + { name: 'INT', type: 'INT' } + ]; + $ctrl.cancel = () => { $ctrl.dismiss(); }; diff --git a/app/angular/logic/logic.js b/app/angular/logic/logic.js index 2e135bcd..d4a6fc6e 100644 --- a/app/angular/logic/logic.js +++ b/app/angular/logic/logic.js @@ -178,9 +178,7 @@ const controller = function ( } ctrl.generateSQL = function () { - var sql = SqlGeneratorService.generate(LogicService.buildTablesJson(), LogicService.loadViews()); - - console.log(sql); + const sql = SqlGeneratorService.generate(LogicService.buildTablesJson(), LogicService.loadViews()); $uibModal.open({ animation: true, diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js index 5db74c0e..3cd6ef6c 100644 --- a/app/angular/service/sqlGeneratorService.js +++ b/app/angular/service/sqlGeneratorService.js @@ -52,12 +52,12 @@ const sqlGeneratorService = () => { if (view.queryConditions && view.queryConditions.joins) { let tables = [baseTable]; const joins = view.queryConditions.joins.filter(join => join.submitted).map(join => { - const attributeName = `columnName${filterTableColumn(tables, join.columnName.match(REGEX_TABLE_COLUMN_NAME).groups.table) ? '2' : ''}`; + const attributeName = `columnName${filterTableColumn(tables, join.columnNameOrigin.match(REGEX_TABLE_COLUMN_NAME).groups.table) ? 'Target' : 'Origin'}`; const joinTable = join[attributeName].match(REGEX_TABLE_COLUMN_NAME).groups.table; tables.push(joinTable); return ({ ...join, table: joinTable }); }); - return joins.map(join => `\nINNER JOIN ${join.table} ON ${cleanString(join.columnName)} = ${cleanString(join.columnName2)}`) + return joins.map(join => `\nINNER JOIN ${join.table} ON ${cleanString(join.columnNameOrigin)} = ${cleanString(join.columnNameTarget)}`) } else { return ''; } diff --git a/app/i18n/languages/en.js b/app/i18n/languages/en.js index db590602..a1feed9d 100644 --- a/app/i18n/languages/en.js +++ b/app/i18n/languages/en.js @@ -145,6 +145,6 @@ export default { 'English': 'English', 'AND': 'AND', 'OR': 'OR', - 'You have chosen more than one table to create the View. It is necessary to select the attributes that will compose the JOIN.': 'You have chosen more than one table to create the View. It is necessary to select the attributes that will compose the JOIN.', + 'You have chosen multiple tables to create the View. It is necessary to select the attributes that will compose the JOIN clause.': 'You have chosen multiple tables to create the View. It is necessary to select the attributes that will compose the JOIN clause.', 'Add join': 'Add join', }; \ No newline at end of file diff --git a/app/i18n/languages/pt_BR.js b/app/i18n/languages/pt_BR.js index 09ca5dda..2814a9f2 100644 --- a/app/i18n/languages/pt_BR.js +++ b/app/i18n/languages/pt_BR.js @@ -145,6 +145,6 @@ export default { 'English': 'Inglês', 'AND': 'E', 'OR': 'OU', - 'You have chosen more than one table to create the View. It is necessary to select the attributes that will compose the JOIN.': 'Você escolheu mais de uma tabela para a criação da Visão. É necessário selecionar os atributos que irão compor o JOIN.', + 'You have chosen multiple tables to create the View. It is necessary to select the attributes that will compose the JOIN clause.': 'Você escolheu mais de uma tabela para a criação da Visão. É necessário selecionar os atributos que irão compor o JOIN.', 'Add join': 'Adicionar join', }; \ No newline at end of file From 3c017ddce954ceed861bfe06611f1677f16863fd Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Thu, 23 Jun 2022 22:46:41 -0300 Subject: [PATCH 50/54] Prevent link from being detached --- app/angular/conceptual/conceptual.js | 3 ++- app/angular/service/logicService.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/angular/conceptual/conceptual.js b/app/angular/conceptual/conceptual.js index c083bb98..ca6c8ba3 100644 --- a/app/angular/conceptual/conceptual.js +++ b/app/angular/conceptual/conceptual.js @@ -460,7 +460,8 @@ const controller = function (ModelAPI, $stateParams, $rootScope, $timeout, $uibM drawGrid: true, model: configs.graph, linkConnectionPoint: joint.util.shapePerimeterConnectionPoint, - cellViewNamespace: joint.shapes + cellViewNamespace: joint.shapes, + linkPinning: false }); configs.keyboardController = new KeyboardController(configs.paper.$document); diff --git a/app/angular/service/logicService.js b/app/angular/service/logicService.js index d038a74e..16498f36 100644 --- a/app/angular/service/logicService.js +++ b/app/angular/service/logicService.js @@ -44,7 +44,8 @@ const logicService = ($rootScope, ModelAPI, LogicFactory, LogicConversorService) height: $('#content').height(), gridSize: 10, drawGrid: true, - model: ls.graph + model: ls.graph, + linkPinning: false }); ls.editorActions = new joint.ui.EditorActions({ graph: ls.graph }); From 9df6f10af7c37dbd33493a94566e9948da4a59c7 Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Sun, 26 Jun 2022 14:21:48 -0300 Subject: [PATCH 51/54] Upgrade nodemon --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 940579f4..5507a762 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "html-webpack-plugin": "5.5.0", "jest": "^27.4.3", "mini-css-extract-plugin": "^2.4.5", - "nodemon": "^2.0.7", + "nodemon": "^2.0.18", "postcss-loader": "^6.2.1", "prettier": "^2.5.1", "raw-loader": "^4.0.2", diff --git a/yarn.lock b/yarn.lock index f54295b1..53a3821d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6309,10 +6309,10 @@ node-releases@^2.0.1: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== -nodemon@^2.0.7: - version "2.0.15" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.15.tgz#504516ce3b43d9dc9a955ccd9ec57550a31a8d4e" - integrity sha512-gdHMNx47Gw7b3kWxJV64NI+Q5nfl0y5DgDbiVtShiwa7Z0IZ07Ll4RLFo6AjrhzMtoEZn5PDE3/c2AbVsiCkpA== +nodemon@^2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.18.tgz#0f5a3aa7b4587f2626e6f01369deba89cb0462a2" + integrity sha512-uAvrKipi2zAz8E7nkSz4qW4F4zd5fs2wNGsTx+xXlP8KXqd9ucE0vY9wankOsPboeDyuUGN9vsXGV1pLn80l/A== dependencies: chokidar "^3.5.2" debug "^3.2.7" From 0ff3facecaa7bd02d229342514b28a124cf175f5 Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Sun, 26 Jun 2022 15:53:48 -0300 Subject: [PATCH 52/54] fix issue force production traffic via HTTPS #353 --- app/angular/index.js | 9 +++++++++ app/index.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/angular/index.js b/app/angular/index.js index 343da232..a51160ce 100644 --- a/app/angular/index.js +++ b/app/angular/index.js @@ -74,6 +74,7 @@ app.config([ function ($urlRouterProvider, $stateProvider) { $stateProvider.state("login", { + title: "Login - BRMW", url: "/", component: "login", data: { @@ -88,6 +89,7 @@ app.config([ }); $stateProvider.state("register", { + title: "Register - BRMW", url: "/register", component: "signup", data: { @@ -102,6 +104,7 @@ app.config([ }); $stateProvider.state("recovery", { + title: "Recovery - BRMW", url: "/recovery", component: "recovery", data: { @@ -116,6 +119,7 @@ app.config([ }); $stateProvider.state("reset", { + title: "Reset password - BRMW", url: "/reset/{mail}/{code}", component: "resetPassword", data: { @@ -130,6 +134,7 @@ app.config([ }); $stateProvider.state("main", { + title: "Models list - BRMW", url: "/main", component: "workspace", data: { @@ -144,6 +149,7 @@ app.config([ }); $stateProvider.state("conceptual", { + title: "Conceptual model - BRMW", url: "/conceptual/{modelid}", component: "editorConceptual", data: { @@ -158,6 +164,7 @@ app.config([ }); $stateProvider.state("logic", { + title: "Logic model - BRMW", url: "/logic/{references:json}", component: "editorLogic", data: { @@ -193,6 +200,8 @@ app.run(function ($transitions, $rootScope, AuthService, $state) { $state.go("login"); } } + + $rootScope.title = trans.to().title; }); }); diff --git a/app/index.html b/app/index.html index 5666b29c..ade592ac 100644 --- a/app/index.html +++ b/app/index.html @@ -2,7 +2,7 @@ - brModeloWeb + brModeloWeb From ffbedadfb856d3f91de7836159a147a60c165309 Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Sun, 26 Jun 2022 23:43:47 -0300 Subject: [PATCH 53/54] fix issue force production traffic via HTTPS #353 --- package.json | 3 ++- server_app/app.js | 3 +++ yarn.lock | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5507a762..3362d620 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "express": "^4.17.1", "express-fileupload": "^1.4.0", "express-session": "^1.17.1", + "express-sslify": "^1.2.0", "font-awesome": "^4.7.0", "form-data": "^4.0.0", "hotkeys-js": "^3.8.7", @@ -85,10 +86,10 @@ "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^8.3.0", "eslint-import-resolver-typescript": "^2.5.0", + "eslint-plugin-cypress": "^2.12.1", "eslint-plugin-import": "^2.25.3", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-react": "^7.27.1", - "eslint-plugin-cypress": "^2.12.1", "faker": "^5.5.3", "file-loader": "^6.2.0", "html-loader": "^3.0.1", diff --git a/server_app/app.js b/server_app/app.js index e054ebfa..688bca5c 100644 --- a/server_app/app.js +++ b/server_app/app.js @@ -6,11 +6,14 @@ const session = require("express-session"); const bodyParser = require("body-parser"); const path = require("path"); const cors = require("cors"); +const enforce = require('express-sslify'); require("dotenv").config(); let app = express(); +app.use(enforce.HTTPS({ trustProtoHeader: true })); + // Where to find the view files const viewsPath = path.join(__dirname, "../views"); app.set("views", viewsPath); diff --git a/yarn.lock b/yarn.lock index 53a3821d..302c27dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3986,6 +3986,11 @@ express-session@^1.17.1: safe-buffer "5.2.1" uid-safe "~2.1.5" +express-sslify@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/express-sslify/-/express-sslify-1.2.0.tgz#30e84bceed1557eb187672bbe1430a0a2a100d9c" + integrity sha512-OOf2B3MxAVjEXPPWl4Z19wA2oMH+RCULJVhejPwuhiDDClr9QczZz5ycABLSnnN+oY8JcLs32ghs9cxOj0vi+w== + express@^4.17.1: version "4.17.2" resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3" From a6f93869c4d64a197b01a20ff1975e42d2c3b97d Mon Sep 17 00:00:00 2001 From: Milton Bittencourt Date: Mon, 27 Jun 2022 00:32:40 -0300 Subject: [PATCH 54/54] Fix composed attribute img load --- app/joint/shapes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/joint/shapes.js b/app/joint/shapes.js index f553f0f7..4d72793b 100644 --- a/app/joint/shapes.js +++ b/app/joint/shapes.js @@ -1,5 +1,6 @@ import * as joint from "jointjs/dist/joint"; import _ from "lodash"; +import composedImg from "../img/composto-01.png" const erd = joint.shapes.erd; @@ -272,7 +273,7 @@ erd.ComposedAttribute = joint.shapes.basic.Generic.extend({ size: { width: 60, height: 40 }, attrs: { 'rect': { fill: 'transparent', stroke: 'transparent', width: 50, height: 30 }, - 'image': { "xlink:href": "/img/composto-01.png" }, + 'image': { "xlink:href": composedImg }, } }, joint.shapes.basic.Generic.prototype.defaults) });