Release/v0.1.6 (#435)

* Fix redirect unix socket vulnerability * Force https only on production mode * Upgrade jointJs * Remove transitive imports * Upgrade database dependencies * Upgrade express * Bump terser from 5.10.0 to 5.14.2 Bumps [terser](https://github.com/terser/terser) from 5.10.0 to 5.14.2. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Update yarn packages * Update issue templates - Change issue template - Translate it's contents to pt-br * Update issue templates - Fix typo - Add separators * Improve login security * Improve register security * Improve reset password security * Hide user from recovery request * Short reuse refac * feat(config): Update Dockerfile and docker-compose * Bump loader-utils from 2.0.2 to 2.0.3 Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.2 to 2.0.3. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.3/CHANGELOG.md) - [Commits](webpack/loader-utils@v2.0.2...v2.0.3) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump minimatch from 3.0.4 to 3.1.2 Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump loader-utils from 2.0.3 to 2.0.4 Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md) - [Commits](webpack/loader-utils@v2.0.3...v2.0.4) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump qs from 6.5.2 to 6.5.3 Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](ljharb/qs@v6.5.2...v6.5.3) --- updated-dependencies: - dependency-name: qs dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Create delete account rounte * WIP: Add Preferences page * Preferences page - Enable translations, - Add missing array when exporting app.preferences * User preferences page markup - HTML markup - Some custom CSS to forms.scss had to be added - EN and PT-BR translations * Create delete account service * Bump json5 from 1.0.1 to 1.0.2 Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Create delete account feature * Apply formatting * Apply formatting * Preferences page adjustments - Add back button - Reduce input text width for name and email - Break text from delete account warning in multiple lines * Create delete account API * Create delete account frontend feature * Bump cookiejar from 2.1.3 to 2.1.4 Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/bmeck/node-cookiejar/releases) - [Commits](https://github.com/bmeck/node-cookiejar/commits) --- updated-dependencies: - dependency-name: cookiejar dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Create CODE_OF_CONDUCT.md * Bump webpack from 5.73.0 to 5.76.0 Bumps [webpack](https://github.com/webpack/webpack) from 5.73.0 to 5.76.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.73.0...v5.76.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * Adding optional chaining to avoid errors * Fix bug when try to edit column FK --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Milton Bittencourt <[email protected]> Co-authored-by: Milton Bittencourt <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Idmar Ramos Jr. (Id) <[email protected]> Co-authored-by: João Paulo M Fiumari <[email protected]>
brmodeloweb · Aug 7, 2023 · 4102825 · 4102825
1 parent 539e0e2
commit 4102825
Show file tree

Hide file tree

Showing 6 changed files with 3,431 additions and 2,743 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[email protected].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/app/angular/logic/columnForm.html b/app/angular/logic/columnForm.html
@@ -91,7 +91,7 @@
 		<dropdown
 			disabled="!$ctrl.column.FK"
 			on-select="$ctrl.selectTableOrigin(selected)"
-			selected="{name: 'ORIGEM', type: 'ORIGEM'}"
+			selected="{name: $ctrl.column.tableOrigin.idName || 'ORIGEM', type: $ctrl.column.tableOrigin.idOrigin || 'ORIGEM'}"
 			options="$ctrl.tableNames">
 		</dropdown>
 	</div>

diff --git a/app/angular/logic/sidebarControl.js b/app/angular/logic/sidebarControl.js
@@ -34,9 +34,21 @@ const Controller = function (LogicService) {
 		LogicService.deleteColumn($index);
 	}
 
+	$ctrl.getTableOriginName = (tableId) => {
+		const tables = [...$ctrl.mapTables].map(([name, value]) => ({ name, value }));
+		return tables.find(() => tableId)?.name;
+	}
+
 	$ctrl.editionColumnMode = (column) => {
 		loadTableNames();
-		$ctrl.editColumnModel = JSON.parse(JSON.stringify(column));
+		const columnValues = JSON.parse(JSON.stringify(column));
+		$ctrl.editColumnModel = {
+			...columnValues,
+			tableOrigin: {
+				...columnValues.tableOrigin,
+				idName: $ctrl.getTableOriginName(columnValues.tableOrigin.idOrigin),
+			}
+		};
 		$ctrl.closeAllColumns();
 		column.expanded = true;
 	}
@@ -53,14 +65,12 @@ const Controller = function (LogicService) {
 	}
 
 	$ctrl.editColumn = (editedColumn, $index) => {
-		if (editedColumn.name == "") {
-			$ctrl.showFeedback("The column name cannot be empty!", true, "error");
-			return;
-		}
-
-		LogicService.editColumn($index, editedColumn);
+		const column = $ctrl.checkColumnBeforeSave(editedColumn);
 
-		$ctrl.closeAllColumns();
+		if (column) {
+			LogicService.editColumn($index, editedColumn);
+			$ctrl.closeAllColumns();
+		}
 	}
 
 	$ctrl.closeAllColumns = function () {
@@ -69,7 +79,7 @@ const Controller = function (LogicService) {
 		});
 	}
 
-	$ctrl.addColumn = function (column) {
+	$ctrl.checkColumnBeforeSave = function (column) {
 		if (column.name == "") {
 			$ctrl.showFeedback("The column name cannot be empty!", true, "error");
 			return;
@@ -82,9 +92,17 @@ const Controller = function (LogicService) {
 			column.tableOrigin.idOrigin = $ctrl.mapTables.get(column.tableOrigin.idName);
 		}
 
-		LogicService.addColumn(column);
-		$ctrl.addColumnModel = $ctrl.newColumnObject();
-		$ctrl.addColumnVisible = false;
+		return column;
+	}
+
+	$ctrl.addColumn = function (addedColumn) {
+		const column = $ctrl.checkColumnBeforeSave(addedColumn);
+
+		if (column) {
+			LogicService.addColumn(column);
+			$ctrl.addColumnModel = $ctrl.newColumnObject();
+			$ctrl.addColumnVisible = false;
+		}
 	}
 
 	$ctrl.showAddColumn = function (show) {

diff --git a/app/angular/service/sqlGeneratorService.js b/app/angular/service/sqlGeneratorService.js
@@ -44,7 +44,7 @@ const sqlGeneratorService = () => {
 
 	const filterSelectedItem = item => item.selected;
 
-	const mapViewSelectedColumn = (table, hasMultipleTables) => table.columns.filter(filterSelectedItem).map(column => `${hasMultipleTables ? table.name + '.' : ''}${cleanString(column.name)}`).join(", ");
+	const mapViewSelectedColumn = (table, hasMultipleTables) => table.columns.filter(filterSelectedItem).map(column => `${hasMultipleTables ? table?.name + '.' : ''}${cleanString(column?.name)}`).join(", ");
 
 	const filterTableWithColunmsSelected = table => table.columns.some(filterSelectedItem);
 
@@ -75,17 +75,18 @@ const sqlGeneratorService = () => {
 		const selectedTables = view.tables.filter(filterSelectedItem);
 		if (selectedTables.length > 0) {
 			const hasMultipleTables = selectedTables.length > 1;
-			const baseTable = selectedTables[0].name;
+			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)}`
 		}
+		return '';
 	}
 
 	const createAlterTable = function(key, table){
 		var alter = "";
 		for (const column of table.columns) {
 			if(column.FK){
-				var originTable = createdMap.get(column.tableOrigin.idOrigin).name;
-				alter += "ALTER TABLE " + table.name + " ADD FOREIGN KEY(" + cleanString(column.name) + ") REFERENCES " + originTable + " ("+ cleanString(column.name) + ")\n";
+				var originTable = createdMap.get(column.tableOrigin.idOrigin)?.name;
+				alter += "ALTER TABLE " + table?.name + " ADD FOREIGN KEY(" + cleanString(column?.name) + ") REFERENCES " + originTable + " ("+ cleanString(column?.name) + ")\n";
 			}
 		}
 		return alter;
@@ -96,15 +97,15 @@ const sqlGeneratorService = () => {
 	}
 
 	const createTable = function(key, table){
-		var create = "CREATE TABLE " + table.name + " \n";
+		var create = "CREATE TABLE " + table?.name + " \n";
 		create += "( \n";
 		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;
+			create += " " + cleanString(column?.name) + " " + column.type;
 
 			constraints.forEach(({ key, sqlValue }) => {
 				if (column[key]) create += ` ${sqlValue}`;

diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
     "ts-loader": "^8.4.0",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
     "url-loader": "^4.1.1",
-    "webpack": "5.73.0",
+    "webpack": "5.76.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.9.2"
   },