You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2025/12/01 12:32:15 UTC
(streampipes) branch 4003-core updated: refactor: Migrate core & core-ui to control flow syntax
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch 4003-core
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/4003-core by this push:
new 35a274363f refactor: Migrate core & core-ui to control flow syntax
35a274363f is described below
commit 35a274363ffeada77ecb65597d163d40546d2de8
Author: Philipp Zehnder <te...@users.noreply.github.com>
AuthorDate: Mon Dec 1 13:32:05 2025 +0100
refactor: Migrate core & core-ui to control flow syntax
---
.../core-ui/error-hint/error-hint.component.html | 119 ++---
.../simple-logs/simple-logs.component.html | 74 +--
.../multi-step-status-indicator.component.html | 81 +--
...pipeline-element-template-config.component.html | 189 +++----
.../pipeline-operation-status.component.html | 92 ++--
.../pipeline-started-status.component.html | 135 +++--
.../single-marker-map.component.html | 36 +-
.../static-alternatives.component.html | 151 +++---
.../static-any-input.component.html | 88 ++--
.../add-to-collection.component.html | 139 +++---
.../static-collection.component.html | 82 ++-
.../static-file-input.component.html | 218 ++++----
.../static-free-input.component.html | 206 ++++----
.../static-group/static-group.component.html | 125 ++---
.../static-mapping-nary.component.html | 64 +--
.../static-mapping-unary.component.html | 54 +-
.../static-one-of-input.component.html | 91 ++--
.../static-property.component.html | 548 +++++++++++----------
...tic-runtime-resolvable-any-input.component.html | 109 ++--
.../static-runtime-resolvable-group.component.html | 127 ++---
...c-runtime-resolvable-oneof-input.component.html | 107 ++--
...ic-runtime-resolvable-tree-input.component.html | 124 +++--
.../static-tree-input-browse-nodes.component.html | 147 +++---
.../static-tree-input-button-menu.component.html | 113 ++---
.../static-tree-input-node-details.component.html | 51 +-
...static-tree-input-selected-nodes.component.html | 70 +--
.../static-secret-input.component.html | 40 +-
ui/src/app/core-ui/topics/topics.component.html | 354 +++++++------
.../breadcrumb/breadcrumb.component.html | 58 ++-
.../core/components/toolbar/toolbar.component.html | 277 ++++++-----
30 files changed, 2117 insertions(+), 1952 deletions(-)
diff --git a/ui/src/app/core-ui/error-hint/error-hint.component.html b/ui/src/app/core-ui/error-hint/error-hint.component.html
index 42cad65c0d..b86579b5ef 100644
--- a/ui/src/app/core-ui/error-hint/error-hint.component.html
+++ b/ui/src/app/core-ui/error-hint/error-hint.component.html
@@ -1,63 +1,72 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div class="error-hint-position">
- <div
- *ngIf="displayMessages"
- class="pipeline-validation-summary {{
- errorMessages.length > 0 ? 'pipeline-validation-summary-error' : ''
- }}"
- (click)="toggleErrorMessagesDisplayed()"
- >
- <div fxLayout="row" fxLayoutAlign="center center">
- <div fxLayout="row" fxLayoutAlign="start center">
- <i class="material-icons" *ngIf="errorMessages.length > 0"
- >notifications</i
- >
- <i class="material-icons" *ngIf="errorMessages.length === 0"
- >done</i
- >
+ @if (displayMessages) {
+ <div
+ class="pipeline-validation-summary {{
+ errorMessages.length > 0
+ ? 'pipeline-validation-summary-error'
+ : ''
+ }}"
+ (click)="toggleErrorMessagesDisplayed()"
+ >
+ <div fxLayout="row" fxLayoutAlign="center center">
+ <div fxLayout="row" fxLayoutAlign="start center">
+ @if (errorMessages.length > 0) {
+ <i class="material-icons">notifications</i>
+ }
+ @if (errorMessages.length === 0) {
+ <i class="material-icons">done</i>
+ }
+ </div>
+ <div>
+ @if (errorMessages.length === 0) {
+ <span>{{ validationString }} ok</span>
+ }
+ @if (errorMessages.length > 0) {
+ <span
+ >{{ errorMessages.length }}
+ {{
+ errorMessages.length > 1 ? 'hints' : 'hint'
+ }}</span
+ >
+ }
+ </div>
</div>
- <div>
- <span *ngIf="errorMessages.length === 0"
- >{{ validationString }} ok</span
- >
- <span *ngIf="errorMessages.length > 0"
+ </div>
+ }
+ @if (errorMessages.length > 0 && errorMessagesDisplayed) {
+ <div class="editor-error-notifications">
+ <h5 class="error-hint-color">
+ <b
>{{ errorMessages.length }}
- {{ errorMessages.length > 1 ? 'hints' : 'hint' }}</span
+ {{ errorMessages.length === 1 ? 'error' : 'errors' }}
+ found.</b
>
- </div>
- </div>
- </div>
- <div
- class="editor-error-notifications"
- *ngIf="errorMessages.length > 0 && errorMessagesDisplayed"
- >
- <h5 class="error-hint-color">
- <b
- >{{ errorMessages.length }}
- {{ errorMessages.length === 1 ? 'error' : 'errors' }} found.</b
- >
- </h5>
- <hr />
- <div *ngFor="let errorMessage of errorMessages">
- <b>{{ errorMessage.title }}</b>
- <div>{{ errorMessage.content }}</div>
+ </h5>
<hr />
+ @for (errorMessage of errorMessages; track errorMessage) {
+ <div>
+ <b>{{ errorMessage.title }}</b>
+ <div>{{ errorMessage.content }}</div>
+ <hr />
+ </div>
+ }
</div>
- </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/monitoring/simple-logs/simple-logs.component.html b/ui/src/app/core-ui/monitoring/simple-logs/simple-logs.component.html
index 6963eb8c4b..4226f83590 100644
--- a/ui/src/app/core-ui/monitoring/simple-logs/simple-logs.component.html
+++ b/ui/src/app/core-ui/monitoring/simple-logs/simple-logs.component.html
@@ -1,44 +1,46 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div fxFlex="100" fxLayout="column">
<sp-basic-header-title-component
[title]="elementName + ' - Logs'"
></sp-basic-header-title-component>
- <div
- fxFlex="100"
- fxLayout="column"
- fxLayoutAlign="center center"
- *ngIf="!logs || logs.length === 0"
- >
- <h5 class="text-center">
- {{ '(no log messages available)' | translate }}
- </h5>
- </div>
- <div fxFlex="100" fxLayout="column" *ngIf="logs && logs.length > 0">
- <div *ngFor="let logEntry of logs">
- <sp-exception-message
- [message]="logEntry.errorMessage"
- [messageTimestamp]="logEntry.timestamp"
- *ngIf="logEntry.errorMessage"
- class="mt-10"
- >
- </sp-exception-message>
+ @if (!logs || logs.length === 0) {
+ <div fxFlex="100" fxLayout="column" fxLayoutAlign="center center">
+ <h5 class="text-center">
+ {{ '(no log messages available)' | translate }}
+ </h5>
</div>
- </div>
+ }
+ @if (logs && logs.length > 0) {
+ <div fxFlex="100" fxLayout="column">
+ @for (logEntry of logs; track logEntry) {
+ <div>
+ @if (logEntry.errorMessage) {
+ <sp-exception-message
+ [message]="logEntry.errorMessage"
+ [messageTimestamp]="logEntry.timestamp"
+ class="mt-10"
+ >
+ </sp-exception-message>
+ }
+ </div>
+ }
+ </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/multi-step-status-indicator/multi-step-status-indicator.component.html b/ui/src/app/core-ui/multi-step-status-indicator/multi-step-status-indicator.component.html
index 139340253c..3a3f99fb60 100644
--- a/ui/src/app/core-ui/multi-step-status-indicator/multi-step-status-indicator.component.html
+++ b/ui/src/app/core-ui/multi-step-status-indicator/multi-step-status-indicator.component.html
@@ -1,47 +1,52 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div fxLayout="column" fxLayoutGap="10px">
- <div fxLayout="column" *ngFor="let step of statusIndicators">
- <div
- fxLayout="row"
- fxLayoutGap="30px"
- fxFlex="100"
- fxLayoutAlign="start center"
- >
- <div *ngIf="step.status === Status.PROGRESS">
- <mat-spinner [diameter]="25" color="accent"></mat-spinner>
- </div>
+ @for (step of statusIndicators; track step) {
+ <div fxLayout="column">
<div
- *ngIf="step.status === Status.SUCCESS"
+ fxLayout="row"
+ fxLayoutGap="30px"
+ fxFlex="100"
fxLayoutAlign="start center"
>
- <i class="material-icons status-icon">check_circle</i>
- </div>
- <div
- *ngIf="step.status === Status.FAILURE"
- fxLayoutAlign="start centers"
- >
- <i class="material-icons status-icon">error</i>
- </div>
- <div fxFlex class="message-text" fxLayoutAlign="start center">
- {{ step.message }}
+ @if (step.status === Status.PROGRESS) {
+ <div>
+ <mat-spinner
+ [diameter]="25"
+ color="accent"
+ ></mat-spinner>
+ </div>
+ }
+ @if (step.status === Status.SUCCESS) {
+ <div fxLayoutAlign="start center">
+ <i class="material-icons status-icon">check_circle</i>
+ </div>
+ }
+ @if (step.status === Status.FAILURE) {
+ <div fxLayoutAlign="start centers">
+ <i class="material-icons status-icon">error</i>
+ </div>
+ }
+ <div fxFlex class="message-text" fxLayoutAlign="start center">
+ {{ step.message }}
+ </div>
</div>
</div>
- </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/pipeline-element-template-config/pipeline-element-template-config.component.html b/ui/src/app/core-ui/pipeline-element-template-config/pipeline-element-template-config.component.html
index 78a248d288..244d533664 100644
--- a/ui/src/app/core-ui/pipeline-element-template-config/pipeline-element-template-config.component.html
+++ b/ui/src/app/core-ui/pipeline-element-template-config/pipeline-element-template-config.component.html
@@ -1,98 +1,103 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
-<div class="p-15" *ngIf="templateConfigs">
- <div fxFlex="100" fxLayout="column">
- <h4>{{ 'Basics' | translate }}</h4>
- <mat-form-field fxFlex color="accent">
- <mat-label>{{ 'Template name' | translate }}</mat-label>
- <input
- [(ngModel)]="template.templateName"
- matInput
- name="templateName"
- class="sp"
- required
- data-cy="template-name"
- />
- </mat-form-field>
- <mat-form-field fxFlex color="accent">
- <mat-label>{{ 'Template description' | translate }}</mat-label>
- <input
- [(ngModel)]="template.templateDescription"
- matInput
- name="templateDescription"
- class="sp"
- required
- data-cy="template-description"
- />
- </mat-form-field>
- <mat-divider class="divider"></mat-divider>
- <h4>{{ 'Configuration' | translate }}</h4>
- <mat-hint style="margin-bottom: 10px">{{
- '(dynamic options cannot be saved and are hidden)' | translate
- }}</mat-hint>
- <div
- fxLayout="column"
- *ngFor="
- let config of staticProperties | pipelineElementTemplatePipe
- "
- class="static-property-panel static-property-panel-border"
- >
- <div fxLayout="row">
- <div fxFlex="50">
- {{ config.label }}
+@if (templateConfigs) {
+ <div class="p-15">
+ <div fxFlex="100" fxLayout="column">
+ <h4>{{ 'Basics' | translate }}</h4>
+ <mat-form-field fxFlex color="accent">
+ <mat-label>{{ 'Template name' | translate }}</mat-label>
+ <input
+ [(ngModel)]="template.templateName"
+ matInput
+ name="templateName"
+ class="sp"
+ required
+ data-cy="template-name"
+ />
+ </mat-form-field>
+ <mat-form-field fxFlex color="accent">
+ <mat-label>{{ 'Template description' | translate }}</mat-label>
+ <input
+ [(ngModel)]="template.templateDescription"
+ matInput
+ name="templateDescription"
+ class="sp"
+ required
+ data-cy="template-description"
+ />
+ </mat-form-field>
+ <mat-divider class="divider"></mat-divider>
+ <h4>{{ 'Configuration' | translate }}</h4>
+ <mat-hint style="margin-bottom: 10px">{{
+ '(dynamic options cannot be saved and are hidden)' | translate
+ }}</mat-hint>
+ @for (
+ config of staticProperties | pipelineElementTemplatePipe;
+ track config
+ ) {
+ <div
+ fxLayout="column"
+ class="static-property-panel static-property-panel-border"
+ >
+ <div fxLayout="row">
+ <div fxFlex="50">
+ {{ config.label }}
+ </div>
+ <div fxFlex="50">
+ <sp-pipeline-element-template-config-item
+ [sp]="config"
+ [templateConfigs]="templateConfigs"
+ >
+ </sp-pipeline-element-template-config-item>
+ </div>
+ </div>
</div>
- <div fxFlex="50">
- <sp-pipeline-element-template-config-item
- [sp]="config"
- [templateConfigs]="templateConfigs"
- >
- </sp-pipeline-element-template-config-item>
+ }
+ <mat-divider class="divider"></mat-divider>
+ <h4>{{ 'Existing templates' | translate }}</h4>
+ @for (template of existingTemplates; track template) {
+ <div
+ fxLayout="column"
+ class="static-property-panel static-property-panel-border"
+ >
+ <div fxFlex="100" fxLayout="row">
+ <div fxFlex fxLayoutAlign="start center">
+ {{ template.templateName }}
+ </div>
+ <div fxLayoutAlign="end center">
+ <button
+ mat-icon-button
+ color="accent"
+ (click)="deleteTemplate(template.elementId)"
+ data-cy="delete-pipeline-element-template"
+ >
+ <mat-icon>delete</mat-icon>
+ </button>
+ </div>
+ </div>
</div>
- </div>
+ }
+ @if (existingTemplates.length === 0) {
+ <mat-hint style="margin-bottom: 10px">{{
+ '(no templates available)' | translate
+ }}</mat-hint>
+ }
</div>
- <mat-divider class="divider"></mat-divider>
- <h4>{{ 'Existing templates' | translate }}</h4>
- <div
- fxLayout="column"
- *ngFor="let template of existingTemplates"
- class="static-property-panel static-property-panel-border"
- >
- <div fxFlex="100" fxLayout="row">
- <div fxFlex fxLayoutAlign="start center">
- {{ template.templateName }}
- </div>
- <div fxLayoutAlign="end center">
- <button
- mat-icon-button
- color="accent"
- (click)="deleteTemplate(template.elementId)"
- data-cy="delete-pipeline-element-template"
- >
- <mat-icon>delete</mat-icon>
- </button>
- </div>
- </div>
- </div>
- <mat-hint
- style="margin-bottom: 10px"
- *ngIf="existingTemplates.length === 0"
- >{{ '(no templates available)' | translate }}</mat-hint
- >
</div>
-</div>
+}
diff --git a/ui/src/app/core-ui/pipeline/pipeline-operation-status/pipeline-operation-status.component.html b/ui/src/app/core-ui/pipeline/pipeline-operation-status/pipeline-operation-status.component.html
index 914bc3f8be..3424af07c4 100644
--- a/ui/src/app/core-ui/pipeline/pipeline-operation-status/pipeline-operation-status.component.html
+++ b/ui/src/app/core-ui/pipeline/pipeline-operation-status/pipeline-operation-status.component.html
@@ -1,56 +1,54 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
-<div
- fxFlex="100"
- fxLayout="column"
- class="status-outer mt-10"
- *ngFor="let msg of pipelineOperationStatus.elementStatus"
->
- <div fxFlex="100" fxLayout="column">
- <div
- fxFlex="100"
- fxLayout="row"
- fxLayoutAlign="start center"
- class="p-15"
- >
- <mat-icon color="accent" *ngIf="msg.success">done</mat-icon>
- <mat-icon style="color: red" *ngIf="!msg.success">warning</mat-icon>
- <div fxFlex="100" fxLayout="column" class="ml-5">
- <span
- ><b>{{ msg.elementName }}</b></span
- >
- <small>{{
- msg.elementId.substr(0, msg.elementId.lastIndexOf('/'))
- }}</small>
- </div>
- </div>
- <div>
+@for (msg of pipelineOperationStatus.elementStatus; track msg) {
+ <div fxFlex="100" fxLayout="column" class="status-outer mt-10">
+ <div fxFlex="100" fxLayout="column">
<div
fxFlex="100"
- fxLayout="column"
- *ngIf="msg.optionalMessage"
- class="mt-10"
+ fxLayout="row"
+ fxLayoutAlign="start center"
+ class="p-15"
>
- <div class="error-message">
- <div class="p-10">{{ msg.optionalMessage }}</div>
+ @if (msg.success) {
+ <mat-icon color="accent">done</mat-icon>
+ }
+ @if (!msg.success) {
+ <mat-icon style="color: red">warning</mat-icon>
+ }
+ <div fxFlex="100" fxLayout="column" class="ml-5">
+ <span
+ ><b>{{ msg.elementName }}</b></span
+ >
+ <small>{{
+ msg.elementId.substr(0, msg.elementId.lastIndexOf('/'))
+ }}</small>
</div>
</div>
+ <div>
+ @if (msg.optionalMessage) {
+ <div fxFlex="100" fxLayout="column" class="mt-10">
+ <div class="error-message">
+ <div class="p-10">{{ msg.optionalMessage }}</div>
+ </div>
+ </div>
+ }
+ </div>
</div>
</div>
-</div>
+}
diff --git a/ui/src/app/core-ui/pipeline/pipeline-started-status/pipeline-started-status.component.html b/ui/src/app/core-ui/pipeline/pipeline-started-status/pipeline-started-status.component.html
index 4333c37c9b..8f41f26993 100644
--- a/ui/src/app/core-ui/pipeline/pipeline-started-status/pipeline-started-status.component.html
+++ b/ui/src/app/core-ui/pipeline/pipeline-started-status/pipeline-started-status.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div fxLayout="column" fxLayoutAlign="center center" fxFlex="100">
<div
@@ -25,31 +25,26 @@
data-cy="sp-pipeline-started-dialog"
>
<div fxLayout="row">
- <mat-icon
- data-cy="sp-pipeline-started-success"
- color="accent"
- *ngIf="pipelineOperationStatus.success"
- >done</mat-icon
- >
- <mat-icon
- style="color: red"
- *ngIf="!pipelineOperationStatus.success"
- >error</mat-icon
- >
+ @if (pipelineOperationStatus.success) {
+ <mat-icon data-cy="sp-pipeline-started-success" color="accent"
+ >done</mat-icon
+ >
+ }
+ @if (!pipelineOperationStatus.success) {
+ <mat-icon style="color: red">error</mat-icon>
+ }
<span> {{ pipelineOperationStatus.title }}.</span>
</div>
- <span
- *ngIf="
- action === 1 &&
- !pipelineOperationStatus.success &&
- !forceStopDisabled
- "
- class="message-small"
- >{{
+ @if (
+ action === 1 &&
+ !pipelineOperationStatus.success &&
+ !forceStopDisabled
+ ) {
+ <span class="message-small">{{
'You can perform a forced stop, which will stop and reset the pipeline status.'
| translate
- }}</span
- >
+ }}</span>
+ }
</div>
<div fxLayout="row">
<button
@@ -58,39 +53,41 @@
class="mat-basic"
(click)="toggleStatusDetailsVisible()"
>
- <div *ngIf="!statusDetailsVisible">
- {{ 'Show Details' | translate }}
- </div>
- <div *ngIf="statusDetailsVisible">
- {{ 'Hide Details' | translate }}
- </div>
- </button>
- <button
- mat-button
- mat-flat-button
- class="ml-10"
- color="accent"
- (click)="forceStopPipeline()"
- *ngIf="
- action === 1 &&
- !pipelineOperationStatus.success &&
- !forceStopDisabled
- "
- >
- <div>{{ 'Force stop' | translate }}</div>
+ @if (!statusDetailsVisible) {
+ <div>
+ {{ 'Show Details' | translate }}
+ </div>
+ }
+ @if (statusDetailsVisible) {
+ <div>
+ {{ 'Hide Details' | translate }}
+ </div>
+ }
</button>
+ @if (
+ action === 1 &&
+ !pipelineOperationStatus.success &&
+ !forceStopDisabled
+ ) {
+ <button
+ mat-button
+ mat-flat-button
+ class="ml-10"
+ color="accent"
+ (click)="forceStopPipeline()"
+ >
+ <div>{{ 'Force stop' | translate }}</div>
+ </button>
+ }
</div>
- <div
- fxFlex="100"
- fxLayout="column"
- *ngIf="statusDetailsVisible"
- class="w-100"
- >
- <sp-pipeline-operation-status
- fxLayout="column"
- [pipelineOperationStatus]="pipelineOperationStatus"
- >
- </sp-pipeline-operation-status>
- </div>
+ @if (statusDetailsVisible) {
+ <div fxFlex="100" fxLayout="column" class="w-100">
+ <sp-pipeline-operation-status
+ fxLayout="column"
+ [pipelineOperationStatus]="pipelineOperationStatus"
+ >
+ </sp-pipeline-operation-status>
+ </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/single-marker-map/single-marker-map.component.html b/ui/src/app/core-ui/single-marker-map/single-marker-map.component.html
index dcff0c5f00..55fd2954d2 100644
--- a/ui/src/app/core-ui/single-marker-map/single-marker-map.component.html
+++ b/ui/src/app/core-ui/single-marker-map/single-marker-map.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div
class="w-100"
@@ -25,5 +25,7 @@
(leafletZoomChange)="onZoomChange($event)"
(leafletMapReady)="onMapReady($event)"
>
- <div *ngFor="let layer of layers" [leafletLayer]="layer"></div>
+ @for (layer of layers; track layer) {
+ <div [leafletLayer]="layer"></div>
+ }
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.html b/ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.html
index a68765e69c..e0d73cc6b1 100644
--- a/ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.html
+++ b/ui/src/app/core-ui/static-properties/static-alternatives/static-alternatives.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div id="formWrapper" fxFlex="100" fxLayout="column">
<div fxFlex fxLayout="column" class="content">
@@ -24,67 +24,74 @@
(change)="radioSelectionChange($event)"
required
>
- <mat-radio-button
- class="radio-button"
- *ngFor="let alternative of staticProperty.alternatives"
- [value]="alternative"
- [checked]="alternative.selected"
- [matTooltip]="alternative.description"
- [attr.data-cy]="
- staticProperty.internalName
- .split(' ')
- .join('_')
- .toLowerCase() +
- '-' +
- alternative.label.split(' ').join('_').toLowerCase()
- "
- >
- <label style="font-weight: normal">
- {{ alternative.label }}
- </label>
- </mat-radio-button>
+ @for (
+ alternative of staticProperty.alternatives;
+ track alternative
+ ) {
+ <mat-radio-button
+ class="radio-button"
+ [value]="alternative"
+ [checked]="alternative.selected"
+ [matTooltip]="alternative.description"
+ [attr.data-cy]="
+ staticProperty.internalName
+ .split(' ')
+ .join('_')
+ .toLowerCase() +
+ '-' +
+ alternative.label.split(' ').join('_').toLowerCase()
+ "
+ >
+ <label style="font-weight: normal">
+ {{ alternative.label }}
+ </label>
+ </mat-radio-button>
+ }
</mat-radio-group>
</div>
- <div
- *ngFor="
- let alternative of staticProperty.alternatives;
- let i = index
- "
- >
- <div
- *ngIf="
+ @for (
+ alternative of staticProperty.alternatives;
+ track alternative;
+ let i = $index
+ ) {
+ <div>
+ @if (
alternative.selected === true &&
alternative.staticProperty !== null
- "
- >
- <div style="padding: 0 10px">
- <sp-app-static-property
- [adapterId]="adapterId"
- [completedConfigurations]="
- completedAlternativeConfigurations
- "
- [deploymentConfiguration]="deploymentConfiguration"
- [eventSchemas]="eventSchemas"
- [parentForm]="parentForm"
- [staticProperties]="staticProperties"
- [fieldName]="
- fieldName +
- '-' +
- alternative.staticProperty.internalName +
- '-' +
- i
- "
- [staticProperty]="alternative.staticProperty"
- [displayRecommended]="displayRecommended"
- (completedConfigurationsEmitter)="
- handleConfigurationUpdate($event)
- "
- class="test fullWidth"
- >
- </sp-app-static-property>
- </div>
+ ) {
+ <div>
+ <div style="padding: 0 10px">
+ <sp-app-static-property
+ [adapterId]="adapterId"
+ [completedConfigurations]="
+ completedAlternativeConfigurations
+ "
+ [deploymentConfiguration]="
+ deploymentConfiguration
+ "
+ [eventSchemas]="eventSchemas"
+ [parentForm]="parentForm"
+ [staticProperties]="staticProperties"
+ [fieldName]="
+ fieldName +
+ '-' +
+ alternative.staticProperty.internalName +
+ '-' +
+ i
+ "
+ [staticProperty]="alternative.staticProperty"
+ [displayRecommended]="displayRecommended"
+ (completedConfigurationsEmitter)="
+ handleConfigurationUpdate($event)
+ "
+ class="test fullWidth"
+ >
+ </sp-app-static-property>
+ </div>
+ </div>
+ }
</div>
- </div>
+ }
</div>
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.html b/ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.html
index 9730051c17..80d99fb57a 100644
--- a/ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.html
+++ b/ui/src/app/core-ui/static-properties/static-any-input/static-any-input.component.html
@@ -1,46 +1,52 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div id="formWrapper" fxFlex="100" fxLayout="column">
- <div *ngIf="!staticProperty.horizontalRendering" fxLayout="column">
- <mat-checkbox
- color="accent"
- *ngFor="let option of staticProperty.options"
- [(ngModel)]="option.selected"
- style="margin-left: 10px"
- [attr.data-cy]="fieldName"
- >
- {{ option.name }}
- </mat-checkbox>
- </div>
- <div *ngIf="staticProperty.horizontalRendering">
- <mat-form-field style="width: 100%" color="accent">
- <mat-select multiple>
- <mat-option
- *ngFor="let option of staticProperty.options"
- [value]="option.elementId"
- (click)="select(option.elementId)"
+ @if (!staticProperty.horizontalRendering) {
+ <div fxLayout="column">
+ @for (option of staticProperty.options; track option) {
+ <mat-checkbox
+ color="accent"
+ [(ngModel)]="option.selected"
+ style="margin-left: 10px"
+ [attr.data-cy]="fieldName"
>
- <label style="font-weight: normal">
- {{ option.name }}
- </label>
- </mat-option>
- </mat-select>
- </mat-form-field>
- </div>
+ {{ option.name }}
+ </mat-checkbox>
+ }
+ </div>
+ }
+ @if (staticProperty.horizontalRendering) {
+ <div>
+ <mat-form-field style="width: 100%" color="accent">
+ <mat-select multiple>
+ @for (option of staticProperty.options; track option) {
+ <mat-option
+ [value]="option.elementId"
+ (click)="select(option.elementId)"
+ >
+ <label style="font-weight: normal">
+ {{ option.name }}
+ </label>
+ </mat-option>
+ }
+ </mat-select>
+ </mat-form-field>
+ </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-collection/add-to-collection/add-to-collection.component.html b/ui/src/app/core-ui/static-properties/static-collection/add-to-collection/add-to-collection.component.html
index 9a796e8790..4eb189111b 100644
--- a/ui/src/app/core-ui/static-properties/static-collection/add-to-collection/add-to-collection.component.html
+++ b/ui/src/app/core-ui/static-properties/static-collection/add-to-collection/add-to-collection.component.html
@@ -1,63 +1,80 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
-<div *ngIf="!showFileSelecion" fxLayoutGap="10px">
- <button mat-button mat-flat-button (click)="add()">
- <mat-icon class="icon">add</mat-icon>
- <span>{{ 'Add' | translate }}</span>
- </button>
- <button mat-button mat-flat-button (click)="selectFileSelection()">
- <mat-icon class="icon">add</mat-icon>
- <span>{{ 'Import from file' | translate }}</span>
- </button>
-</div>
-<div *ngIf="showFileSelecion">
- <button mat-button mat-flat-button (click)="closeFileSelection()">
- <mat-icon class="icon">arrow_back</mat-icon>
- <span>{{ 'Back' | translate }}</span>
- </button>
- <div fxFlex="100" style="margin: 5px; width: 100%">
- <mat-form-field
- style="width: 95%"
- (click)="fileInput.click()"
- color="accent"
- *ngIf="!hasError"
- >
- <input matInput [placeholder]="'File' | translate" disabled />
- <input
- #fileInput
- type="file"
- style="display: none"
- data-cy="sp-file-management-file-input"
- (change)="handleFileInput($event.target)"
- />
- <div>
- {{ fileName }}
- <mat-progress-bar
- mode="indeterminate"
- *ngIf="processingFile"
- ></mat-progress-bar>
- </div>
- <button color="accent" matSuffix mat-button style="min-width: 0px">
- <mat-icon>insert_drive_file</mat-icon>
- </button>
- </mat-form-field>
- <mat-error *ngIf="hasError">
- {{ errorMessage }}
- </mat-error>
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
+@if (!showFileSelecion) {
+ <div fxLayoutGap="10px">
+ <button mat-button mat-flat-button (click)="add()">
+ <mat-icon class="icon">add</mat-icon>
+ <span>{{ 'Add' | translate }}</span>
+ </button>
+ <button mat-button mat-flat-button (click)="selectFileSelection()">
+ <mat-icon class="icon">add</mat-icon>
+ <span>{{ 'Import from file' | translate }}</span>
+ </button>
</div>
-</div>
+}
+@if (showFileSelecion) {
+ <div>
+ <button mat-button mat-flat-button (click)="closeFileSelection()">
+ <mat-icon class="icon">arrow_back</mat-icon>
+ <span>{{ 'Back' | translate }}</span>
+ </button>
+ <div fxFlex="100" style="margin: 5px; width: 100%">
+ @if (!hasError) {
+ <mat-form-field
+ style="width: 95%"
+ (click)="fileInput.click()"
+ color="accent"
+ >
+ <input
+ matInput
+ [placeholder]="'File' | translate"
+ disabled
+ />
+ <input
+ #fileInput
+ type="file"
+ style="display: none"
+ data-cy="sp-file-management-file-input"
+ (change)="handleFileInput($event.target)"
+ />
+ <div>
+ {{ fileName }}
+ @if (processingFile) {
+ <mat-progress-bar
+ mode="indeterminate"
+ ></mat-progress-bar>
+ }
+ </div>
+ <button
+ color="accent"
+ matSuffix
+ mat-button
+ style="min-width: 0px"
+ >
+ <mat-icon>insert_drive_file</mat-icon>
+ </button>
+ </mat-form-field>
+ }
+ @if (hasError) {
+ <mat-error>
+ {{ errorMessage }}
+ </mat-error>
+ }
+ </div>
+ </div>
+}
diff --git a/ui/src/app/core-ui/static-properties/static-collection/static-collection.component.html b/ui/src/app/core-ui/static-properties/static-collection/static-collection.component.html
index c2db12bedb..cec2a0d129 100644
--- a/ui/src/app/core-ui/static-properties/static-collection/static-collection.component.html
+++ b/ui/src/app/core-ui/static-properties/static-collection/static-collection.component.html
@@ -1,50 +1,48 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div fxFlex="100" fxLayout="column">
- <div
- fxLayout="row"
- fxLayoutAlign="space-between center"
- *ngFor="let property of staticProperty.members; let i = index"
- >
- <div fxFlex="grow">
- <sp-app-static-property
- [deploymentConfiguration]="deploymentConfiguration"
- [adapterId]="adapterId"
- [eventSchemas]="eventSchemas"
- [parentForm]="parentForm"
- [showBorder]="false"
- [fieldName]="property.internalName + '-' + i"
- [staticProperty]="property"
+ @for (property of staticProperty.members; track property; let i = $index) {
+ <div fxLayout="row" fxLayoutAlign="space-between center">
+ <div fxFlex="grow">
+ <sp-app-static-property
+ [deploymentConfiguration]="deploymentConfiguration"
+ [adapterId]="adapterId"
+ [eventSchemas]="eventSchemas"
+ [parentForm]="parentForm"
+ [showBorder]="false"
+ [fieldName]="property.internalName + '-' + i"
+ [staticProperty]="property"
+ >
+ </sp-app-static-property>
+ </div>
+ <div
+ fxFlex="nogrow"
+ style="width: 50px"
+ fxLayout="row"
+ fxLayoutAlign="end center"
>
- </sp-app-static-property>
+ <button mat-icon-button class="icon-button" (click)="remove(i)">
+ <mat-icon class="icon">remove</mat-icon>
+ </button>
+ </div>
</div>
- <div
- fxFlex="nogrow"
- style="width: 50px"
- fxLayout="row"
- fxLayoutAlign="end center"
- >
- <button mat-icon-button class="icon-button" (click)="remove(i)">
- <mat-icon class="icon">remove</mat-icon>
- </button>
- </div>
- </div>
+ }
<div fxFlex>
<sp-add-to-collection
(addPropertyEmitter)="add($event)"
diff --git a/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.html b/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.html
index b22d2ae24a..b56250469a 100644
--- a/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.html
+++ b/ui/src/app/core-ui/static-properties/static-file-input/static-file-input.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div fxFlex="100" fxLayout="column" [formGroup]="parentForm">
<div fxFlex="100" fxLayout="column">
@@ -31,98 +31,106 @@
}}</mat-radio-button>
</mat-radio-group>
</div>
- <div
- *ngIf="chooseExistingFileControl.value && filesLoaded"
- class="mt-10"
- >
- <mat-form-field color="accent" class="w-100">
- <input
- data-cy="file-input-file-name"
- type="text"
- [placeholder]="'Select file' | translate"
- formControlName="{{ fieldName }}"
- matInput
- [matAutocomplete]="auto"
- />
- <button
- *ngIf="selectedFile"
- matSuffix
- mat-icon-button
- [attr.aria-label]="'Clear' | translate"
- (click)="selectedFile = {}"
- >
- <mat-icon>close</mat-icon>
- </button>
- <mat-autocomplete
- #auto="matAutocomplete"
- (optionSelected)="selectOption($event.option.value)"
- [displayWith]="displayFn"
- style="width: 50%"
- >
- <mat-option
- *ngFor="let fileMetadata of fileMetadata"
- [value]="fileMetadata"
+ @if (chooseExistingFileControl.value && filesLoaded) {
+ <div class="mt-10">
+ <mat-form-field color="accent" class="w-100">
+ <input
+ data-cy="file-input-file-name"
+ type="text"
+ [placeholder]="'Select file' | translate"
+ formControlName="{{ fieldName }}"
+ matInput
+ [matAutocomplete]="auto"
+ />
+ @if (selectedFile) {
+ <button
+ matSuffix
+ mat-icon-button
+ [attr.aria-label]="'Clear' | translate"
+ (click)="selectedFile = {}"
+ >
+ <mat-icon>close</mat-icon>
+ </button>
+ }
+ <mat-autocomplete
+ #auto="matAutocomplete"
+ (optionSelected)="selectOption($event.option.value)"
+ [displayWith]="displayFn"
+ style="width: 50%"
>
- {{ fileMetadata.filename }}
- </mat-option>
- </mat-autocomplete>
- </mat-form-field>
- </div>
- <div *ngIf="!chooseExistingFileControl.value">
- <mat-form-field
- style="width: 95%"
- (click)="fileInput.click()"
- *ngIf="!chooseExistingFileControl.value"
- >
- <input
- matInput
- placeholder="{{ staticProperty.label }}"
- disabled
- (value)="(fileName)"
- />
- <input
- #fileInput
- type="file"
- style="display: none"
- (change)="handleFileInput($event.target.files)"
- />
- <div>
- {{ fileName }}
- <mat-progress-bar
- mode="determinate"
- value="{{ uploadStatus }}"
- *ngIf="uploadStatus > 0"
- ></mat-progress-bar>
- </div>
-
- <button
- color="accent"
- matSuffix
- mat-button
- style="min-width: 0px"
- >
- <mat-icon *ngIf="uploadStatus < 99"
- >insert_drive_file</mat-icon
+ @for (
+ fileMetadata of fileMetadata;
+ track fileMetadata
+ ) {
+ <mat-option [value]="fileMetadata">
+ {{ fileMetadata.filename }}
+ </mat-option>
+ }
+ </mat-autocomplete>
+ </mat-form-field>
+ </div>
+ }
+ @if (!chooseExistingFileControl.value) {
+ <div>
+ @if (!chooseExistingFileControl.value) {
+ <mat-form-field
+ style="width: 95%"
+ (click)="fileInput.click()"
>
- <mat-icon *ngIf="uploadStatus === 100" class="green-icon"
- >check_circle</mat-icon
+ <input
+ matInput
+ placeholder="{{ staticProperty.label }}"
+ disabled
+ (value)="(fileName)"
+ />
+ <input
+ #fileInput
+ type="file"
+ style="display: none"
+ (change)="handleFileInput($event.target.files)"
+ />
+ <div>
+ {{ fileName }}
+ @if (uploadStatus > 0) {
+ <mat-progress-bar
+ mode="determinate"
+ value="{{ uploadStatus }}"
+ ></mat-progress-bar>
+ }
+ </div>
+ <button
+ color="accent"
+ matSuffix
+ mat-button
+ style="min-width: 0px"
+ >
+ @if (uploadStatus < 99) {
+ <mat-icon>insert_drive_file</mat-icon>
+ }
+ @if (uploadStatus === 100) {
+ <mat-icon class="green-icon"
+ >check_circle</mat-icon
+ >
+ }
+ </button>
+ @if (!hasInput) {
+ <mat-error>
+ {{ errorMessage }}
+ </mat-error>
+ }
+ </mat-form-field>
+ }
+ <div>
+ <button
+ color="accent"
+ mat-flat-button
+ (click)="upload()"
+ [disabled]="!fileName"
>
- </button>
-
- <mat-error *ngIf="!hasInput">
- {{ errorMessage }}
- </mat-error>
- </mat-form-field>
- <div>
- <button
- color="accent"
- mat-flat-button
- (click)="upload()"
- [disabled]="!fileName"
- >
- {{ 'Upload' | translate }}
- </button>
+ {{ 'Upload' | translate }}
+ </button>
+ </div>
</div>
- </div>
+ }
</div>
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.html b/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.html
index 73ee8ba815..dc4238023d 100644
--- a/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.html
+++ b/ui/src/app/core-ui/static-properties/static-free-input/static-free-input.component.html
@@ -1,110 +1,120 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div [formGroup]="parentForm" fxFlex="100" fxLayout="column">
- <div
- fxFlex
- fxLayout="row"
- *ngIf="!staticProperty.valueSpecification && !staticProperty.multiLine"
- >
- <mat-form-field fxFlex>
- <input
- formControlName="{{ fieldName }}"
- fxFlex
- matInput
- [placeholder]="staticProperty.label"
- (blur)="emitUpdate()"
- [attr.data-cy]="fieldName"
- />
-
- <mat-error *ngIf="!fieldValid">
- {{ errorMessage }}
- </mat-error>
- </mat-form-field>
- </div>
- <div *ngIf="staticProperty.valueSpecification">
- <div fxLayout="column" fxFlex="100">
- <mat-slider
- [max]="staticProperty.valueSpecification.maxValue"
- [min]="staticProperty.valueSpecification.minValue"
- [step]="staticProperty.valueSpecification.step"
- [attr.data-cy]="fieldName"
- [discrete]="true"
- [displayWith]="formatLabel"
- >
+ @if (!staticProperty.valueSpecification && !staticProperty.multiLine) {
+ <div fxFlex fxLayout="row">
+ <mat-form-field fxFlex>
<input
- matSliderThumb
- #slider
formControlName="{{ fieldName }}"
+ fxFlex
+ matInput
+ [placeholder]="staticProperty.label"
+ (blur)="emitUpdate()"
+ [attr.data-cy]="fieldName"
/>
- </mat-slider>
+ @if (!fieldValid) {
+ <mat-error>
+ {{ errorMessage }}
+ </mat-error>
+ }
+ </mat-form-field>
</div>
- </div>
- <div
- *ngIf="!staticProperty.valueSpecification && !staticProperty.mapsTo"
- fxFlex="100"
- fxLayout="column"
- >
- <div
- fxFlex="100"
- fxLayout="column"
- *ngIf="staticProperty.placeholdersSupported"
- >
- <h5>{{ 'Possible placeholders:' | translate }}</h5>
- <div fxFlex="100" fxLayout="row" style="background: white">
- <mat-chip-list style="margin-bottom: 10px">
- <mat-chip
- (click)="applyPlaceholder(property.runtimeName)"
- color="accent"
- *ngFor="let property of eventSchemas[0].eventProperties"
- style="margin-right: 5px; margin-bottom: 5px"
- >#{{ property.runtimeName }}#
- </mat-chip>
- </mat-chip-list>
+ }
+ @if (staticProperty.valueSpecification) {
+ <div>
+ <div fxLayout="column" fxFlex="100">
+ <mat-slider
+ [max]="staticProperty.valueSpecification.maxValue"
+ [min]="staticProperty.valueSpecification.minValue"
+ [step]="staticProperty.valueSpecification.step"
+ [attr.data-cy]="fieldName"
+ [discrete]="true"
+ [displayWith]="formatLabel"
+ >
+ <input
+ matSliderThumb
+ #slider
+ formControlName="{{ fieldName }}"
+ />
+ </mat-slider>
</div>
</div>
- <div fxFlex="100" *ngIf="staticProperty.multiLine">
- @if (staticProperty.htmlAllowed) {
- <quill-editor
- fxFlex="100"
- *ngIf="staticProperty.htmlFontFormat"
- #textEditor
- formControlName="{{ fieldName }}"
- [modules]="quillModulesFontFormat"
- ></quill-editor>
- <quill-editor
- fxFlex="100"
- *ngIf="!staticProperty.htmlFontFormat"
- #textEditor
- formControlName="{{ fieldName }}"
- [modules]="quillModules"
- ></quill-editor>
- } @else {
- <mat-form-field fxFlex>
- <textarea
- formControlName="{{ fieldName }}"
- matInput
- [placeholder]="staticProperty.label"
- (blur)="emitUpdate()"
- [attr.data-cy]="fieldName"
- ></textarea>
- </mat-form-field>
+ }
+ @if (!staticProperty.valueSpecification && !staticProperty.mapsTo) {
+ <div fxFlex="100" fxLayout="column">
+ @if (staticProperty.placeholdersSupported) {
+ <div fxFlex="100" fxLayout="column">
+ <h5>{{ 'Possible placeholders:' | translate }}</h5>
+ <div fxFlex="100" fxLayout="row" style="background: white">
+ <mat-chip-list style="margin-bottom: 10px">
+ @for (
+ property of eventSchemas[0].eventProperties;
+ track property
+ ) {
+ <mat-chip
+ (click)="
+ applyPlaceholder(property.runtimeName)
+ "
+ color="accent"
+ style="
+ margin-right: 5px;
+ margin-bottom: 5px;
+ "
+ >#{{ property.runtimeName }}#
+ </mat-chip>
+ }
+ </mat-chip-list>
+ </div>
+ </div>
+ }
+ @if (staticProperty.multiLine) {
+ <div fxFlex="100">
+ @if (staticProperty.htmlAllowed) {
+ @if (staticProperty.htmlFontFormat) {
+ <quill-editor
+ fxFlex="100"
+ #textEditor
+ formControlName="{{ fieldName }}"
+ [modules]="quillModulesFontFormat"
+ ></quill-editor>
+ }
+ @if (!staticProperty.htmlFontFormat) {
+ <quill-editor
+ fxFlex="100"
+ #textEditor
+ formControlName="{{ fieldName }}"
+ [modules]="quillModules"
+ ></quill-editor>
+ }
+ } @else {
+ <mat-form-field fxFlex>
+ <textarea
+ formControlName="{{ fieldName }}"
+ matInput
+ [placeholder]="staticProperty.label"
+ (blur)="emitUpdate()"
+ [attr.data-cy]="fieldName"
+ ></textarea>
+ </mat-form-field>
+ }
+ </div>
}
</div>
- </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-group/static-group.component.html b/ui/src/app/core-ui/static-properties/static-group/static-group.component.html
index d321f4c904..545e6d89da 100644
--- a/ui/src/app/core-ui/static-properties/static-group/static-group.component.html
+++ b/ui/src/app/core-ui/static-properties/static-group/static-group.component.html
@@ -1,60 +1,71 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
-<div *ngIf="!staticProperty.horizontalRendering" fxLayout="column">
- <sp-app-static-property
- *ngFor="let property of staticProperty.staticProperties; let i = index"
- [adapterId]="adapterId"
- [deploymentConfiguration]="deploymentConfiguration"
- [parentForm]="parentForm"
- [staticProperties]="staticProperties"
- [fieldName]="fieldName + '-' + property.internalName + '-' + i"
- [showBorder]="false"
- [eventSchemas]="eventSchemas"
- [staticProperty]="property"
- [displayRecommended]="displayRecommended"
- (completedConfigurationsEmitter)="handleConfigurationUpdate($event)"
- class="test fullWidth"
- >
- </sp-app-static-property>
-</div>
+@if (!staticProperty.horizontalRendering) {
+ <div fxLayout="column">
+ @for (
+ property of staticProperty.staticProperties;
+ track property;
+ let i = $index
+ ) {
+ <sp-app-static-property
+ [adapterId]="adapterId"
+ [deploymentConfiguration]="deploymentConfiguration"
+ [parentForm]="parentForm"
+ [staticProperties]="staticProperties"
+ [fieldName]="fieldName + '-' + property.internalName + '-' + i"
+ [showBorder]="false"
+ [eventSchemas]="eventSchemas"
+ [staticProperty]="property"
+ [displayRecommended]="displayRecommended"
+ (completedConfigurationsEmitter)="
+ handleConfigurationUpdate($event)
+ "
+ class="test fullWidth"
+ >
+ </sp-app-static-property>
+ }
+ </div>
+}
-<div
- *ngIf="staticProperty.horizontalRendering"
- fxLayout="row"
- fxLayoutAlign="space-between center"
->
- <ng-container
- *ngFor="let property of staticProperty.staticProperties; let i = index"
- >
- <span *ngIf="i > 0" style="margin-left: 10px"></span>
- <sp-app-static-property
- [adapterId]="adapterId"
- [deploymentConfiguration]="deploymentConfiguration"
- [parentForm]="parentForm"
- [staticProperties]="staticProperties"
- [showBorder]="false"
- [fieldName]="fieldName + '-' + property.internalName + '-' + i"
- [eventSchemas]="eventSchemas"
- [staticProperty]="property"
- [displayRecommended]="displayRecommended"
- class="test fullWidth"
- >
- </sp-app-static-property>
- </ng-container>
-</div>
+@if (staticProperty.horizontalRendering) {
+ <div fxLayout="row" fxLayoutAlign="space-between center">
+ @for (
+ property of staticProperty.staticProperties;
+ track property;
+ let i = $index
+ ) {
+ @if (i > 0) {
+ <span style="margin-left: 10px"></span>
+ }
+ <sp-app-static-property
+ [adapterId]="adapterId"
+ [deploymentConfiguration]="deploymentConfiguration"
+ [parentForm]="parentForm"
+ [staticProperties]="staticProperties"
+ [showBorder]="false"
+ [fieldName]="fieldName + '-' + property.internalName + '-' + i"
+ [eventSchemas]="eventSchemas"
+ [staticProperty]="property"
+ [displayRecommended]="displayRecommended"
+ class="test fullWidth"
+ >
+ </sp-app-static-property>
+ }
+ </div>
+}
diff --git a/ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.html b/ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.html
index d3ad054246..d69ad8d4d3 100644
--- a/ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.html
+++ b/ui/src/app/core-ui/static-properties/static-mapping-nary/static-mapping-nary.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div id="formWrapper" fxFlex="100" fxLayout="column">
<div fxFlex="100" fxLayoutAlign="start center">
@@ -38,20 +38,22 @@
</button>
</div>
<div fxFlex="100" fxLayout="column" style="margin-top: 10px">
- <mat-checkbox
- *ngFor="
- let property of availableProperties
- | displayRecommendedPipe
- : staticProperty.propertyScope
- : displayRecommended
- "
- [attr.data-cy]="property.runtimeName"
- [(ngModel)]="property['checked']"
- (change)="selectOption(property, $event)"
- style="margin-left: 10px"
- color="accent"
- >
- {{ property.runtimeName }}
- </mat-checkbox>
+ @for (
+ property of availableProperties
+ | displayRecommendedPipe
+ : staticProperty.propertyScope
+ : displayRecommended;
+ track property
+ ) {
+ <mat-checkbox
+ [attr.data-cy]="property.runtimeName"
+ [(ngModel)]="property['checked']"
+ (change)="selectOption(property, $event)"
+ style="margin-left: 10px"
+ color="accent"
+ >
+ {{ property.runtimeName }}
+ </mat-checkbox>
+ }
</div>
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.html b/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.html
index 250a66cf7b..41fa588c0e 100644
--- a/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.html
+++ b/ui/src/app/core-ui/static-properties/static-mapping-unary/static-mapping-unary.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div [formGroup]="parentForm" id="formWrapper">
<div fxFlex="100" fxLayout="row">
@@ -24,17 +24,17 @@
[placeholder]="staticProperty.label"
[attr.data-cy]="fieldName"
>
- <mat-option
- *ngFor="
- let property of availableProperties
- | displayRecommendedPipe
- : staticProperty.propertyScope
- : displayRecommended
- "
- [value]="property.propertySelector"
- >
- {{ property.runtimeName }}
- </mat-option>
+ @for (
+ property of availableProperties
+ | displayRecommendedPipe
+ : staticProperty.propertyScope
+ : displayRecommended;
+ track property
+ ) {
+ <mat-option [value]="property.propertySelector">
+ {{ property.runtimeName }}
+ </mat-option>
+ }
</mat-select>
</mat-form-field>
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.html b/ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.html
index 6248fc4db9..bda1480cf4 100644
--- a/ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.html
+++ b/ui/src/app/core-ui/static-properties/static-one-of-input/static-one-of-input.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div id="formWrapper" fxFlex="100" fxLayout="column">
@if (!staticProperty.horizontalRendering) {
@@ -22,24 +22,28 @@
<div fxFlex fxLayout="row">
<div fxLayout="column" style="margin-left: 10px">
<mat-radio-group class="radio-group" color="accent">
- <mat-radio-button
- *ngFor="let option of staticProperty.options"
- [value]="option"
- (click)="select(option.elementId)"
- [checked]="option.selected"
- [attr.data-cy]="
- staticProperty.internalName
- .split(' ')
- .join('_')
- .toLowerCase() +
- '-' +
- option.name.split(' ').join('_').toLowerCase()
- "
- >
- <label style="font-weight: normal">
- {{ option.name }}
- </label>
- </mat-radio-button>
+ @for (option of staticProperty.options; track option) {
+ <mat-radio-button
+ [value]="option"
+ (click)="select(option.elementId)"
+ [checked]="option.selected"
+ [attr.data-cy]="
+ staticProperty.internalName
+ .split(' ')
+ .join('_')
+ .toLowerCase() +
+ '-' +
+ option.name
+ .split(' ')
+ .join('_')
+ .toLowerCase()
+ "
+ >
+ <label style="font-weight: normal">
+ {{ option.name }}
+ </label>
+ </mat-radio-button>
+ }
</mat-radio-group>
</div>
</div>
@@ -51,15 +55,16 @@
[(value)]="selectedOption"
[attr.data-cy]="fieldName"
>
- <mat-option
- *ngFor="let option of staticProperty.options"
- [value]="option.elementId"
- (click)="select(option.elementId)"
- >
- <label style="font-weight: normal">
- {{ option.name }}
- </label>
- </mat-option>
+ @for (option of staticProperty.options; track option) {
+ <mat-option
+ [value]="option.elementId"
+ (click)="select(option.elementId)"
+ >
+ <label style="font-weight: normal">
+ {{ option.name }}
+ </label>
+ </mat-option>
+ }
</mat-select>
</mat-form-field>
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-property.component.html b/ui/src/app/core-ui/static-properties/static-property.component.html
index 94079dcd13..c5cc7f639e 100644
--- a/ui/src/app/core-ui/static-properties/static-property.component.html
+++ b/ui/src/app/core-ui/static-properties/static-property.component.html
@@ -1,290 +1,304 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div fxFlex="100" fxLayout="column" class="small-form-field-density">
<div fxFlex="100" fxLayout="column" class="static-property-panel">
- <div
- fxFlex="100"
- fxLayout="column"
- style="margin-bottom: 10px"
- *ngIf="showLabel"
- >
- <b>{{ staticProperty.label }}</b>
- <mat-hint class="description">{{
- staticProperty.description
- }}</mat-hint>
- </div>
+ @if (showLabel) {
+ <div fxFlex="100" fxLayout="column" style="margin-bottom: 10px">
+ <b>{{ staticProperty.label }}</b>
+ <mat-hint class="description">{{
+ staticProperty.description
+ }}</mat-hint>
+ </div>
+ }
<div fxFlex="100">
- <sp-static-code-input
- *ngIf="isCodeInputStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [staticProperty]="staticProperty"
- [parentForm]="parentForm"
- [eventSchemas]="eventSchemas"
- [fieldName]="fieldName"
- >
- </sp-static-code-input>
+ @if (isCodeInputStaticProperty(staticProperty)) {
+ <sp-static-code-input
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [staticProperty]="staticProperty"
+ [parentForm]="parentForm"
+ [eventSchemas]="eventSchemas"
+ [fieldName]="fieldName"
+ >
+ </sp-static-code-input>
+ }
- <sp-app-static-secret-input
- *ngIf="isSecretStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [staticProperty]="staticProperty"
- [parentForm]="parentForm"
- [fieldName]="fieldName"
- >
- </sp-app-static-secret-input>
+ @if (isSecretStaticProperty(staticProperty)) {
+ <sp-app-static-secret-input
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [staticProperty]="staticProperty"
+ [parentForm]="parentForm"
+ [fieldName]="fieldName"
+ >
+ </sp-app-static-secret-input>
+ }
- <sp-app-static-free-input
- *ngIf="isFreeTextStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [staticProperty]="staticProperty"
- [parentForm]="parentForm"
- [eventSchemas]="eventSchemas"
- [fieldName]="fieldName"
- >
- </sp-app-static-free-input>
+ @if (isFreeTextStaticProperty(staticProperty)) {
+ <sp-app-static-free-input
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [staticProperty]="staticProperty"
+ [parentForm]="parentForm"
+ [eventSchemas]="eventSchemas"
+ [fieldName]="fieldName"
+ >
+ </sp-app-static-free-input>
+ }
- <sp-static-file-input
- *ngIf="isFileStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [staticProperty]="staticProperty"
- [parentForm]="parentForm"
- [fieldName]="fieldName"
- [adapterId]="adapterId"
- >
- </sp-static-file-input>
+ @if (isFileStaticProperty(staticProperty)) {
+ <sp-static-file-input
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [staticProperty]="staticProperty"
+ [parentForm]="parentForm"
+ [fieldName]="fieldName"
+ [adapterId]="adapterId"
+ >
+ </sp-static-file-input>
+ }
- <sp-app-static-color-picker
- *ngIf="isColorPickerStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [staticProperty]="staticProperty"
- [parentForm]="parentForm"
- [fieldName]="fieldName"
- >
- </sp-app-static-color-picker>
+ @if (isColorPickerStaticProperty(staticProperty)) {
+ <sp-app-static-color-picker
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [staticProperty]="staticProperty"
+ [parentForm]="parentForm"
+ [fieldName]="fieldName"
+ >
+ </sp-app-static-color-picker>
+ }
- <sp-app-static-runtime-resolvable-any-input
- *ngIf="isRuntimeResolvableAnyStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [deploymentConfiguration]="deploymentConfiguration"
- [staticProperty]="staticProperty"
- [staticProperties]="staticProperties"
- [eventSchemas]="eventSchemas"
- [pipelineElement]="pipelineElement"
- [parentForm]="parentForm"
- [adapterId]="adapterId"
- >
- </sp-app-static-runtime-resolvable-any-input>
+ @if (isRuntimeResolvableAnyStaticProperty(staticProperty)) {
+ <sp-app-static-runtime-resolvable-any-input
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [deploymentConfiguration]="deploymentConfiguration"
+ [staticProperty]="staticProperty"
+ [staticProperties]="staticProperties"
+ [eventSchemas]="eventSchemas"
+ [pipelineElement]="pipelineElement"
+ [parentForm]="parentForm"
+ [adapterId]="adapterId"
+ >
+ </sp-app-static-runtime-resolvable-any-input>
+ }
- <sp-app-static-runtime-resolvable-oneof-input
- *ngIf="isRuntimeResolvableOneOfStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [deploymentConfiguration]="deploymentConfiguration"
- [pipelineElement]="pipelineElement"
- [eventSchemas]="eventSchemas"
- [staticProperty]="staticProperty"
- [parentForm]="parentForm"
- [staticProperties]="staticProperties"
- [adapterId]="adapterId"
- ></sp-app-static-runtime-resolvable-oneof-input>
+ @if (isRuntimeResolvableOneOfStaticProperty(staticProperty)) {
+ <sp-app-static-runtime-resolvable-oneof-input
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [deploymentConfiguration]="deploymentConfiguration"
+ [pipelineElement]="pipelineElement"
+ [eventSchemas]="eventSchemas"
+ [staticProperty]="staticProperty"
+ [parentForm]="parentForm"
+ [staticProperties]="staticProperties"
+ [adapterId]="adapterId"
+ ></sp-app-static-runtime-resolvable-oneof-input>
+ }
- <sp-app-static-any-input
- *ngIf="
- isAnyStaticProperty(staticProperty) &&
- !isRuntimeResolvableAnyStaticProperty(staticProperty)
- "
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [fieldName]="fieldName"
- [staticProperty]="staticProperty"
- >
- </sp-app-static-any-input>
+ @if (
+ isAnyStaticProperty(staticProperty) &&
+ !isRuntimeResolvableAnyStaticProperty(staticProperty)
+ ) {
+ <sp-app-static-any-input
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [fieldName]="fieldName"
+ [staticProperty]="staticProperty"
+ >
+ </sp-app-static-any-input>
+ }
- <sp-static-one-of-input
- *ngIf="
- isOneOfStaticProperty(staticProperty) &&
- !isRuntimeResolvableOneOfStaticProperty(staticProperty)
- "
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [parentForm]="parentForm"
- [staticProperty]="staticProperty"
- >
- </sp-static-one-of-input>
+ @if (
+ isOneOfStaticProperty(staticProperty) &&
+ !isRuntimeResolvableOneOfStaticProperty(staticProperty)
+ ) {
+ <sp-static-one-of-input
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [parentForm]="parentForm"
+ [staticProperty]="staticProperty"
+ >
+ </sp-static-one-of-input>
+ }
- <sp-app-static-mapping-unary
- *ngIf="isMappingPropertyUnary(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [eventSchemas]="eventSchemas"
- [staticProperty]="staticProperty"
- [displayRecommended]="displayRecommended"
- [parentForm]="parentForm"
- [fieldName]="fieldName"
- >
- </sp-app-static-mapping-unary>
+ @if (isMappingPropertyUnary(staticProperty)) {
+ <sp-app-static-mapping-unary
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [eventSchemas]="eventSchemas"
+ [staticProperty]="staticProperty"
+ [displayRecommended]="displayRecommended"
+ [parentForm]="parentForm"
+ [fieldName]="fieldName"
+ >
+ </sp-app-static-mapping-unary>
+ }
- <sp-app-static-mapping-nary
- *ngIf="isMappingNaryProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [eventSchemas]="eventSchemas"
- [parentForm]="parentForm"
- [fieldName]="fieldName"
- [staticProperty]="staticProperty"
- [displayRecommended]="displayRecommended"
- >
- </sp-app-static-mapping-nary>
+ @if (isMappingNaryProperty(staticProperty)) {
+ <sp-app-static-mapping-nary
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [eventSchemas]="eventSchemas"
+ [parentForm]="parentForm"
+ [fieldName]="fieldName"
+ [staticProperty]="staticProperty"
+ [displayRecommended]="displayRecommended"
+ >
+ </sp-app-static-mapping-nary>
+ }
- <sp-app-static-alternatives
- *ngIf="isAlternativesStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [adapterId]="adapterId"
- [deploymentConfiguration]="deploymentConfiguration"
- [eventSchemas]="eventSchemas"
- [parentForm]="parentForm"
- [staticProperty]="staticProperty"
- [staticProperties]="staticProperties"
- [displayRecommended]="displayRecommended"
- class="test fullWidth"
- >
- </sp-app-static-alternatives>
+ @if (isAlternativesStaticProperty(staticProperty)) {
+ <sp-app-static-alternatives
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [adapterId]="adapterId"
+ [deploymentConfiguration]="deploymentConfiguration"
+ [eventSchemas]="eventSchemas"
+ [parentForm]="parentForm"
+ [staticProperty]="staticProperty"
+ [staticProperties]="staticProperties"
+ [displayRecommended]="displayRecommended"
+ class="test fullWidth"
+ >
+ </sp-app-static-alternatives>
+ }
- <sp-app-static-group
- *ngIf="
- isGroupStaticProperty(staticProperty) &&
- !isRuntimeResolvableGroupStaticProperty(staticProperty)
- "
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [adapterId]="adapterId"
- [deploymentConfiguration]="deploymentConfiguration"
- [eventSchemas]="eventSchemas"
- [parentForm]="parentForm"
- [fieldName]="fieldName"
- [staticProperty]="staticProperty"
- [staticProperties]="staticProperties"
- [displayRecommended]="displayRecommended"
- class="test fullWidth"
- >
- </sp-app-static-group>
+ @if (
+ isGroupStaticProperty(staticProperty) &&
+ !isRuntimeResolvableGroupStaticProperty(staticProperty)
+ ) {
+ <sp-app-static-group
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [adapterId]="adapterId"
+ [deploymentConfiguration]="deploymentConfiguration"
+ [eventSchemas]="eventSchemas"
+ [parentForm]="parentForm"
+ [fieldName]="fieldName"
+ [staticProperty]="staticProperty"
+ [staticProperties]="staticProperties"
+ [displayRecommended]="displayRecommended"
+ class="test fullWidth"
+ >
+ </sp-app-static-group>
+ }
- <sp-app-static-runtime-resolvable-group
- *ngIf="isRuntimeResolvableGroupStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [deploymentConfiguration]="deploymentConfiguration"
- [adapterId]="adapterId"
- [eventSchemas]="eventSchemas"
- [parentForm]="parentForm"
- [fieldName]="fieldName"
- [staticProperties]="staticProperties"
- [staticProperty]="staticProperty"
- [displayRecommended]="displayRecommended"
- class="test fullWidth"
- >
- </sp-app-static-runtime-resolvable-group>
+ @if (isRuntimeResolvableGroupStaticProperty(staticProperty)) {
+ <sp-app-static-runtime-resolvable-group
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [deploymentConfiguration]="deploymentConfiguration"
+ [adapterId]="adapterId"
+ [eventSchemas]="eventSchemas"
+ [parentForm]="parentForm"
+ [fieldName]="fieldName"
+ [staticProperties]="staticProperties"
+ [staticProperty]="staticProperty"
+ [displayRecommended]="displayRecommended"
+ class="test fullWidth"
+ >
+ </sp-app-static-runtime-resolvable-group>
+ }
- <sp-static-collection
- *ngIf="isCollectionStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [deploymentConfiguration]="deploymentConfiguration"
- [adapterId]="adapterId"
- [eventSchemas]="eventSchemas"
- [parentForm]="parentForm"
- [fieldName]="fieldName"
- [displayRecommended]="displayRecommended"
- [staticProperty]="staticProperty"
- class="test fullWidth"
- >
- </sp-static-collection>
+ @if (isCollectionStaticProperty(staticProperty)) {
+ <sp-static-collection
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [deploymentConfiguration]="deploymentConfiguration"
+ [adapterId]="adapterId"
+ [eventSchemas]="eventSchemas"
+ [parentForm]="parentForm"
+ [fieldName]="fieldName"
+ [displayRecommended]="displayRecommended"
+ [staticProperty]="staticProperty"
+ class="test fullWidth"
+ >
+ </sp-static-collection>
+ }
- <sp-static-slide-toggle
- *ngIf="isSlideToggleStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [adapterId]="adapterId"
- [parentForm]="parentForm"
- [fieldName]="fieldName"
- [displayRecommended]="displayRecommended"
- [staticProperty]="staticProperty"
- class="test fullWidth"
- >
- </sp-static-slide-toggle>
- <sp-static-runtime-resolvable-tree-input
- *ngIf="isTreeInputStaticProperty(staticProperty)"
- (completedConfigurationsEmitter)="
- completedConfigurationsEmitter.emit($event)
- "
- [completedConfigurations]="completedConfigurations"
- [deploymentConfiguration]="deploymentConfiguration"
- [adapterId]="adapterId"
- [parentForm]="parentForm"
- [pipelineElement]="pipelineElement"
- [eventSchemas]="eventSchemas"
- [staticProperties]="staticProperties"
- [fieldName]="fieldName"
- [displayRecommended]="displayRecommended"
- [staticProperty]="staticProperty"
- class="test fullWidth"
- >
- </sp-static-runtime-resolvable-tree-input>
+ @if (isSlideToggleStaticProperty(staticProperty)) {
+ <sp-static-slide-toggle
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [adapterId]="adapterId"
+ [parentForm]="parentForm"
+ [fieldName]="fieldName"
+ [displayRecommended]="displayRecommended"
+ [staticProperty]="staticProperty"
+ class="test fullWidth"
+ >
+ </sp-static-slide-toggle>
+ }
+ @if (isTreeInputStaticProperty(staticProperty)) {
+ <sp-static-runtime-resolvable-tree-input
+ (completedConfigurationsEmitter)="
+ completedConfigurationsEmitter.emit($event)
+ "
+ [completedConfigurations]="completedConfigurations"
+ [deploymentConfiguration]="deploymentConfiguration"
+ [adapterId]="adapterId"
+ [parentForm]="parentForm"
+ [pipelineElement]="pipelineElement"
+ [eventSchemas]="eventSchemas"
+ [staticProperties]="staticProperties"
+ [fieldName]="fieldName"
+ [displayRecommended]="displayRecommended"
+ [staticProperty]="staticProperty"
+ class="test fullWidth"
+ >
+ </sp-static-runtime-resolvable-tree-input>
+ }
</div>
</div>
<mat-divider></mat-divider>
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.html
index e0593ebf09..f31fb8761a 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.html
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-any-input/static-runtime-resolvable-any-input.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div id="formWrapper" fxFlex="100" fxLayout="column">
<div fxLayout="row" class="mb-10" fxLayoutGap="10px">
@@ -47,42 +47,49 @@
>
<span>{{ 'Reload' | translate }}</span>
</button>
- <mat-spinner
- *ngIf="loading"
- color="accent"
- [mode]="'indeterminate'"
- [diameter]="15"
- ></mat-spinner>
- </div>
- <div *ngIf="!staticProperty.horizontalRendering" fxLayout="column">
- <mat-checkbox
- style="padding-left: 10px"
- color="accent"
- *ngFor="let option of staticProperty.options"
- [(ngModel)]="option.selected"
- (ngModelChange)="checkEmitUpdate()"
- >
- {{ option.name }}
- </mat-checkbox>
- </div>
- <div fxLayout="column" *ngIf="!showOptions && !loading" class="mb-10">
- <span>{{ '(waiting for input)' | translate }}</span>
+ @if (loading) {
+ <mat-spinner
+ color="accent"
+ [mode]="'indeterminate'"
+ [diameter]="15"
+ ></mat-spinner>
+ }
</div>
-
- <div *ngIf="staticProperty.horizontalRendering && showOptions">
- <mat-form-field style="width: 100%" color="accent">
- <mat-select
- multiple
- [(ngModel)]="selectedOptions"
- (selectionChange)="onSelectionChange()"
- >
- <mat-option
- *ngFor="let option of staticProperty.options"
- [value]="option"
+ @if (!staticProperty.horizontalRendering) {
+ <div fxLayout="column">
+ @for (option of staticProperty.options; track option) {
+ <mat-checkbox
+ style="padding-left: 10px"
+ color="accent"
+ [(ngModel)]="option.selected"
+ (ngModelChange)="checkEmitUpdate()"
>
{{ option.name }}
- </mat-option>
- </mat-select>
- </mat-form-field>
- </div>
+ </mat-checkbox>
+ }
+ </div>
+ }
+ @if (!showOptions && !loading) {
+ <div fxLayout="column" class="mb-10">
+ <span>{{ '(waiting for input)' | translate }}</span>
+ </div>
+ }
+
+ @if (staticProperty.horizontalRendering && showOptions) {
+ <div>
+ <mat-form-field style="width: 100%" color="accent">
+ <mat-select
+ multiple
+ [(ngModel)]="selectedOptions"
+ (selectionChange)="onSelectionChange()"
+ >
+ @for (option of staticProperty.options; track option) {
+ <mat-option [value]="option">
+ {{ option.name }}
+ </mat-option>
+ }
+ </mat-select>
+ </mat-form-field>
+ </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-group/static-runtime-resolvable-group.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-group/static-runtime-resolvable-group.component.html
index 85d5c16f37..9a3f07eb66 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-group/static-runtime-resolvable-group.component.html
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-group/static-runtime-resolvable-group.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div fxLayout="column">
<div>
<button
@@ -29,49 +29,56 @@
<span>{{ 'Reload' | translate }}</span>
</button>
</div>
- <div *ngIf="!staticProperty.horizontalRendering" fxLayout="column">
- <sp-app-static-property
- *ngFor="
- let property of staticProperty.staticProperties;
- let i = index
- "
- [adapterId]="adapterId"
- [parentForm]="parentForm"
- [staticProperties]="staticProperties"
- [fieldName]="fieldName + '-' + property.internalName + '-' + i"
- [showBorder]="false"
- [eventSchemas]="eventSchemas"
- [staticProperty]="property"
- [displayRecommended]="displayRecommended"
- (updateEmitter)="handleConfigurationUpdate($event)"
- class="test fullWidth"
- >
- </sp-app-static-property>
- </div>
+ @if (!staticProperty.horizontalRendering) {
+ <div fxLayout="column">
+ @for (
+ property of staticProperty.staticProperties;
+ track property;
+ let i = $index
+ ) {
+ <sp-app-static-property
+ [adapterId]="adapterId"
+ [parentForm]="parentForm"
+ [staticProperties]="staticProperties"
+ [fieldName]="
+ fieldName + '-' + property.internalName + '-' + i
+ "
+ [showBorder]="false"
+ [eventSchemas]="eventSchemas"
+ [staticProperty]="property"
+ [displayRecommended]="displayRecommended"
+ (updateEmitter)="handleConfigurationUpdate($event)"
+ class="test fullWidth"
+ >
+ </sp-app-static-property>
+ }
+ </div>
+ }
- <div
- *ngIf="staticProperty.horizontalRendering"
- fxLayout="row"
- fxLayoutAlign="space-between center"
- >
- <ng-container
- *ngFor="
- let property of staticProperty.staticProperties;
- let i = index
- "
- >
- <span *ngIf="i > 0" style="margin-left: 10px"></span>
- <sp-app-static-property
- [adapterId]="adapterId"
- [parentForm]="parentForm"
- [staticProperties]="staticProperties"
- [showBorder]="false"
- [fieldName]="fieldName + '-' + property.internalName + '-' + i"
- [eventSchemas]="eventSchemas"
- [staticProperty]="property"
- [displayRecommended]="displayRecommended"
- >
- </sp-app-static-property>
- </ng-container>
- </div>
+ @if (staticProperty.horizontalRendering) {
+ <div fxLayout="row" fxLayoutAlign="space-between center">
+ @for (
+ property of staticProperty.staticProperties;
+ track property;
+ let i = $index
+ ) {
+ @if (i > 0) {
+ <span style="margin-left: 10px"></span>
+ }
+ <sp-app-static-property
+ [adapterId]="adapterId"
+ [parentForm]="parentForm"
+ [staticProperties]="staticProperties"
+ [showBorder]="false"
+ [fieldName]="
+ fieldName + '-' + property.internalName + '-' + i
+ "
+ [eventSchemas]="eventSchemas"
+ [staticProperty]="property"
+ [displayRecommended]="displayRecommended"
+ >
+ </sp-app-static-property>
+ }
+ </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.html
index 9df30d05e9..0cfcde78ec 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.html
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-oneof-input/static-runtime-resolvable-oneof-input.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div [formGroup]="parentForm" id="formWrapper" fxFlex="100" fxLayout="column">
<div>
@@ -31,41 +31,46 @@
<span>{{ 'Reload' | translate }}</span>
</button>
</div>
- <div fxLayout="column" *ngIf="error" class="mt-10">
- <sp-exception-message [message]="errorMessage"></sp-exception-message>
- </div>
- <div *ngIf="!loading" fxLayout="column">
- <div fxFlex fxLayout="row">
- <div
- fxLayout="column"
- *ngIf="showOptions || staticProperty.options"
- style="margin-left: 10px"
- >
- <mat-radio-button
- *ngFor="let option of staticProperty.options"
- (click)="select(option.elementId)"
- [attr.data-cy]="option.name"
- [checked]="option.selected"
- >
- <label style="font-weight: normal">
- {{ option.name }}
- </label>
- </mat-radio-button>
- </div>
- <div
- fxLayout="column"
- *ngIf="!showOptions && !loading"
- class="mt-10"
- >
- <span>{{ '(waiting for input)' | translate }}</span>
- </div>
- <div fxLayout="column" *ngIf="loading">
- <mat-spinner
- color="accent"
- [mode]="'indeterminate'"
- [diameter]="20"
- ></mat-spinner>
+ @if (error) {
+ <div fxLayout="column" class="mt-10">
+ <sp-exception-message
+ [message]="errorMessage"
+ ></sp-exception-message>
+ </div>
+ }
+ @if (!loading) {
+ <div fxLayout="column">
+ <div fxFlex fxLayout="row">
+ @if (showOptions || staticProperty.options) {
+ <div fxLayout="column" style="margin-left: 10px">
+ @for (option of staticProperty.options; track option) {
+ <mat-radio-button
+ (click)="select(option.elementId)"
+ [attr.data-cy]="option.name"
+ [checked]="option.selected"
+ >
+ <label style="font-weight: normal">
+ {{ option.name }}
+ </label>
+ </mat-radio-button>
+ }
+ </div>
+ }
+ @if (!showOptions && !loading) {
+ <div fxLayout="column" class="mt-10">
+ <span>{{ '(waiting for input)' | translate }}</span>
+ </div>
+ }
+ @if (loading) {
+ <div fxLayout="column">
+ <mat-spinner
+ color="accent"
+ [mode]="'indeterminate'"
+ [diameter]="20"
+ ></mat-spinner>
+ </div>
+ }
</div>
</div>
- </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-runtime-resolvable-tree-input.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-runtime-resolvable-tree-input.component.html
index a641ba547f..fb7e15cd3f 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-runtime-resolvable-tree-input.component.html
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-runtime-resolvable-tree-input.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div [formGroup]="parentForm" id="formWrapper" fxFlex="100" fxLayout="column">
<sp-static-tree-input-button-menu
[showOptions]="showOptions"
@@ -26,56 +26,54 @@
>
</sp-static-tree-input-button-menu>
- <div fxLayout="column" *ngIf="error" class="mt-10">
- <sp-exception-message [message]="errorMessage"></sp-exception-message>
- </div>
-
- <div
- fxLayout="row"
- fxLayoutGap="15px"
- data-cy="tree-editor"
- *ngIf="editorMode === 'tree'"
- >
- <div fxFlex="30" class="tree-input-section" fxLayout="column">
- <sp-static-tree-input-browse-nodes
- #staticTreeInputBrowseNodesComponent
- [staticProperty]="staticProperty"
- (showNodeDetailsEmitter)="showNodeDetails($event)"
- (loadOptionsFromRestApiEmitter)="loadOptionsFromRestApi($event)"
- (performValidationEmitter)="performValidation()"
- >
- </sp-static-tree-input-browse-nodes>
+ @if (error) {
+ <div fxLayout="column" class="mt-10">
+ <sp-exception-message
+ [message]="errorMessage"
+ ></sp-exception-message>
</div>
- <div fxFlex="40" class="tree-input-section" fxLayout="column">
- <sp-static-tree-input-node-details
- [nodeMetadata]="nodeDetails?.nodeMetadata"
- >
- </sp-static-tree-input-node-details>
+ }
+
+ @if (editorMode === 'tree') {
+ <div fxLayout="row" fxLayoutGap="15px" data-cy="tree-editor">
+ <div fxFlex="30" class="tree-input-section" fxLayout="column">
+ <sp-static-tree-input-browse-nodes
+ #staticTreeInputBrowseNodesComponent
+ [staticProperty]="staticProperty"
+ (showNodeDetailsEmitter)="showNodeDetails($event)"
+ (loadOptionsFromRestApiEmitter)="
+ loadOptionsFromRestApi($event)
+ "
+ (performValidationEmitter)="performValidation()"
+ >
+ </sp-static-tree-input-browse-nodes>
+ </div>
+ <div fxFlex="40" class="tree-input-section" fxLayout="column">
+ <sp-static-tree-input-node-details
+ [nodeMetadata]="nodeDetails?.nodeMetadata"
+ >
+ </sp-static-tree-input-node-details>
+ </div>
+ <div class="tree-input-section" fxLayout="column" fxFlex="30">
+ <sp-static-tree-input-selected-nodes
+ [selectedNodesInternalNames]="
+ staticProperty.selectedNodesInternalNames
+ "
+ (removeSelectedNode)="removeSelectedNode($event)"
+ >
+ </sp-static-tree-input-selected-nodes>
+ </div>
</div>
+ }
- <div class="tree-input-section" fxLayout="column" fxFlex="30">
- <sp-static-tree-input-selected-nodes
- [selectedNodesInternalNames]="
- staticProperty.selectedNodesInternalNames
- "
- (removeSelectedNode)="removeSelectedNode($event)"
+ @if (editorMode === 'text') {
+ <div fxLayout="row" fxFlex="100" class="mt-10" data-cy="text-editor">
+ <sp-static-tree-input-text-editor
+ fxFlex="100"
+ [staticProperty]="staticProperty"
+ (performValidationEmitter)="performValidation()"
>
- </sp-static-tree-input-selected-nodes>
+ </sp-static-tree-input-text-editor>
</div>
- </div>
-
- <div
- fxLayout="row"
- fxFlex="100"
- class="mt-10"
- data-cy="text-editor"
- *ngIf="editorMode === 'text'"
- >
- <sp-static-tree-input-text-editor
- fxFlex="100"
- [staticProperty]="staticProperty"
- (performValidationEmitter)="performValidation()"
- >
- </sp-static-tree-input-text-editor>
- </div>
+ }
</div>
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-browse-nodes/static-tree-input-browse-nodes.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-browse-nodes/static-tree-input-browse-nodes.component.html
index 071b995f72..927e341c39 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-browse-nodes/static-tree-input-browse-nodes.component.html
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-browse-nodes/static-tree-input-browse-nodes.component.html
@@ -27,8 +27,12 @@
color="accent"
(click)="largeView = !largeView"
>
- <mat-icon *ngIf="!largeView">open_in_full</mat-icon>
- <mat-icon *ngIf="largeView">close_fullscreen </mat-icon>
+ @if (!largeView) {
+ <mat-icon>open_in_full</mat-icon>
+ }
+ @if (largeView) {
+ <mat-icon>close_fullscreen </mat-icon>
+ }
</button>
</div>
</div>
@@ -47,94 +51,99 @@
[attr.data-cy]="'tree-node-' + node.nodeName"
>
<i class="material-icons color-primary pr-5">wifi</i>
- <i
- class="material-icons pr-5 icon-button"
- *ngIf="node.dataNode && !isNodeSelected(node)"
- (click)="addNode(node)"
- [attr.data-cy]="'select-' + node.nodeName"
- [matTooltip]="'Add node' | translate"
- >add_circle</i
- >
- <i
- class="material-icons pr-5 icon-button"
- *ngIf="node.dataNode && isNodeSelected(node)"
- (click)="removeNode(node)"
- [matTooltip]="'Remove node' | translate"
- >remove_circle</i
- >
- <i
- class="material-icons pr-5 icon-button"
- *ngIf="selectedNodeId !== node.internalNodeName"
- [attr.data-cy]="'show-node-details-' + node.nodeName"
- (click)="showNodeDetails(node)"
- [matTooltip]="'Show details' | translate"
- >visibility</i
- >
- <i
- class="material-icons pr-5 icon-button"
- *ngIf="selectedNodeId === node.internalNodeName"
- [attr.data-cy]="'hide-node-details-' + node.nodeName"
- (click)="hideNodeDetails()"
- [matTooltip]="'Show details' | translate"
- >visibility_off</i
- >
- <span class="pr-5">{{ node.nodeName }}</span>
- </div>
- </mat-tree-node>
- <mat-nested-tree-node *matTreeNodeDef="let node; when: hasChild">
- <div class="mat-tree-node">
- <button
- mat-icon-button
- matTreeNodeToggle
- [attr.data-cy]="'expand-' + node.nodeName"
- [attr.aria-label]="'Toggle ' + node.nodeName"
- (click)="loadChildren(node, tree.isExpanded(node))"
- >
- <mat-icon class="mat-icon-rtl-mirror">
- {{
- tree.isExpanded(node) ? 'expand_more' : 'chevron_right'
- }}
- </mat-icon>
- </button>
- <div fxLayoutAlign="start center">
- <i
- class="material-icons color-primary pr-5"
- *ngIf="!tree.isExpanded(node)"
- >folder</i
- >
+ @if (node.dataNode && !isNodeSelected(node)) {
<i
- class="material-icons color-primary pr-5"
- *ngIf="tree.isExpanded(node)"
- >folder_open</i
+ class="material-icons pr-5 icon-button"
+ (click)="addNode(node)"
+ [attr.data-cy]="'select-' + node.nodeName"
+ [matTooltip]="'Add node' | translate"
+ >add_circle</i
>
+ }
+ @if (node.dataNode && isNodeSelected(node)) {
<i
class="material-icons pr-5 icon-button"
- *ngIf="tree.isExpanded(node) && hasDataChildren(node)"
- [matTooltip]="'Add all direct children' | translate"
- (click)="addAllDirectChildren(node)"
- >add_circle</i
+ (click)="removeNode(node)"
+ [matTooltip]="'Remove node' | translate"
+ >remove_circle</i
>
+ }
+ @if (selectedNodeId !== node.internalNodeName) {
<i
class="material-icons pr-5 icon-button"
- *ngIf="selectedNodeId !== node.internalNodeName"
[attr.data-cy]="'show-node-details-' + node.nodeName"
(click)="showNodeDetails(node)"
[matTooltip]="'Show details' | translate"
>visibility</i
>
+ }
+ @if (selectedNodeId === node.internalNodeName) {
<i
class="material-icons pr-5 icon-button"
- *ngIf="selectedNodeId === node.internalNodeName"
[attr.data-cy]="'hide-node-details-' + node.nodeName"
(click)="hideNodeDetails()"
[matTooltip]="'Show details' | translate"
>visibility_off</i
>
+ }
+ <span class="pr-5">{{ node.nodeName }}</span>
+ </div>
+ </mat-tree-node>
+ <mat-nested-tree-node *matTreeNodeDef="let node; when: hasChild">
+ <div class="mat-tree-node">
+ <button
+ mat-icon-button
+ matTreeNodeToggle
+ [attr.data-cy]="'expand-' + node.nodeName"
+ [attr.aria-label]="'Toggle ' + node.nodeName"
+ (click)="loadChildren(node, tree.isExpanded(node))"
+ >
+ <mat-icon class="mat-icon-rtl-mirror">
+ {{
+ tree.isExpanded(node) ? 'expand_more' : 'chevron_right'
+ }}
+ </mat-icon>
+ </button>
+ <div fxLayoutAlign="start center">
+ @if (!tree.isExpanded(node)) {
+ <i class="material-icons color-primary pr-5">folder</i>
+ }
+ @if (tree.isExpanded(node)) {
+ <i class="material-icons color-primary pr-5">folder_open</i>
+ }
+ @if (tree.isExpanded(node) && hasDataChildren(node)) {
+ <i
+ class="material-icons pr-5 icon-button"
+ [matTooltip]="'Add all direct children' | translate"
+ (click)="addAllDirectChildren(node)"
+ >add_circle</i
+ >
+ }
+ @if (selectedNodeId !== node.internalNodeName) {
+ <i
+ class="material-icons pr-5 icon-button"
+ [attr.data-cy]="'show-node-details-' + node.nodeName"
+ (click)="showNodeDetails(node)"
+ [matTooltip]="'Show details' | translate"
+ >visibility</i
+ >
+ }
+ @if (selectedNodeId === node.internalNodeName) {
+ <i
+ class="material-icons pr-5 icon-button"
+ [attr.data-cy]="'hide-node-details-' + node.nodeName"
+ (click)="hideNodeDetails()"
+ [matTooltip]="'Show details' | translate"
+ >visibility_off</i
+ >
+ }
<span class="node-name pr-5"> {{ node.nodeName }}</span>
</div>
</div>
- <div *ngIf="tree.isExpanded(node)" role="group">
- <ng-container matTreeNodeOutlet></ng-container>
- </div>
+ @if (tree.isExpanded(node)) {
+ <div role="group">
+ <ng-container matTreeNodeOutlet></ng-container>
+ </div>
+ }
</mat-nested-tree-node>
</mat-tree>
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-button-menu/static-tree-input-button-menu.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-button-menu/static-tree-input-button-menu.component.html
index 987cf887e7..b61424e820 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-button-menu/static-tree-input-button-menu.component.html
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-button-menu/static-tree-input-button-menu.component.html
@@ -1,62 +1,65 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="start center">
<div fxLayoutAlign="start center">
- <button
- mat-flat-button
- color="accent"
- class="small-button"
- (click)="onResetOptionsAndReload()"
- style="margin-right: 10px"
- *ngIf="editorMode === 'tree'"
- [disabled]="!showOptions"
- data-cy="clear-tree-node-selection"
- >
- <span>{{ 'Clear selection & reload' | translate }}</span>
- </button>
- <button
- mat-flat-button
- color="accent"
- class="small-button"
- (click)="onReload()"
- style="margin-right: 10px"
- *ngIf="editorMode === 'tree'"
- [disabled]="!showOptions"
- data-cy="reload-tree-node-selection-btn"
- >
- <span>{{ 'Reload' | translate }}</span>
- </button>
- </div>
- <div
- fxLayout="row"
- *ngIf="loading && editorMode === 'tree'"
- fxLayoutAlign="start center"
- data-cy="reloading-nodes"
- >
- <mat-spinner
- color="accent"
- [mode]="'indeterminate'"
- [diameter]="15"
- ></mat-spinner>
- <span class="reloading-nodes-label">{{
- 'Reloading nodes' | translate
- }}</span>
+ @if (editorMode === 'tree') {
+ <button
+ mat-flat-button
+ color="accent"
+ class="small-button"
+ (click)="onResetOptionsAndReload()"
+ style="margin-right: 10px"
+ [disabled]="!showOptions"
+ data-cy="clear-tree-node-selection"
+ >
+ <span>{{ 'Clear selection & reload' | translate }}</span>
+ </button>
+ }
+ @if (editorMode === 'tree') {
+ <button
+ mat-flat-button
+ color="accent"
+ class="small-button"
+ (click)="onReload()"
+ style="margin-right: 10px"
+ [disabled]="!showOptions"
+ data-cy="reload-tree-node-selection-btn"
+ >
+ <span>{{ 'Reload' | translate }}</span>
+ </button>
+ }
</div>
+ @if (loading && editorMode === 'tree') {
+ <div
+ fxLayout="row"
+ fxLayoutAlign="start center"
+ data-cy="reloading-nodes"
+ >
+ <mat-spinner
+ color="accent"
+ [mode]="'indeterminate'"
+ [diameter]="15"
+ ></mat-spinner>
+ <span class="reloading-nodes-label">{{
+ 'Reloading nodes' | translate
+ }}</span>
+ </div>
+ }
<div fxFlex fxLayoutAlign="end center">
<mat-button-toggle-group
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-node-details/static-tree-input-node-details.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-node-details/static-tree-input-node-details.component.html
index 002844c23e..e5e97d892a 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-node-details/static-tree-input-node-details.component.html
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-node-details/static-tree-input-node-details.component.html
@@ -1,29 +1,30 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div class="tree-input-header" fxLayoutAlign="start center">
<b>{{ 'Node Details' | translate }}</b>
</div>
-<div
- class="node-metadata"
- *ngFor="let metadata of nodeMetadata | keyvalue"
- fxLayout="row"
- [attr.data-cy]="'node-details-metadata-row-' + metadata.key"
->
- <div fxFlex="30">{{ metadata.key }}</div>
- <div fxFlex="70">{{ metadata.value }}</div>
-</div>
+@for (metadata of nodeMetadata | keyvalue; track metadata) {
+ <div
+ class="node-metadata"
+ fxLayout="row"
+ [attr.data-cy]="'node-details-metadata-row-' + metadata.key"
+ >
+ <div fxFlex="30">{{ metadata.key }}</div>
+ <div fxFlex="70">{{ metadata.value }}</div>
+ </div>
+}
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-selected-nodes/static-tree-input-selected-nodes.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-selected-nodes/static-tree-input-selected-nodes.component.html
index e8631b27a6..112c9f5a07 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-selected-nodes/static-tree-input-selected-nodes.component.html
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-selected-nodes/static-tree-input-selected-nodes.component.html
@@ -1,40 +1,42 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div class="tree-input-header" fxLayoutAlign="start center">
<b>{{ 'Selected Nodes' | translate }}</b>
</div>
-<div *ngFor="let selectedNodeName of selectedNodesInternalNames">
- <div
- class="selected-node"
- fxLayout="row"
- fxLayoutAlign="start center"
- [attr.data-cy]="'selected-node-' + selectedNodeName"
- >
- <span fxFlex>{{ selectedNodeName }}</span>
- <div fxLayoutAlign="end center">
- <button
- mat-icon-button
- color="accent"
- [attr.data-cy]="'remove-' + selectedNodeName"
- (click)="onRemoveSelectedNode(selectedNodeName)"
- >
- <i class="material-icons">remove</i>
- </button>
+@for (selectedNodeName of selectedNodesInternalNames; track selectedNodeName) {
+ <div>
+ <div
+ class="selected-node"
+ fxLayout="row"
+ fxLayoutAlign="start center"
+ [attr.data-cy]="'selected-node-' + selectedNodeName"
+ >
+ <span fxFlex>{{ selectedNodeName }}</span>
+ <div fxLayoutAlign="end center">
+ <button
+ mat-icon-button
+ color="accent"
+ [attr.data-cy]="'remove-' + selectedNodeName"
+ (click)="onRemoveSelectedNode(selectedNodeName)"
+ >
+ <i class="material-icons">remove</i>
+ </button>
+ </div>
</div>
</div>
-</div>
+}
diff --git a/ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.html b/ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.html
index 9dc1d8a106..1e7a0430d0 100644
--- a/ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.html
+++ b/ui/src/app/core-ui/static-properties/static-secret-input/static-secret-input.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div [formGroup]="parentForm" id="formWrapper" fxFlex="100" fxLayout="column">
<div fxFlex="100" fxLayout="row">
@@ -30,9 +30,11 @@
(blur)="emitUpdate()"
/>
- <mat-error *ngIf="!fieldValid">
- {{ errorMessage }}
- </mat-error>
+ @if (!fieldValid) {
+ <mat-error>
+ {{ errorMessage }}
+ </mat-error>
+ }
</mat-form-field>
</div>
</div>
diff --git a/ui/src/app/core-ui/topics/topics.component.html b/ui/src/app/core-ui/topics/topics.component.html
index 6853a148b8..2049431b8a 100644
--- a/ui/src/app/core-ui/topics/topics.component.html
+++ b/ui/src/app/core-ui/topics/topics.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div class="sp-dialog-container">
<div class="sp-dialog-content p-15" fxLayout="column">
@@ -39,164 +39,196 @@
[selectedIndex]="selectedTabIndex"
(selectedIndexChange)="selectedTabIndex = $event"
>
- <mat-tab *ngFor="let tab of tabs" [label]="tab"></mat-tab>
+ @for (tab of tabs; track tab) {
+ <mat-tab [label]="tab"></mat-tab>
+ }
</mat-tab-group>
- <div *ngIf="selectedTabIndex === 0">
- <ng-container *ngIf="isSpDataStream()">
- <table
- mat-table
- [dataSource]="
- pipelineElement?.eventGrounding?.transportProtocols
- "
- >
- <ng-container matColumnDef="outputTopics">
- <th mat-header-cell *matHeaderCellDef>
- <strong>{{ 'Output Topics' | translate }}</strong>
- </th>
- <td mat-cell *matCellDef="let element">
- <div
- fxLayout="row"
- fxLayoutAlign="space-between center"
- >
- <span>{{
- element?.topicDefinition?.actualTopicName
- }}</span>
- <button
- mat-icon-button
- [cdkCopyToClipboard]="
- element.topicDefinition.actualTopicName
- "
- [matTooltip]="'Copy' | translate"
+ @if (selectedTabIndex === 0) {
+ <div>
+ @if (isSpDataStream()) {
+ <table
+ mat-table
+ [dataSource]="
+ pipelineElement?.eventGrounding?.transportProtocols
+ "
+ >
+ <ng-container matColumnDef="outputTopics">
+ <th mat-header-cell *matHeaderCellDef>
+ <strong>{{
+ 'Output Topics' | translate
+ }}</strong>
+ </th>
+ <td mat-cell *matCellDef="let element">
+ <div
+ fxLayout="row"
+ fxLayoutAlign="space-between center"
>
- <mat-icon>content_copy</mat-icon>
- </button>
- </div>
- </td>
- </ng-container>
- <tr mat-header-row *matHeaderRowDef="['outputTopics']"></tr>
- <tr
- mat-row
- *matRowDef="let row; columns: ['outputTopics']"
- ></tr>
- </table>
- </ng-container>
-
- <ng-container *ngIf="isDataProcessorInvocation()">
- <table mat-table [dataSource]="pipelineElement?.inputStreams">
- <ng-container matColumnDef="inputTopics">
- <th mat-header-cell *matHeaderCellDef>
- <strong>{{ 'Input Topics' | translate }}</strong>
- </th>
- <td mat-cell *matCellDef="let element">
- <div
- fxLayout="row"
- fxLayoutAlign="space-between center"
- >
- <span>{{
- element?.eventGrounding
- ?.transportProtocols?.[0]
- ?.topicDefinition?.actualTopicName
- }}</span>
- <button
- mat-icon-button
- [cdkCopyToClipboard]="
+ <span>{{
+ element?.topicDefinition
+ ?.actualTopicName
+ }}</span>
+ <button
+ mat-icon-button
+ [cdkCopyToClipboard]="
+ element.topicDefinition
+ .actualTopicName
+ "
+ [matTooltip]="'Copy' | translate"
+ >
+ <mat-icon>content_copy</mat-icon>
+ </button>
+ </div>
+ </td>
+ </ng-container>
+ <tr
+ mat-header-row
+ *matHeaderRowDef="['outputTopics']"
+ ></tr>
+ <tr
+ mat-row
+ *matRowDef="let row; columns: ['outputTopics']"
+ ></tr>
+ </table>
+ }
+ @if (isDataProcessorInvocation()) {
+ <table
+ mat-table
+ [dataSource]="pipelineElement?.inputStreams"
+ >
+ <ng-container matColumnDef="inputTopics">
+ <th mat-header-cell *matHeaderCellDef>
+ <strong>{{
+ 'Input Topics' | translate
+ }}</strong>
+ </th>
+ <td mat-cell *matCellDef="let element">
+ <div
+ fxLayout="row"
+ fxLayoutAlign="space-between center"
+ >
+ <span>{{
element?.eventGrounding
?.transportProtocols?.[0]
?.topicDefinition?.actualTopicName
- "
- [matTooltip]="'Copy' | translate"
+ }}</span>
+ <button
+ mat-icon-button
+ [cdkCopyToClipboard]="
+ element?.eventGrounding
+ ?.transportProtocols?.[0]
+ ?.topicDefinition
+ ?.actualTopicName
+ "
+ [matTooltip]="'Copy' | translate"
+ >
+ <mat-icon>content_copy</mat-icon>
+ </button>
+ </div>
+ </td>
+ </ng-container>
+ <tr
+ mat-header-row
+ *matHeaderRowDef="['inputTopics']"
+ ></tr>
+ <tr
+ mat-row
+ *matRowDef="let row; columns: ['inputTopics']"
+ ></tr>
+ </table>
+ <table
+ mat-table
+ [dataSource]="
+ pipelineElement?.outputStream?.eventGrounding
+ ?.transportProtocols
+ "
+ >
+ <ng-container matColumnDef="outputTopics">
+ <th mat-header-cell *matHeaderCellDef>
+ <strong>{{
+ 'Output Topics' | translate
+ }}</strong>
+ </th>
+ <td mat-cell *matCellDef="let element">
+ <div
+ fxLayout="row"
+ fxLayoutAlign="space-between center"
>
- <mat-icon>content_copy</mat-icon>
- </button>
- </div>
- </td>
- </ng-container>
- <tr mat-header-row *matHeaderRowDef="['inputTopics']"></tr>
- <tr
- mat-row
- *matRowDef="let row; columns: ['inputTopics']"
- ></tr>
- </table>
-
- <table
- mat-table
- [dataSource]="
- pipelineElement?.outputStream?.eventGrounding
- ?.transportProtocols
- "
- >
- <ng-container matColumnDef="outputTopics">
- <th mat-header-cell *matHeaderCellDef>
- <strong>{{ 'Output Topics' | translate }}</strong>
- </th>
- <td mat-cell *matCellDef="let element">
- <div
- fxLayout="row"
- fxLayoutAlign="space-between center"
- >
- <span>{{
- element?.topicDefinition?.actualTopicName
- }}</span>
- <button
- mat-icon-button
- [cdkCopyToClipboard]="
+ <span>{{
element?.topicDefinition
?.actualTopicName
- "
- [matTooltip]="'Copy' | translate"
+ }}</span>
+ <button
+ mat-icon-button
+ [cdkCopyToClipboard]="
+ element?.topicDefinition
+ ?.actualTopicName
+ "
+ [matTooltip]="'Copy' | translate"
+ >
+ <mat-icon>content_copy</mat-icon>
+ </button>
+ </div>
+ </td>
+ </ng-container>
+ <tr
+ mat-header-row
+ *matHeaderRowDef="['outputTopics']"
+ ></tr>
+ <tr
+ mat-row
+ *matRowDef="let row; columns: ['outputTopics']"
+ ></tr>
+ </table>
+ }
+ @if (isDataSinkInvocation()) {
+ <table
+ mat-table
+ [dataSource]="pipelineElement?.inputStreams"
+ >
+ <ng-container matColumnDef="inputTopics">
+ <th mat-header-cell *matHeaderCellDef>
+ <strong>{{
+ 'Input Topics' | translate
+ }}</strong>
+ </th>
+ <td mat-cell *matCellDef="let element">
+ <div
+ fxLayout="row"
+ fxLayoutAlign="space-between center"
>
- <mat-icon>content_copy</mat-icon>
- </button>
- </div>
- </td>
- </ng-container>
- <tr mat-header-row *matHeaderRowDef="['outputTopics']"></tr>
- <tr
- mat-row
- *matRowDef="let row; columns: ['outputTopics']"
- ></tr>
- </table>
- </ng-container>
-
- <ng-container *ngIf="isDataSinkInvocation()">
- <table mat-table [dataSource]="pipelineElement?.inputStreams">
- <ng-container matColumnDef="inputTopics">
- <th mat-header-cell *matHeaderCellDef>
- <strong>{{ 'Input Topics' | translate }}</strong>
- </th>
- <td mat-cell *matCellDef="let element">
- <div
- fxLayout="row"
- fxLayoutAlign="space-between center"
- >
- <span>{{
- element?.eventGrounding
- ?.transportProtocols?.[0]
- ?.topicDefinition?.actualTopicName
- }}</span>
- <button
- mat-icon-button
- [cdkCopyToClipboard]="
+ <span>{{
element?.eventGrounding
?.transportProtocols?.[0]
?.topicDefinition?.actualTopicName
- "
- [matTooltip]="'Copy' | translate"
- >
- <mat-icon>content_copy</mat-icon>
- </button>
- </div>
- </td>
- </ng-container>
- <tr mat-header-row *matHeaderRowDef="['inputTopics']"></tr>
- <tr
- mat-row
- *matRowDef="let row; columns: ['inputTopics']"
- ></tr>
- </table>
- </ng-container>
- </div>
+ }}</span>
+ <button
+ mat-icon-button
+ [cdkCopyToClipboard]="
+ element?.eventGrounding
+ ?.transportProtocols?.[0]
+ ?.topicDefinition
+ ?.actualTopicName
+ "
+ [matTooltip]="'Copy' | translate"
+ >
+ <mat-icon>content_copy</mat-icon>
+ </button>
+ </div>
+ </td>
+ </ng-container>
+ <tr
+ mat-header-row
+ *matHeaderRowDef="['inputTopics']"
+ ></tr>
+ <tr
+ mat-row
+ *matRowDef="let row; columns: ['inputTopics']"
+ ></tr>
+ </table>
+ }
+ </div>
+ }
</div>
<mat-divider></mat-divider>
diff --git a/ui/src/app/core/components/breadcrumb/breadcrumb.component.html b/ui/src/app/core/components/breadcrumb/breadcrumb.component.html
index 561b55af9f..93680319af 100644
--- a/ui/src/app/core/components/breadcrumb/breadcrumb.component.html
+++ b/ui/src/app/core/components/breadcrumb/breadcrumb.component.html
@@ -1,20 +1,20 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<div
fxLayout="column"
@@ -34,20 +34,18 @@
>
<div> Home</div>
</div>
- <div
- *ngFor="let bcItem of currentNavItems"
- fxLayout="row"
- fxLayoutAlign="start center"
- >
- <mat-icon fxLayoutAlign="start center" class="divider mat-hint"
- >arrow_right</mat-icon
- >
- <div
- [ngClass]="bcItem.link ? 'bc-item' : 'mat-hint'"
- (click)="navigateTo(bcItem.link)"
- >
- {{ bcItem.label }}
+ @for (bcItem of currentNavItems; track bcItem) {
+ <div fxLayout="row" fxLayoutAlign="start center">
+ <mat-icon fxLayoutAlign="start center" class="divider mat-hint"
+ >arrow_right</mat-icon
+ >
+ <div
+ [ngClass]="bcItem.link ? 'bc-item' : 'mat-hint'"
+ (click)="navigateTo(bcItem.link)"
+ >
+ {{ bcItem.label }}
+ </div>
</div>
- </div>
+ }
</div>
</div>
diff --git a/ui/src/app/core/components/toolbar/toolbar.component.html b/ui/src/app/core/components/toolbar/toolbar.component.html
index dd5f8ff0fe..9e5dfac4e5 100644
--- a/ui/src/app/core/components/toolbar/toolbar.component.html
+++ b/ui/src/app/core/components/toolbar/toolbar.component.html
@@ -1,157 +1,162 @@
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- ~
- -->
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements. See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~
+-->
<mat-toolbar class="md-primary md-hue-2 toolbar">
<div class="md-toolbar-tools sp-toolbar">
<div fxFlex="100" fxLayout fxLayoutAlign="start center">
<sp-breadcrumb></sp-breadcrumb>
- <div
- fxFlex
- fxLayout
- fxLayoutAlign="end center"
- *ngIf="authenticated"
- fxLayoutGap="10px"
- style="height: 100%"
- >
- <!-- uncomment this to quickly investigate layout issues between dark and light mode -->
- <!-- <div>-->
- <!-- <mat-slide-toggle-->
- <!-- color="accent"-->
- <!-- [formControl]="appearanceControl"-->
- <!-- >Dark Mode</mat-slide-toggle-->
- <!-- >-->
- <!-- </div>-->
- <sp-asset-browser-toolbar> </sp-asset-browser-toolbar>
+ @if (authenticated) {
<div
- [ngClass]="
- 'notifications' === activePage
- ? 'sp-navbar-item-selected'
- : 'sp-navbar-item'
- "
- *ngIf="notificationsVisible"
- class="h-100"
+ fxFlex
+ fxLayout
+ fxLayoutAlign="end center"
+ fxLayoutGap="10px"
+ style="height: 100%"
>
- <button
- mat-icon-button
- class="md-icon-button button-margin-iconbar iconbar-size"
- (click)="go('notifications')"
- fxLayout
- fxLayoutAlign="center center"
- matTooltip="Notifications"
- matTooltipPosition="below"
- >
- <mat-icon
- [matBadge]="unreadNotificationCount"
- matBadgeColor="accent"
- matBadgePosition="below after"
- [matBadgeHidden]="unreadNotificationCount === 0"
+ <!-- uncomment this to quickly investigate layout issues between dark and light mode -->
+ <!-- <div>-->
+ <!-- <mat-slide-toggle-->
+ <!-- color="accent"-->
+ <!-- [formControl]="appearanceControl"-->
+ <!-- >Dark Mode</mat-slide-toggle-->
+ <!-- >-->
+ <!-- </div>-->
+ <sp-asset-browser-toolbar> </sp-asset-browser-toolbar>
+ @if (notificationsVisible) {
+ <div
[ngClass]="
'notifications' === activePage
- ? 'sp-navbar-icon-selected'
- : 'sp-navbar-icon'
+ ? 'sp-navbar-item-selected'
+ : 'sp-navbar-item'
"
- data-cy="navigation-icon"
- >notifications
- </mat-icon>
- </button>
- </div>
- <div style="height: 100%">
- <div
- [ngClass]="
- accountMenuOpen.menuOpen
- ? 'sp-navbar-item-selected'
- : 'sp-navbar-item'
- "
- fxLayout
- fxLayoutAlign="center center"
- style="height: 100%"
- >
- <button
- mat-icon-button
- fxLayout
- fxLayoutAlign="center center"
- [class.sp-navbar-icon-button-selected]="
+ class="h-100"
+ >
+ <button
+ mat-icon-button
+ class="md-icon-button button-margin-iconbar iconbar-size"
+ (click)="go('notifications')"
+ fxLayout
+ fxLayoutAlign="center center"
+ matTooltip="Notifications"
+ matTooltipPosition="below"
+ >
+ <mat-icon
+ [matBadge]="unreadNotificationCount"
+ matBadgeColor="accent"
+ matBadgePosition="below after"
+ [matBadgeHidden]="
+ unreadNotificationCount === 0
+ "
+ [ngClass]="
+ 'notifications' === activePage
+ ? 'sp-navbar-icon-selected'
+ : 'sp-navbar-icon'
+ "
+ data-cy="navigation-icon"
+ >notifications
+ </mat-icon>
+ </button>
+ </div>
+ }
+ <div style="height: 100%">
+ <div
+ [ngClass]="
accountMenuOpen.menuOpen
+ ? 'sp-navbar-item-selected'
+ : 'sp-navbar-item'
"
- style="min-width: 0"
- [matMenuTriggerFor]="menu"
- #accountMenuOpen="matMenuTrigger"
- matTooltip="User Preferences"
- matTooltipPosition="below"
- data-cy="sp-user-preferences"
+ fxLayout
+ fxLayoutAlign="center center"
+ style="height: 100%"
>
- <mat-icon
- class="sp-navbar-icon"
- [class.sp-navbar-icon-selected]="
- accountMenuOpen
+ <button
+ mat-icon-button
+ fxLayout
+ fxLayoutAlign="center center"
+ [class.sp-navbar-icon-button-selected]="
+ accountMenuOpen.menuOpen
"
- >account_circle</mat-icon
+ style="min-width: 0"
+ [matMenuTriggerFor]="menu"
+ #accountMenuOpen="matMenuTrigger"
+ matTooltip="User Preferences"
+ matTooltipPosition="below"
+ data-cy="sp-user-preferences"
>
- </button>
- </div>
- </div>
- <mat-menu #menu="matMenu" id="account" class="toolbar-menu">
- <div class="current-user">
- <span class="user-email">{{
- userEmail | shorten: 30
- }}</span>
+ <mat-icon
+ class="sp-navbar-icon"
+ [class.sp-navbar-icon-selected]="
+ accountMenuOpen
+ "
+ >account_circle</mat-icon
+ >
+ </button>
+ </div>
</div>
- <mat-divider></mat-divider>
- <button
- mat-menu-item
- (click)="openProfile()"
- style="min-width: 0px"
- >
- <mat-icon aria-label="Info">perm_identity</mat-icon>
- Profile
- </button>
- <button
- mat-menu-item
- (click)="openInfo()"
- style="min-width: 0px"
- >
- <mat-icon aria-label="Info">help</mat-icon>
- Info
- </button>
- <button
- *ngIf="documentationLinkActive"
- mat-menu-item
- (click)="openDocumentation()"
- style="min-width: 0px"
- >
- <mat-icon aria-label="Documentation"
- >description</mat-icon
+ <mat-menu #menu="matMenu" id="account" class="toolbar-menu">
+ <div class="current-user">
+ <span class="user-email">{{
+ userEmail | shorten: 30
+ }}</span>
+ </div>
+ <mat-divider></mat-divider>
+ <button
+ mat-menu-item
+ (click)="openProfile()"
+ style="min-width: 0px"
+ >
+ <mat-icon aria-label="Info">perm_identity</mat-icon>
+ Profile
+ </button>
+ <button
+ mat-menu-item
+ (click)="openInfo()"
+ style="min-width: 0px"
>
- Documentation
- </button>
- <mat-divider></mat-divider>
- <button
- mat-menu-item
- id="sp_logout"
- (click)="logout()"
- style="min-width: 0px"
- data-cy="sp-logout"
- >
- <mat-icon aria-label="Logout">exit_to_app</mat-icon>
- Logout
- </button>
- </mat-menu>
- </div>
+ <mat-icon aria-label="Info">help</mat-icon>
+ Info
+ </button>
+ @if (documentationLinkActive) {
+ <button
+ mat-menu-item
+ (click)="openDocumentation()"
+ style="min-width: 0px"
+ >
+ <mat-icon aria-label="Documentation"
+ >description</mat-icon
+ >
+ Documentation
+ </button>
+ }
+ <mat-divider></mat-divider>
+ <button
+ mat-menu-item
+ id="sp_logout"
+ (click)="logout()"
+ style="min-width: 0px"
+ data-cy="sp-logout"
+ >
+ <mat-icon aria-label="Logout">exit_to_app</mat-icon>
+ Logout
+ </button>
+ </mat-menu>
+ </div>
+ }
</div>
</div>
</mat-toolbar>