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

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

commit fd3639aa1e54b5a749a96c2678a4f5c557f860f3
Author: Dominik Riemer <[email protected]>
AuthorDate: Fri Jul 17 21:20:29 2020 +0200

    [STREAMPIPES-145] Add restrictedEditMode
---
 .../dialog/standard-dialog/standard-dialog.component.html  |  2 +-
 .../dialog/standard-dialog/standard-dialog.component.scss  |  2 +-
 .../pipeline-element-options.component.ts                  |  7 +++++--
 .../editor-v2/components/pipeline/pipeline.component.ts    | 14 ++++++++------
 .../editor-v2/dialog/customize/customize.component.html    |  4 ++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git 
a/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.html 
b/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.html
index 7da4171..54e4169 100644
--- a/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.html
+++ b/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.html
@@ -16,7 +16,7 @@
   ~
   -->
 
-<div class="dialog-panel">
+<div class="standard-dialog-panel">
     <div class="dialog-panel-header">
         <span class="dialog-title">{{ dialogTitle }}</span>
         <button mat-button mat-icon-button (click)="close()">
diff --git 
a/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.scss 
b/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.scss
index 060041e..d06362b 100644
--- a/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.scss
+++ b/ui/src/app/core-ui/dialog/standard-dialog/standard-dialog.component.scss
@@ -24,7 +24,7 @@ standard-dialog-container {
   box-shadow: -7px 0px 5px -5px #5d5d5d;
 }
 
-.dialog-panel {
+.standard-dialog-panel {
   max-height: 80vh;
   height: 100%;
   display: grid;
diff --git 
a/ui/src/app/editor-v2/components/pipeline-element-options/pipeline-element-options.component.ts
 
b/ui/src/app/editor-v2/components/pipeline-element-options/pipeline-element-options.component.ts
index 2e8699f..ef118e9 100644
--- 
a/ui/src/app/editor-v2/components/pipeline-element-options/pipeline-element-options.component.ts
+++ 
b/ui/src/app/editor-v2/components/pipeline-element-options/pipeline-element-options.component.ts
@@ -34,6 +34,7 @@ import {EditorService} from "../../services/editor.service";
 import {PanelType} from 
"../../../core-ui/dialog/base-dialog/base-dialog.model";
 import {DialogService} from 
"../../../core-ui/dialog/base-dialog/base-dialog.service";
 import {CompatibleElementsComponent} from 
"../../dialog/compatible-elements/compatible-elements.component";
+import {Tuple2} from "../../../core-model/base/Tuple2";
 
 @Component({
   selector: 'pipeline-element-options',
@@ -73,7 +74,7 @@ export class PipelineElementOptionsComponent implements 
OnInit{
   delete: EventEmitter<PipelineElementConfig> = new 
EventEmitter<PipelineElementConfig>();
 
   @Output()
-  customize: EventEmitter<PipelineElementConfig> = new 
EventEmitter<PipelineElementConfig>();
+  customize: EventEmitter<Tuple2<Boolean, PipelineElementConfig>> = new 
EventEmitter<Tuple2<Boolean, PipelineElementConfig>>();
 
   constructor(private ObjectProvider: ObjectProvider,
               private PipelineElementRecommendationService: 
PipelineElementRecommendationService,
@@ -113,7 +114,9 @@ export class PipelineElementOptionsComponent implements 
OnInit{
   }
 
   customizeElement(pipelineElement: PipelineElementConfig) {
-    this.customize.emit(pipelineElement);
+    let restrictedEditMode = ! (this.isRootElement());
+    let customizeInfo = {a: restrictedEditMode, b: pipelineElement} as 
Tuple2<Boolean, PipelineElementConfig>;
+    this.customize.emit(customizeInfo);
   }
 
   openCustomizeDialog() {
diff --git a/ui/src/app/editor-v2/components/pipeline/pipeline.component.ts 
b/ui/src/app/editor-v2/components/pipeline/pipeline.component.ts
index eb60a4b..c82b61c 100644
--- a/ui/src/app/editor-v2/components/pipeline/pipeline.component.ts
+++ b/ui/src/app/editor-v2/components/pipeline/pipeline.component.ts
@@ -43,6 +43,7 @@ import {DialogService} from 
"../../../core-ui/dialog/base-dialog/base-dialog.ser
 import {EditorService} from "../../services/editor.service";
 import {MatchingResultMessage} from 
"../../../core-model/gen/streampipes-model-client";
 import {MatchingErrorComponent} from 
"../../dialog/matching-error/matching-error.component";
+import {Tuple2} from "../../../core-model/base/Tuple2";
 
 @Component({
   selector: 'pipeline',
@@ -305,7 +306,7 @@ export class PipelineComponent implements OnInit {
               if (this.PipelineEditorService.isFullyConnected(pe)) {
                 let payload = pe.payload as InvocablePipelineElementUnion;
                 if ((payload.staticProperties && 
payload.staticProperties.length > 0) || this.isCustomOutput(pe)) {
-                  this.showCustomizeDialog(pe);
+                  this.showCustomizeDialog({a: false, b: pe});
                 } else {
                   this.announceConfiguredElement(pe);
                   //this.$rootScope.$broadcast("SepaElementConfigured", 
pe.payload.DOM);
@@ -373,20 +374,21 @@ export class PipelineComponent implements OnInit {
     });
   }
 
-  showCustomizeDialog(pipelineElement: PipelineElementConfig) {
+  showCustomizeDialog(pipelineElementInfo: Tuple2<Boolean, 
PipelineElementConfig>) {
     const dialogRef = this.dialogService.open(CustomizeComponent,{
       panelType: PanelType.SLIDE_IN_PANEL,
-      title: "Customize " + pipelineElement.payload.name,
+      title: "Customize " + pipelineElementInfo.b.payload.name,
       width: "50vw",
       data: {
-        "pipelineElement": pipelineElement
+        "pipelineElement": pipelineElementInfo.b,
+        "restrictedEditMode": pipelineElementInfo.a
       }
     });
 
     dialogRef.afterClosed().subscribe(c => {
       if (c) {
-        pipelineElement.settings.openCustomize = false;
-        this.JsplumbService.activateEndpoint(pipelineElement.payload.dom, 
pipelineElement.settings.completed);
+        pipelineElementInfo.b.settings.openCustomize = false;
+        
this.JsplumbService.activateEndpoint(pipelineElementInfo.b.payload.dom, 
pipelineElementInfo.b.settings.completed);
         this.triggerPipelineCacheUpdate();
       }
     });
diff --git a/ui/src/app/editor-v2/dialog/customize/customize.component.html 
b/ui/src/app/editor-v2/dialog/customize/customize.component.html
index 1f36231..2418a4c 100644
--- a/ui/src/app/editor-v2/dialog/customize/customize.component.html
+++ b/ui/src/app/editor-v2/dialog/customize/customize.component.html
@@ -30,8 +30,8 @@
                     </mat-slide-toggle>
                 </div>
             </div>
-            <div fxFlex="100" fxLayout="row" *ngIf="restrictedEditMode">
-                <div fxFlex="100" fxLayout="column">
+            <div fxLayout="row" *ngIf="restrictedEditMode">
+                <div fxLayout="column">
                     <div fxLayout="column" class="customize-item-main-help" 
style="border: 2px solid #ffc400">
                         <div class="customize-item-title-help" 
style="background: #ffc400;" fxFlex="100"
                              fxLayout="row">

Reply via email to