[IDE] #2982 - Editor is closed on file move or rename (#2983)

* #2982 work in progress * Added support for folder move * Fixed folder move and rename while files inside it are opened * Fixed tab labels. #2982 done * Fixed git service error messages * Fixed 'getErrorMessage' * Fixed 'opneView' and 'isNullOrUndefined' * fix master formatting (#2981) * Bump jackson.databind.version from 2.15.3 to 2.16.0 Bumps `jackson.databind.version` from 2.15.3 to 2.16.0. Updates `com.fasterxml.jackson.core:jackson-databind` from 2.15.3 to 2.16.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-joda` from 2.15.3 to 2.16.0 - [Commits](FasterXML/jackson-datatype-joda@jackson-datatype-joda-2.15.3...jackson-datatype-joda-2.16.0) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.15.3 to 2.16.0 Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-ion` from 2.15.3 to 2.16.0 - [Commits](https://github.com/FasterXML/jackson-dataformat-ion/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-joda dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-ion dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump com.amazonaws:aws-java-sdk-qldb from 1.12.589 to 1.12.590 Bumps [com.amazonaws:aws-java-sdk-qldb](https://github.com/aws/aws-sdk-java) from 1.12.589 to 1.12.590. - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-java@1.12.589...1.12.590) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-qldb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump org.liquibase:liquibase-core from 4.24.0 to 4.25.0 Bumps [org.liquibase:liquibase-core](https://github.com/liquibase/liquibase) from 4.24.0 to 4.25.0. - [Release notes](https://github.com/liquibase/liquibase/releases) - [Changelog](https://github.com/liquibase/liquibase/blob/master/changelog.txt) - [Commits](liquibase/liquibase@v4.24.0...v4.25.0) --- updated-dependencies: - dependency-name: org.liquibase:liquibase-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * feat: initial openchakra integration (#2974) * Add messaging JavaScript API integration test (#2979) * add messaging JavaScript API integration test * add logs to catch the unit workflow issue Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> * use syserr for logging Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> * check File.separator Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> * add logging for debug Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> * fix display name Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> * fetched from master -> formatting Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> * fail maven build on esbuild errors Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> --------- Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> Co-authored-by: Nedelcho Delchev <delchevn@gmail.com> * Update pom.xml * Fixed closing of unsaved tabs * Bump jackson.databind.version from 2.15.3 to 2.16.0 Bumps `jackson.databind.version` from 2.15.3 to 2.16.0. Updates `com.fasterxml.jackson.core:jackson-databind` from 2.15.3 to 2.16.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-joda` from 2.15.3 to 2.16.0 - [Commits](FasterXML/jackson-datatype-joda@jackson-datatype-joda-2.15.3...jackson-datatype-joda-2.16.0) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.15.3 to 2.16.0 Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-ion` from 2.15.3 to 2.16.0 - [Commits](https://github.com/FasterXML/jackson-dataformat-ion/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-joda dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-ion dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> Co-authored-by: Iliyan Velichkov <velichkov.iliyan@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vladimir Mutafov <vlado.mutafov@gmail.com> Co-authored-by: Nedelcho Delchev <delchevn@gmail.com>
eclipse-dirigible · Nov 17, 2023 · 655828f · 655828f
1 parent 7a09f86
commit 655828f
Show file tree

Hide file tree

Showing 26 changed files with 706 additions and 299 deletions.
diff --git a/components/ide/ide-ui-csv/src/main/resources/META-INF/dirigible/ide-csv/js/editor.js b/components/ide/ide-ui-csv/src/main/resources/META-INF/dirigible/ide-csv/js/editor.js
@@ -513,6 +513,16 @@ csvView.controller('CsvViewController', ['$scope', '$http', '$window', 'messageH
         if (msg.resourcePath === $scope.dataParameters.file) messageHub.setStatusCaret('');
     });
 
