This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 2c3b070acb fix(#4110): Add missing warnings for adapter configuration
changes during edit (#4124)
2c3b070acb is described below
commit 2c3b070acb6805beb9aedc29f4da019adf767fe6
Author: Philipp Zehnder <[email protected]>
AuthorDate: Fri Jan 23 10:03:19 2026 +0100
fix(#4110): Add missing warnings for adapter configuration changes during
edit (#4124)
---
ui/cypress/tests/connect/editAdapter.smoke.spec.ts | 9 +++++++++
.../tests/connect/editAdapterSettingsAndPipeline.smoke.spec.ts | 6 ++++++
.../tests/connect/opcua/startAndEditOpcAdapters.smoke.spec.ts | 6 ++++++
.../adapter-configuration-state.service.ts | 6 +++++-
.../adapter-settings/adapter-settings.component.ts | 2 --
5 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/ui/cypress/tests/connect/editAdapter.smoke.spec.ts
b/ui/cypress/tests/connect/editAdapter.smoke.spec.ts
index 0edec29055..5ed3c44c19 100644
--- a/ui/cypress/tests/connect/editAdapter.smoke.spec.ts
+++ b/ui/cypress/tests/connect/editAdapter.smoke.spec.ts
@@ -22,6 +22,8 @@ import { AdapterBuilder } from
'../../support/builder/AdapterBuilder';
import { ConnectEventSchemaUtils } from
'../../support/utils/connect/ConnectEventSchemaUtils';
import { DataExplorerUtils } from
'../../support/utils/dataExplorer/DataExplorerUtils';
import { DataExplorerBtns } from
'../../support/utils/dataExplorer/DataExplorerBtns';
+import { SharedUtils } from '../../support/utils/shared/SharedUtils';
+import { SharedBtns } from '../../support/utils/shared/SharedBtns';
describe('Test Edit Adapter', () => {
beforeEach('Setup Test', () => {
@@ -54,10 +56,14 @@ describe('Test Edit Adapter', () => {
.build();
ConnectUtils.configureAdapter(newUserConfiguration);
+ SharedUtils.confirmDialogVisible();
+ SharedBtns.confirmDialogConfirmBtn().click();
// Update event schema
ConnectBtns.getNewSampleBtn().click();
ConnectUtils.finishEventSchemaConfiguration();
+ SharedUtils.confirmDialogVisible();
+ SharedBtns.confirmDialogConfirmBtn().click();
cy.wait(1000);
ConnectBtns.refreshSchemaBtn().click();
@@ -102,6 +108,9 @@ describe('Test Edit Adapter', () => {
cy.wait(1000);
ConnectBtns.configureSchemaNextBtn().click();
+ SharedUtils.confirmDialogVisible();
+ SharedBtns.confirmDialogConfirmBtn().click();
+ ConnectEventSchemaUtils.markPropertyAsTimestamp('timestamp');
storeAndStartEditedAdapter();
diff --git
a/ui/cypress/tests/connect/editAdapterSettingsAndPipeline.smoke.spec.ts
b/ui/cypress/tests/connect/editAdapterSettingsAndPipeline.smoke.spec.ts
index 1e294722ec..4ab10beba1 100644
--- a/ui/cypress/tests/connect/editAdapterSettingsAndPipeline.smoke.spec.ts
+++ b/ui/cypress/tests/connect/editAdapterSettingsAndPipeline.smoke.spec.ts
@@ -26,6 +26,8 @@ import { DataExplorerUtils } from
'../../support/utils/dataExplorer/DataExplorer
import { GeneralUtils } from '../../support/utils/GeneralUtils';
import { PipelineBtns } from '../../support/utils/pipeline/PipelineBtns';
import { ConnectEventSchemaUtils } from
'../../support/utils/connect/ConnectEventSchemaUtils';
+import { SharedUtils } from '../../support/utils/shared/SharedUtils';
+import { SharedBtns } from '../../support/utils/shared/SharedBtns';
describe('Test Edit Adapter and Pipeline', () => {
beforeEach('Setup Test', () => {
@@ -65,9 +67,13 @@ describe('Test Edit Adapter and Pipeline', () => {
.build();
ConnectUtils.configureAdapter(newUserConfiguration);
+ SharedUtils.confirmDialogVisible();
+ SharedBtns.confirmDialogConfirmBtn().click();
ConnectBtns.getNewSampleBtn().click();
ConnectUtils.finishEventSchemaConfiguration();
+ SharedUtils.confirmDialogVisible();
+ SharedBtns.confirmDialogConfirmBtn().click();
cy.wait(1000);
ConnectBtns.refreshSchemaBtn().click();
ConnectEventSchemaUtils.markPropertyAsTimestamp('timestamp');
diff --git
a/ui/cypress/tests/connect/opcua/startAndEditOpcAdapters.smoke.spec.ts
b/ui/cypress/tests/connect/opcua/startAndEditOpcAdapters.smoke.spec.ts
index 4d37cc40d2..dbf387acd8 100644
--- a/ui/cypress/tests/connect/opcua/startAndEditOpcAdapters.smoke.spec.ts
+++ b/ui/cypress/tests/connect/opcua/startAndEditOpcAdapters.smoke.spec.ts
@@ -24,6 +24,8 @@ import { ConnectEventSchemaUtils } from
'../../../support/utils/connect/ConnectE
import { AdapterInput } from '../../../support/model/AdapterInput';
import { OpcUaUtils } from '../../../support/utils/connect/OpcUaUtils';
import { GeneralUtils } from '../../../support/utils/GeneralUtils';
+import { SharedUtils } from '../../../support/utils/shared/SharedUtils';
+import { SharedBtns } from '../../../support/utils/shared/SharedBtns';
describe('Test starting and editing OPC-UA Adapters in different
configurations', () => {
beforeEach('Setup Test', () => {
@@ -86,10 +88,14 @@ const editAdapterTest = (adapterInput: AdapterInput) => {
// Remove a node and validate that resulting events do not contain the
property
TreeStaticPropertyUtils.removeSelectedNode('ns=3;s=RandomUnsignedInt32');
ConnectUtils.finishAdapterSettings();
+ SharedUtils.confirmDialogVisible();
+ SharedBtns.confirmDialogConfirmBtn().click();
// Currently the user must trigger get sample manually, this should be
automated in the future
ConnectBtns.getNewSampleBtn().click();
ConnectUtils.finishEventSchemaConfiguration();
+ SharedUtils.confirmDialogVisible();
+ SharedBtns.confirmDialogConfirmBtn().click();
// Same as for new sample, once automated, this can be removed
cy.wait(1000);
ConnectBtns.refreshSchemaBtn().click();
diff --git
a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-state-service/adapter-configuration-state.service.ts
b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-state-service/adapter-configuration-state.service.ts
index 2f73ddae3d..5917dfe4fe 100644
---
a/ui/src/app/connect/components/adapter-configuration/adapter-configuration-state-service/adapter-configuration-state.service.ts
+++
b/ui/src/app/connect/components/adapter-configuration/adapter-configuration-state-service/adapter-configuration-state.service.ts
@@ -87,6 +87,10 @@ export class AdapterConfigurationStateService {
this.updateState({
adapterDescription: adapter,
autoLoadSchema: false,
+ adapterSettingsString: JSON.stringify(adapter.config),
+ transformationConfigurationString: JSON.stringify(
+ adapter.transformationConfig,
+ ),
});
}
@@ -333,7 +337,7 @@ export class AdapterConfigurationStateService {
adapterDescription: this.state().adapterDescription,
transformationConfigurationChanged: false,
transformationConfigurationString: JSON.stringify(
- this.state().adapterDescription.config,
+ this.state().adapterDescription.transformationConfig,
),
});
}
diff --git
a/ui/src/app/connect/components/adapter-configuration/adapter-settings/adapter-settings.component.ts
b/ui/src/app/connect/components/adapter-configuration/adapter-settings/adapter-settings.component.ts
index 4183bd4b56..e29d7b59a0 100644
---
a/ui/src/app/connect/components/adapter-configuration/adapter-settings/adapter-settings.component.ts
+++
b/ui/src/app/connect/components/adapter-configuration/adapter-settings/adapter-settings.component.ts
@@ -34,7 +34,6 @@ import { AdapterTemplateService } from
'../../../services/adapter-template.servi
import { MatStepper } from '@angular/material/stepper';
import { DialogService, PanelType } from '@streampipes/shared-ui';
import { SpAdapterDocumentationDialogComponent } from
'../../../dialog/adapter-documentation/adapter-documentation-dialog.component';
-import { AdapterConfigurationStateService } from
'../adapter-configuration-state-service/adapter-configuration-state.service';
@Component({
selector: 'sp-adapter-settings',
@@ -49,7 +48,6 @@ export class AdapterSettingsComponent implements OnInit {
);
private adapterTemplateService = inject(AdapterTemplateService);
private dialogService = inject(DialogService);
- private stateService = inject(AdapterConfigurationStateService);
/**
* Adapter description the selected format is added to
