Skip to content

refactor: Migrate editor to control flow syntax #3997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

refactor: Migrate editor to control flow syntax #3997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 67 additions & 63 deletions ...app/editor/components/output-strategy/custom-output/custom-output-strategy.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
<div fxFlex="100" fxLayout="row" fxLayoutAlign="start center" class="mb-10">
<h5 style="margin-right: 10px">
Expand All @@ -39,58 +39,62 @@ <h5 style="margin-right: 10px">
{{ 'Select none' | translate }}
</button>
</div>
<div *ngFor="let property of collectedPropertiesFirstStream; let i = index">
<sp-property-selection
(validateForm)="checkFormValidity()"
[outputStrategy]="outputStrategy"
[eventProperty]="property"
[layer]="0"
[restrictedEditMode]="restrictedEditMode"
></sp-property-selection>
</div>
<div
fxLayout="column"
fxFlex="100"
class="mt-10"
*ngIf="collectedPropertiesSecondStream.length > 0"
>
<div fxFlex="100" fxLayout="row" fxLayoutAlign="start center">
<h5 style="margin-right: 10px">
{{ selectedElement.inputStreams[1].name }}
</h5>
<button
mat-button
mat-flat-button
color="accent"
class="small-button"
(click)="selectAll(collectedPropertiesSecondStream)"
style="margin-right: 10px; margin-left: 10px"
[disabled]="restrictedEditMode"
>
Select all
</button>
<button
mat-button
mat-flat-button
class="mat-basic small-button"
(click)="deselectAll(collectedPropertiesSecondStream)"
[disabled]="restrictedEditMode"
>
Select none
</button>
</div>
<div
*ngFor="
let property of collectedPropertiesSecondStream;
let i = index
"
>
@for (
property of collectedPropertiesFirstStream;
track property;
let i = $index
) {
<div>
<sp-property-selection
(validateForm)="checkFormValidity()"
[outputStrategy]="outputStrategy"
[eventProperty]="property"
[layer]="0"
[restrictedEditMode]="restrictedEditMode"
></sp-property-selection>
</div>
</div>
}
@if (collectedPropertiesSecondStream.length > 0) {
<div fxLayout="column" fxFlex="100" class="mt-10">
<div fxFlex="100" fxLayout="row" fxLayoutAlign="start center">
<h5 style="margin-right: 10px">
{{ selectedElement.inputStreams[1].name }}
</h5>
<button
mat-button
mat-flat-button
color="accent"
class="small-button"
(click)="selectAll(collectedPropertiesSecondStream)"
style="margin-right: 10px; margin-left: 10px"
[disabled]="restrictedEditMode"
>
Select all
</button>
<button
mat-button
mat-flat-button
class="mat-basic small-button"
(click)="deselectAll(collectedPropertiesSecondStream)"
[disabled]="restrictedEditMode"
>
Select none
</button>
</div>
@for (
property of collectedPropertiesSecondStream;
track property;
let i = $index
) {
<div>
<sp-property-selection
[outputStrategy]="outputStrategy"
[eventProperty]="property"
[layer]="0"
[restrictedEditMode]="restrictedEditMode"
></sp-property-selection>
</div>
}
</div>
}
</div>
96 changes: 48 additions & 48 deletions ui/src/app/editor/components/output-strategy/output-strategy.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
<!--
~ 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" *ngIf="customizableOutputStrategy">
<div fxFlex="100" fxLayout="column" class="static-property-panel">
<div fxFlex="100" fxLayout="column">
<b>{{ 'Select output fields' | translate }}</b>
</div>
<div fxFlex="100">
<div
class="customize-item-content"
*ngIf="
@if (customizableOutputStrategy) {
<div fxFlex="100" fxLayout="column">
<div fxFlex="100" fxLayout="column" class="static-property-panel">
<div fxFlex="100" fxLayout="column">
<b>{{ 'Select output fields' | translate }}</b>
</div>
<div fxFlex="100">
@if (
outputStrategy['@class'] ===
'org.apache.streampipes.model.output.CustomOutputStrategy'
"
>
<sp-custom-output-strategy
[outputStrategy]="outputStrategy"
[selectedElement]="selectedElement"
[parentForm]="parentForm"
[restrictedEditMode]="restrictedEditMode"
>
</sp-custom-output-strategy>
</div>
<div
class="customize-item-content"
*ngIf="
) {
<div class="customize-item-content">
<sp-custom-output-strategy
[outputStrategy]="outputStrategy"
[selectedElement]="selectedElement"
[parentForm]="parentForm"
[restrictedEditMode]="restrictedEditMode"
>
</sp-custom-output-strategy>
</div>
}
@if (
outputStrategy['@class'] ===
'org.apache.streampipes.model.output.UserDefinedOutputStrategy'
"
>
<sp-user-defined-output-strategy
[outputStrategy]="outputStrategy"
[selectedElement]="selectedElement"
[parentForm]="parentForm"
[restrictedEditMode]="restrictedEditMode"
>
</sp-user-defined-output-strategy>
) {
<div class="customize-item-content">
<sp-user-defined-output-strategy
[outputStrategy]="outputStrategy"
[selectedElement]="selectedElement"
[parentForm]="parentForm"
[restrictedEditMode]="restrictedEditMode"
>
</sp-user-defined-output-strategy>
</div>
}
</div>
</div>
</div>
</div>
}
85 changes: 48 additions & 37 deletions ...pp/editor/components/output-strategy/property-selection/property-selection.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="property-selection" style="margin-left:{{ layer * 5 }}%">
<div fxLayout="row">
Expand All @@ -27,28 +27,39 @@
>
</mat-checkbox>
<div>
<div *ngIf="eventProperty.label">
<b>{{ eventProperty.label }}</b
><br />
<mat-hint class="description"
>{{ eventProperty.description }}, field name:
{{ eventProperty.runtimeName }}</mat-hint
>
<br />
</div>
<div *ngIf="!eventProperty.label">
<b>{{ eventProperty.runtimeName }}</b
><br />
</div>
@if (eventProperty.label) {
<div>
<b>{{ eventProperty.label }}</b
><br />
<mat-hint class="description"
>{{ eventProperty.description }}, field name:
{{ eventProperty.runtimeName }}</mat-hint
>
<br />
</div>
}
@if (!eventProperty.label) {
<div>
<b>{{ eventProperty.runtimeName }}</b
><br />
</div>
}
</div>
</div>
</div>
<div *ngIf="isNestedProperty">
<div *ngFor="let nestedProperty of eventProperty.eventProperties">
<sp-property-selection
[outputStrategy]="outputStrategy"
[eventProperty]="nestedProperty"
[layer]="layer + 1"
></sp-property-selection>
@if (isNestedProperty) {
<div>
@for (
nestedProperty of eventProperty.eventProperties;
track nestedProperty
) {
<div>
<sp-property-selection
[outputStrategy]="outputStrategy"
[eventProperty]="nestedProperty"
[layer]="layer + 1"
></sp-property-selection>
</div>
}
</div>
</div>
}
Loading
Loading