+    messageHub.onEditorReloadParameters(
+        function (event) {
+            $scope.$apply(() => {
+                if (event.resourcePath === $scope.dataParameters.file) {
+                    $scope.dataParameters = ViewParameters.get();
+                }
+            });
+        }
+    );
+
     messageHub.onDidReceiveMessage(
         "editor.file.save.all",
         function () {

diff --git a/components/ide/ide-ui-csvim/src/main/resources/META-INF/dirigible/ide-csvim/js/editor.js b/components/ide/ide-ui-csvim/src/main/resources/META-INF/dirigible/ide-csvim/js/editor.js
@@ -350,6 +350,16 @@ editorView.controller('CsvimViewController', ['$scope', '$http', 'messageHub', '
         if (msg.resourcePath === $scope.dataParameters.file) messageHub.setStatusCaret('');
     });
 
+    messageHub.onEditorReloadParameters(
+        function (event) {
+            $scope.$apply(() => {
+                if (event.resourcePath === $scope.dataParameters.file) {
+                    $scope.dataParameters = ViewParameters.get();
+                }
+            });
+        }
+    );
+
     messageHub.onDidReceiveMessage(
         "editor.file.save.all",
         function () {

diff --git a/...uctures/src/main/resources/META-INF/dirigible/ide-data-structures/editors/table/editor.js b/...uctures/src/main/resources/META-INF/dirigible/ide-data-structures/editors/table/editor.js
@@ -144,6 +144,16 @@ angular.module('page', ["ideUI", "ideView"])
 			if (msg.resourcePath === $scope.dataParameters.file) messageHub.setStatusCaret('');
 		});
 
+		messageHub.onEditorReloadParameters(
+			function (event) {
+				$scope.$apply(() => {
+					if (event.resourcePath === $scope.dataParameters.file) {
+						$scope.dataParameters = ViewParameters.get();
+					}
+				});
+			}
+		);
+
 		messageHub.onDidReceiveMessage(
 			"editor.file.save.all",
 			function () {

diff --git a/...ructures/src/main/resources/META-INF/dirigible/ide-data-structures/editors/view/editor.js b/...ructures/src/main/resources/META-INF/dirigible/ide-data-structures/editors/view/editor.js
@@ -103,6 +103,16 @@ angular.module('page', ["ideUI", "ideView"])
 			if (msg.resourcePath === $scope.dataParameters.file) messageHub.setStatusCaret('');
 		});
 
+		messageHub.onEditorReloadParameters(
+			function (event) {
+				$scope.$apply(() => {
+					if (event.resourcePath === $scope.dataParameters.file) {
+						$scope.dataParameters = ViewParameters.get();
+					}
+				});
+			}
+		);
+
 		messageHub.onDidReceiveMessage(
 			"editor.file.save.all",
 			function () {

diff --git a/components/ide/ide-ui-entity/src/main/resources/META-INF/dirigible/ide-entity/js/editor.js b/components/ide/ide-ui-entity/src/main/resources/META-INF/dirigible/ide-entity/js/editor.js
@@ -255,6 +255,16 @@ angular.module('ui.entity-data.modeler', ["ideUI", "ideView", "ideWorkspace", "i
 			if (msg.resourcePath === $scope.dataParameters.file) messageHub.setStatusCaret('');
 		});
 
+		messageHub.onEditorReloadParameters(
+			function (event) {
+				$scope.$apply(() => {
+					if (event.resourcePath === $scope.dataParameters.file) {
+						$scope.dataParameters = ViewParameters.get();
+					}
+				});
+			}
+		);
+
 		messageHub.onDidReceiveMessage(
 			"editor.file.save.all",
 			function () {

diff --git a/...tensions/src/main/resources/META-INF/dirigible/ide-extensions/editors/extension/editor.js b/...tensions/src/main/resources/META-INF/dirigible/ide-extensions/editors/extension/editor.js
@@ -100,6 +100,16 @@ angular.module('page', ["ideUI", "ideView"])
 			if (msg.resourcePath === $scope.dataParameters.file) messageHub.setStatusCaret('');
 		});
 
+		messageHub.onEditorReloadParameters(
+			function (event) {
+				$scope.$apply(() => {
+					if (event.resourcePath === $scope.dataParameters.file) {
+						$scope.dataParameters = ViewParameters.get();
+					}
+				});
+			}
+		);
+
 		messageHub.onDidReceiveMessage(
 			"editor.file.save.all",
 			function () {

diff --git a/...ons/src/main/resources/META-INF/dirigible/ide-extensions/editors/extensionpoint/editor.js b/...ons/src/main/resources/META-INF/dirigible/ide-extensions/editors/extensionpoint/editor.js
@@ -100,6 +100,16 @@ angular.module('page', ["ideUI", "ideView"])
 			if (msg.resourcePath === $scope.dataParameters.file) messageHub.setStatusCaret('');
 		});
 
+		messageHub.onEditorReloadParameters(
+			function (event) {
+				$scope.$apply(() => {
+					if (event.resourcePath === $scope.dataParameters.file) {
+						$scope.dataParameters = ViewParameters.get();
+					}
+				});
+			}
+		);
+
 		messageHub.onDidReceiveMessage(
 			"editor.file.save.all",
 			function () {

diff --git a/...-form-builder/src/main/resources/META-INF/dirigible/ide-form-builder/designer/designer.js b/...-form-builder/src/main/resources/META-INF/dirigible/ide-form-builder/designer/designer.js
@@ -127,13 +127,11 @@
       load();
 
       function saveContents(text, publish) {
-        console.log('Save called...');
         if ($scope.file) {
           let xhr = new XMLHttpRequest();
           xhr.open('PUT', '/services/ide/workspaces' + $scope.file);
           xhr.onreadystatechange = function () {
             if (xhr.readyState === 4) {
-              console.log('file saved: ' + $scope.file);
               if (publish) {
                 setTimeout(function () { publishFile(); }, 800);
               }
@@ -160,13 +158,11 @@
       }
 
       function publishFile() {
-        console.log('Publish called...');
         if ($scope.file) {
           let xhr = new XMLHttpRequest();
           xhr.open('POST', '/services/ide/publisher/request' + $scope.file.substring(0, $scope.file.lastIndexOf('/')));
           xhr.onreadystatechange = function () {
             if (xhr.readyState === 4) {
-              console.log('publish request sent for file: ' + $scope.file);
               messageHub.post({ data: $scope.file }, 'workspace.file.published');
             }
           };
@@ -196,6 +192,13 @@
         "editor.file.save.all"
       );
 
+      messageHub.subscribe(function (event) {
+        let file = event.resourcePath;
+        if (file === $scope.file) {
+          getViewParameters();
+        }
+      }, "core.editors.reloadParams");
+
       messageHub.subscribe(
         function (msg) {
           let file = msg.data && typeof msg.data === 'object' && msg.data.file;

diff --git a/...nents/ide/ide-ui-git-service/src/main/resources/META-INF/dirigible/ide-git-service/git.js b/...nents/ide/ide-ui-git-service/src/main/resources/META-INF/dirigible/ide-git-service/git.js
@@ -13,10 +13,14 @@ angular.module('ideGit', [])
     .provider('gitApi', function GitApiProvider() {
         this.gitServiceUrl = '/services/ide/git';
         this.$get = ['$http', function gitApiFactory($http) {
-            function getErrorMessage(error) {
-                if (error)
-                    return JSON.parse(response.data.error).message;
-                else return 'Check console for more information.';
+            function getErrorMessage(response) {
+                if (response && response.data) {
+                    if (typeof response.data === "string") {
+                        const data = JSON.parse(response.data);
+                        if (data.error && data.message) return `${data.error}: ${data.message}`;
+                    }
+                    else return `${response.data.error}: ${response.data.message}`;
+                } else return 'Check console for more information.';
             }
 
             let listProjects = function (resourcePath) {
@@ -30,7 +34,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -49,7 +53,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -68,7 +72,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -100,7 +104,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -119,7 +123,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -133,7 +137,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -147,7 +151,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -162,7 +166,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Workspace service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -195,7 +199,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -213,7 +217,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -238,7 +242,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -263,7 +267,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -291,7 +295,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -320,7 +324,7 @@ angular.module('ideGit', [])
                     return { status: response.status, data: response.data };
                 }, function errorCallback(response) {
                     console.error('Git service:', response);
-                    return { status: response.status, message: getErrorMessage(response.data.error) };
+                    return { status: response.status, message: getErrorMessage(response) };
                 });
             }.bind(this);
 
@@ -339,7 +343,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -355,7 +359,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data.files };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -371,7 +375,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data.files };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -387,7 +391,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -403,7 +407,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -419,7 +423,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -435,7 +439,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -451,7 +455,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -467,7 +471,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);
 
@@ -481,7 +485,7 @@ angular.module('ideGit', [])
                         return { status: response.status, data: response.data };
                     }, function errorCallback(response) {
                         console.error('Git service:', response);
-                        return { status: response.status, message: getErrorMessage(response.data.error) };
+                        return { status: response.status, message: getErrorMessage(response) };
                     });
             }.bind(this);