You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/07/28 18:46:58 UTC

[incubator-streampipes] branch STREAMPIPES-545 updated (d49b37462 -> 3ca26b195)

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a change to branch STREAMPIPES-545
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


    from d49b37462 Update all_extensions_jvm.xml
     new 11aa81639 [STREAMPIPES-545] Extend setup script
     new 4983049e0 Merge branch 'STREAMPIPES-545' of github.com:apache/incubator-streampipes into STREAMPIPES-545
     new 3ca26b195 [STREAMPIPES-545] Improve updating of asset details

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../manager/setup/CouchDbInstallationStep.java     |  4 ++++
 .../asset-details/asset-details.component.html     |  2 +-
 .../asset-details/asset-details.component.ts       | 27 ++++++++++++++++++++++
 .../asset-selection-panel.component.scss           |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)


[incubator-streampipes] 01/03: [STREAMPIPES-545] Extend setup script

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch STREAMPIPES-545
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 11aa81639ea43a3ced46f4547760431c9c8f5b2f
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Jul 28 16:51:25 2022 +0200

    [STREAMPIPES-545] Extend setup script
---
 .../org/apache/streampipes/manager/setup/CouchDbInstallationStep.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java
index 7a89ddc04..f204ab247 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/setup/CouchDbInstallationStep.java
@@ -18,6 +18,8 @@
 
 package org.apache.streampipes.manager.setup;
 
+import org.apache.streampipes.manager.setup.tasks.CreateAssetLinkTypeTask;
+import org.apache.streampipes.manager.setup.tasks.CreateDefaultAssetTask;
 import org.apache.streampipes.model.client.endpoint.ExtensionsServiceEndpoint;
 import org.apache.streampipes.storage.couchdb.impl.ExtensionsServiceEndpointStorageImpl;
 import org.apache.streampipes.storage.couchdb.utils.Utils;
@@ -44,6 +46,8 @@ public class CouchDbInstallationStep extends InstallationStep {
     createDatabases();
     createViews();
     addRdfEndpoints();
+    new CreateAssetLinkTypeTask().execute();
+    new CreateDefaultAssetTask().execute();
   }
 
   @Override


[incubator-streampipes] 03/03: [STREAMPIPES-545] Improve updating of asset details

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch STREAMPIPES-545
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 3ca26b195a46182e9ddb762d0f259bf9bdde5c82
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Jul 28 20:46:46 2022 +0200

    [STREAMPIPES-545] Improve updating of asset details
---
 .../asset-details/asset-details.component.html     |  2 +-
 .../asset-details/asset-details.component.ts       | 27 ++++++++++++++++++++++
 .../asset-selection-panel.component.scss           |  1 +
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/ui/src/app/assets/components/asset-details/asset-details.component.html b/ui/src/app/assets/components/asset-details/asset-details.component.html
index ee6b0d553..ceec6c523 100644
--- a/ui/src/app/assets/components/asset-details/asset-details.component.html
+++ b/ui/src/app/assets/components/asset-details/asset-details.component.html
@@ -21,7 +21,7 @@
 
     <div nav fxFlex="100" fxLayoutAlign="start center" fxLayout="row" class="pl-10">
         <div fxLayout="row" fxLayoutAlign="start center" *ngIf="editMode">
-            <button mat-button mat-raised-button color="accent" (click)="updateAsset()">
+            <button mat-button mat-raised-button color="accent" (click)="saveAsset()">
                 <i class="material-icons">save</i><span>&nbsp;Save</span>
             </button>
         </div>
diff --git a/ui/src/app/assets/components/asset-details/asset-details.component.ts b/ui/src/app/assets/components/asset-details/asset-details.component.ts
index 6ec76dd99..8f3750c6f 100644
--- a/ui/src/app/assets/components/asset-details/asset-details.component.ts
+++ b/ui/src/app/assets/components/asset-details/asset-details.component.ts
@@ -61,8 +61,35 @@ export class SpAssetDetailsComponent implements OnInit {
   }
 
   updateAsset() {
+    this.updateSelected();
+  }
+
+  saveAsset() {
     this.genericStorageService.updateDocument(AssetConstants.ASSET_APP_DOC_NAME, this.asset).subscribe(res => {
       this.loadAsset();
+      this.editMode = false;
     });
   }
+
+  updateSelected() {
+    if (this.asset.assetId === this.selectedAsset.assetId) {
+      this.asset = this.selectedAsset as SpAssetModel;
+    } else {
+      this.asset.assets.forEach(a => {
+        this.walk(a, this.selectedAsset);
+      });
+    }
+  }
+
+  walk(asset: SpAsset, selectedAsset: SpAsset) {
+    if (asset.assetId === selectedAsset.assetId) {
+      asset = selectedAsset;
+    } else {
+      if (asset.assets) {
+        asset.assets.forEach(a => {
+          this.walk(a, selectedAsset);
+        });
+      }
+    }
+  }
 }
diff --git a/ui/src/app/assets/components/asset-details/asset-selection-panel/asset-selection-panel.component.scss b/ui/src/app/assets/components/asset-details/asset-selection-panel/asset-selection-panel.component.scss
index 164b1fe5a..2f3b83190 100644
--- a/ui/src/app/assets/components/asset-details/asset-selection-panel/asset-selection-panel.component.scss
+++ b/ui/src/app/assets/components/asset-details/asset-selection-panel/asset-selection-panel.component.scss
@@ -59,6 +59,7 @@
   width: 100%;
   margin-right: 10px;
   padding-left: 5px;
+  height: 50px;
 }
 
 .selected-node {


[incubator-streampipes] 02/03: Merge branch 'STREAMPIPES-545' of github.com:apache/incubator-streampipes into STREAMPIPES-545

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch STREAMPIPES-545
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 4983049e082dcb92ac6b75439366ce1bf5652aec
Merge: 11aa81639 d49b37462
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Jul 28 16:51:38 2022 +0200

    Merge branch 'STREAMPIPES-545' of github.com:apache/incubator-streampipes into STREAMPIPES-545

 .idea/runConfigurations/all_extensions_jvm.xml      | 10 +++++-----
 .idea/runConfigurations/backend.xml                 | 17 ++++++++---------
 .../NumericalTextFilterProcessor.java               |  2 +-
 .../processor/textfilter/TextFilterProcessor.java   |  2 +-
 .../AbstractConfigurablePipelineElementBuilder.java | 21 +++++++++++++++++++--
 5 files changed, 34 insertions(+), 18 deletions(-)