Skip to content

Commit

Permalink
changed templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@ck-c8y
ck-c8y committed Dec 21, 2024
1 parent 3f89a1a commit 763e14c
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 98 deletions.
145 changes: 80 additions & 65 deletions dynamic-mapping-ui/src/mapping/grid/mapping.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import {
import { Router } from '@angular/router';
import { IIdentified } from '@c8y/client';
import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
import { BehaviorSubject, Subject, take } from 'rxjs';
import { BehaviorSubject, filter, finalize, Subject, switchMap, take } from 'rxjs';
import { LabelRendererComponent, SharedService } from '../../shared';
import { MappingService } from '../core/mapping.service';
import { ImportMappingsComponent } from '../import/import-modal.component';
Expand All @@ -73,7 +73,6 @@ import { MappingDeploymentRendererComponent } from '../renderer/mapping-deployme
import { MappingIdCellRendererComponent } from '../renderer/mapping-id.renderer.component';
import { SnoopedTemplateRendererComponent } from '../renderer/snooped-template.renderer.component';
import {
C8YNotificationSubscription,
PayloadWrapper
} from '../shared/mapping.model';
import { AdvisorAction, EditorMode } from '../shared/stepper-model';
Expand All @@ -99,7 +98,6 @@ export class MappingComponent implements OnInit, OnDestroy {
);
mappingsCount: number = 0;
mappingToUpdate: Mapping;
subscription: C8YNotificationSubscription;
devices: IIdentified[] = [];
snoopStatus: SnoopStatus = SnoopStatus.NONE;
Direction = Direction;
Expand Down Expand Up @@ -162,11 +160,6 @@ export class MappingComponent implements OnInit, OnDestroy {

this.columnsMappings = this.getColumnsMappings();
this.titleMapping = `Mapping ${this.stepperConfiguration.direction.toLowerCase()}`;
this.loadSubscriptions();
}

async loadSubscriptions() {
this.subscription = await this.mappingService.getSubscriptions();
}

async ngOnInit() {
Expand Down Expand Up @@ -308,23 +301,53 @@ export class MappingComponent implements OnInit, OnDestroy {
this.updateMapping(m);
});
}
editMessageFilter(m: MappingEnriched) {

async editMessageFilter(m: MappingEnriched) {
const { mapping } = m;
const initialState = {
mapping
const initialState = { mapping };
try {
const modalRef = this.bsModalService.show(MappingFilterComponent, {
initialState
});
await new Promise((resolve) => {
modalRef.content.closeSubject
.pipe(
take(1),
filter(filterMapping => !!filterMapping),
switchMap(filterMapping => this.applyMappingFilter(filterMapping, mapping.id)),
finalize(() => {
modalRef.hide();
resolve(undefined);
})
)
.subscribe({
next: (filterMapping) => {
this.alertService.success(`Applied filter ${filterMapping} to mapping ${mapping.name}`);
},
error: (error) => {
this.alertService.danger('Failed to apply mapping filter', error);
resolve(undefined);
}
});
});
} catch (error) {
this.alertService.danger(`'Failed to apply mapping filter': ${error.message}`);
}
}

private async applyMappingFilter(filterMapping: string, mappingId: string): Promise<string> {
const params = {
filterMapping,
id: mappingId
};
const modalRef = this.bsModalService.show(MappingFilterComponent, {
initialState
});
modalRef.content.closeSubject.subscribe(async (filterMapping) => {
// console.log('Was selected:', result);
if (filterMapping) {
await this.shareService.runOperation({ operation: Operation.APPLY_MAPPING_FILTER, parameter: { filterMapping, id: mapping.id } });
this.mappingService.refreshMappings(Direction.INBOUND);
this.alertService.success(`Applied filter ${filterMapping}`);
}
modalRef.hide();

await this.shareService.runOperation({
operation: Operation.APPLY_MAPPING_FILTER,
parameter: params
});

await this.mappingService.refreshMappings(Direction.INBOUND);
return filterMapping;
}

getColumnsMappings(): Column[] {
Expand Down Expand Up @@ -535,21 +558,6 @@ export class MappingComponent implements OnInit, OnDestroy {
}
}

async deleteSubscription(device: IIdentified) {
// console.log('Delete device', device);
try {
await this.mappingService.deleteSubscriptions(device);
this.alertService.success(
gettext('Subscription for this device deleted successfully')
);
this.loadSubscriptions();
} catch (error) {
this.alertService.danger(
gettext('Failed to delete subscription:') + error
);
}
}

async updateMapping(m: MappingEnriched) {
let action = AdvisorAction.CONTINUE;
const { mapping } = m;
Expand Down Expand Up @@ -643,27 +651,32 @@ export class MappingComponent implements OnInit, OnDestroy {
);
// create deep copy of existing mapping, in case user cancels changes
this.mappingToUpdate = JSON.parse(JSON.stringify(mapping)) as Mapping;
this.mappingToUpdate.snoopStatus = SnoopStatus.NONE;
this.mappingToUpdate.snoopedTemplates = [];
this.mappingToUpdate.name = `${this.mappingToUpdate.name} - Copy`;
this.mappingToUpdate.identifier = uuidCustom();
this.mappingToUpdate.id = this.mappingToUpdate.identifier;
this.mappingToUpdate.active = false;

this.mappingToUpdate = {
...this.mappingToUpdate,
snoopStatus: SnoopStatus.NONE,
snoopedTemplates: [],
name: `${this.mappingToUpdate.name} - Copy`,
identifier: uuidCustom(),
id: uuidCustom(),
active: false,
}

const deploymentMapEntry =
await this.mappingService.getDefinedDeploymentMapEntry(mapping.identifier);
this.deploymentMapEntry = {
identifier: this.mappingToUpdate.identifier,
connectors: deploymentMapEntry.connectors
};
// console.log('Copying mapping', this.mappingToUpdate);
if (
mapping.snoopStatus === SnoopStatus.NONE ||
mapping.snoopStatus === SnoopStatus.STOPPED
) {
this.showConfigMapping = true;
} else {
this.showSnoopingMapping = true;
}

// update view state
const isInactiveSnoop = mapping.snoopStatus === SnoopStatus.NONE ||
mapping.snoopStatus === SnoopStatus.STOPPED;

this.showConfigMapping = isInactiveSnoop;
this.showSnoopingMapping = !isInactiveSnoop;

}

async activateMapping(m: MappingEnriched) {
Expand All @@ -677,10 +690,10 @@ export class MappingComponent implements OnInit, OnDestroy {
const failedMap = await response.json();
const failedList = Object.values(failedMap).join(',');
this.alertService.warning(
`Mapping could only activate partially. It failed for the following connectors: ${failedList}`
`Mapping ${mapping.name} could only activate partially. It failed for the following connectors: ${failedList}`
);
} else {
this.alertService.success(`${action} mapping: ${mapping.id}`);
this.alertService.success(`${action} for mapping: ${mapping.name} was successful`);
}
this.mappingService.refreshMappings(this.stepperConfiguration.direction);
// return this.mappingService.
Expand All @@ -690,7 +703,7 @@ export class MappingComponent implements OnInit, OnDestroy {
const { mapping } = m;
const newDebug = !mapping.debug;
const action = newDebug ? 'Activated' : 'Deactivated';
this.alertService.success(`Debugging ${action} for mapping: ${mapping.id}`);
this.alertService.success(`Debugging ${action} for mapping: ${mapping.id} was successful`);
const parameter = { id: mapping.id, debug: newDebug };
await this.mappingService.changeDebuggingMapping(parameter);
this.mappingService.refreshMappings(this.stepperConfiguration.direction);
Expand All @@ -710,7 +723,7 @@ export class MappingComponent implements OnInit, OnDestroy {
newSnoop = SnoopStatus.NONE;
action = 'Deactivated';
}
this.alertService.success(`Snooping ${action} for mapping: ${mapping.id}`);
this.alertService.success(`Snooping ${action} for mapping: ${mapping.name}`);
const parameter = { id: mapping.id, snoopStatus: newSnoop };
await this.mappingService.changeSnoopStatusMapping(parameter);
this.mappingService.refreshMappings(this.stepperConfiguration.direction);
Expand All @@ -719,7 +732,7 @@ export class MappingComponent implements OnInit, OnDestroy {
async resetSnoop(m: MappingEnriched) {
const { mapping } = m;
this.alertService.success(
`Reset snooped messages for mapping: ${mapping.id}`
`Reset snooped messages for mapping: ${mapping.name}`
);
const parameter = { id: mapping.id };
await this.mappingService.resetSnoop(parameter);
Expand Down Expand Up @@ -763,14 +776,16 @@ export class MappingComponent implements OnInit, OnDestroy {
return result;
}

async deleteMapping(m: MappingEnriched) {
async deleteMapping(m: MappingEnriched): Promise<boolean> {
const { mapping } = m;
try {
await this.mappingService.deleteMapping(mapping.id);
this.alertService.success(gettext('Mapping deleted successfully'));
this.alertService.success(gettext(`Mapping ${mapping.name} deleted successfully'`));
this.isConnectionToMQTTEstablished = true;
return true;
} catch (error) {
this.alertService.danger(gettext('Failed to delete mapping:') + error);
this.alertService.danger(gettext(`Failed to delete mapping ${mapping.name}:`) + error);
return false;
}
}

Expand All @@ -788,10 +803,10 @@ export class MappingComponent implements OnInit, OnDestroy {
// console.log('Update existing mapping:', mapping);
try {
await this.mappingService.updateMapping(mapping);
this.alertService.success(gettext('Mapping updated successfully'));
this.alertService.success(gettext(`Mapping ${mapping.name} updated successfully`));
} catch (error) {
this.alertService.danger(
gettext('Failed to updated mapping: ') + error.message
gettext(`Failed to updated mapping ${mapping.name}: `) + error.message
);
}
// this.activateMappings();
Expand All @@ -803,10 +818,10 @@ export class MappingComponent implements OnInit, OnDestroy {
// console.log('Push new mapping:', mapping);
try {
await this.mappingService.createMapping(mapping);
this.alertService.success(gettext('Mapping created successfully'));
this.alertService.success(gettext(`Mapping ${mapping.name} created successfully`));
} catch (error) {
this.alertService.danger(
gettext('Failed to create mapping:') + error
gettext(`Failed to updated mapping ${mapping.name}: `) + error
);
}
// this.activateMappings();
Expand Down Expand Up @@ -867,7 +882,7 @@ export class MappingComponent implements OnInit, OnDestroy {
const action = 'Activated';
const parameter = { id: m.id, active: true };
await this.mappingService.changeActivationMapping(parameter);
this.alertService.success(`${action} mapping: ${m.id}`);
this.alertService.success(`${action} mapping: ${m.name} was successful`);
}
this.mappingService.refreshMappings(this.stepperConfiguration.direction);
});
Expand All @@ -884,7 +899,7 @@ export class MappingComponent implements OnInit, OnDestroy {
const action = 'Deactivated';
const parameter = { id: m.id, active: false };
await this.mappingService.changeActivationMapping(parameter);
this.alertService.success(`${action} mapping: ${m.id}`);
this.alertService.success(`${action} mapping: ${m.name} was successful`);
}
this.mappingService.refreshMappings(this.stepperConfiguration.direction);
});
Expand Down
2 changes: 1 addition & 1 deletion dynamic-mapping-ui/src/mapping/renderer/status-activation.renderer.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export class StatusActivationRendererComponent {
`Mapping could only activate partially. It failed for the following connectors: ${failedList}`
);
} else {
this.alertService.success(`${action} mapping: ${mapping.id}`);
this.alertService.success(`${action} for mapping: ${mapping.name} was successful`);
}
this.mappingService.refreshMappings(Direction.INBOUND);
this.mappingService.refreshMappings(Direction.OUTBOUND);
Expand Down
4 changes: 2 additions & 2 deletions dynamic-mapping-ui/src/mapping/step-testing/mapping-testing.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ interface TestResult {
export class MappingStepTestingComponent implements OnInit, OnDestroy {
@Input() mapping: Mapping;
@Input() stepperConfiguration: StepperConfiguration;
@Input() editorTestingPayloadTemplateEmitter: EventEmitter<any>;
@Input() updateTestingTemplate: EventEmitter<any>;
@Output() testResult: EventEmitter<boolean> = new EventEmitter<boolean>();

@ViewChild('editorTestingPayload') editorTestingPayload: JsonEditorComponent;
Expand Down Expand Up @@ -123,7 +123,7 @@ export class MappingStepTestingComponent implements OnInit, OnDestroy {
}

private setupSubscriptions(): void {
this.subscription = this.editorTestingPayloadTemplateEmitter.subscribe(
this.subscription = this.updateTestingTemplate.subscribe(
this.handleTestMappingUpdate.bind(this)
);
}
Expand Down
4 changes: 2 additions & 2 deletions dynamic-mapping-ui/src/mapping/stepper-mapping/mapping-stepper.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ <h4 class="text-medium">

<cdk-step state="final" stepLabel="step3" label="Test mapping">
<div class="col-xs-12 flex-grow no-gutter">
<d11r-mapping-testing [editorTestingPayloadTemplateEmitter]="
editorTestingPayloadTemplateEmitter
<d11r-mapping-testing [updateTestingTemplate]="
updateTestingTemplate
" [mapping]="mapping" (testResult)="updateTestResult($event)"
[stepperConfiguration]="stepperConfiguration"></d11r-mapping-testing>
</div>
Expand Down
33 changes: 13 additions & 20 deletions dynamic-mapping-ui/src/mapping/stepper-mapping/mapping-stepper.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,9 @@ import { SubstitutionRendererComponent } from '../substitution/substitution-grid
export class MappingStepperComponent implements OnInit, OnDestroy {
@Input() mapping: Mapping;
@Input() stepperConfiguration: StepperConfiguration;
@Input() deploymentMapEntry: DeploymentMapEntry;
@Output() cancel = new EventEmitter<any>();
@Output() commit = new EventEmitter<Mapping>();
private _deploymentMapEntry: DeploymentMapEntry;

@Input()
get deploymentMapEntry(): DeploymentMapEntry {
return this._deploymentMapEntry;
}
set deploymentMapEntry(value: DeploymentMapEntry) {
this._deploymentMapEntry = value;
}

ValidationError = ValidationError;
Direction = Direction;
Expand All @@ -101,7 +93,7 @@ export class MappingStepperComponent implements OnInit, OnDestroy {
SnoopStatus = SnoopStatus;
isDisabled = isDisabled;

editorTestingPayloadTemplateEmitter = new EventEmitter<any>();
updateTestingTemplate = new EventEmitter<any>();
updateSourceEditor: EventEmitter<any> = new EventEmitter<any>();
updateTargetEditor: EventEmitter<any> = new EventEmitter<any>();

Expand Down Expand Up @@ -343,6 +335,13 @@ export class MappingStepperComponent implements OnInit, OnDestroy {
this.setTemplateForm();
}

ngOnDestroy() {
this.countDeviceIdentifiers$.complete();
this.isSubstitutionValid$.complete();
this.extensionEvents$.complete();
this.onDestroy$.complete();
}

private updateSubstitutionValid() {
const ni = countDeviceIdentifiers(this.mapping);
// console.log('Updated number identifiers', ni, (ni == 1 && this.mapping.direction == Direction.INBOUND) , ni >= 1 && this.mapping.direction == Direction.OUTBOUND, (ni == 1 && this.mapping.direction == Direction.INBOUND) ||
Expand Down Expand Up @@ -392,13 +391,13 @@ export class MappingStepperComponent implements OnInit, OnDestroy {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
deploymentMapEntryChange(e) {
this.isButtonDisabled$.next(
!this._deploymentMapEntry?.connectors ||
this._deploymentMapEntry?.connectors?.length == 0
!this.deploymentMapEntry?.connectors ||
this.deploymentMapEntry?.connectors?.length == 0
);

setTimeout(() => {
this.supportsMessageContext =
this._deploymentMapEntry.connectorsDetailed?.some(
this.deploymentMapEntry.connectorsDetailed?.some(
(con) => con.connectorType == ConnectorType.KAFKA
);
});
Expand Down Expand Up @@ -646,7 +645,7 @@ export class MappingStepperComponent implements OnInit, OnDestroy {
const testMapping = _.clone(this.mapping);
testMapping.sourceTemplate = JSON.stringify(this.sourceTemplate);
testMapping.targetTemplate = JSON.stringify(this.targetTemplate);
this.editorTestingPayloadTemplateEmitter.emit(testMapping);
this.updateTestingTemplate.emit(testMapping);
// this.step == 'Select templates'
} else if (index == STEP_TEST_MAPPING) {
// console.log("Step 4: onStepChange targetTemplate ", this.mapping.targetTemplate);
Expand Down Expand Up @@ -985,10 +984,4 @@ export class MappingStepperComponent implements OnInit, OnDestroy {
]);
}

ngOnDestroy() {
this.countDeviceIdentifiers$.complete();
this.isSubstitutionValid$.complete();
this.extensionEvents$.complete();
this.onDestroy$.complete();
}
}
Loading

0 comments on commit 763e14c

Please sign in to comment.