Skip to content
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

story #11387 fix(referential): fix bad behavior in usage and service… #1328

Merged
merged 1 commit into from
May 4, 2023
Merged

story #11387 fix(referential): fix bad behavior in usage and service… #1328

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
104 changes: 53 additions & 51 deletions ...ess-contract-usage-and-services-tab/access-contract-usage-and-services-tab.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,59 @@
<form [formGroup]="form" class="side-form" (ngSubmit)="onSubmit()">

<div class="row">
<div class="col-10 form-control">
<vitamui-common-slide-toggle formControlName="everyOriginatingAgency">Tous les services producteurs
</vitamui-common-slide-toggle>
<div class="form-group" *ngIf="form?.get('everyOriginatingAgency')?.value === false">
<mat-form-field class="vitamui-mat-select">
<mat-select [formControl]="originatingAgencySelect"
placeholder="Sélectionnez les services producteurs"
i18n-placeholder="Application@@profilesFormApplicationPlaceholder"
panelclass="vitamui-mat-select" multiple required>
<mat-option *ngFor='let originatingAgencie of originatingAgencies'
[value]="originatingAgencie.key">
{{originatingAgencie.label}}</mat-option>
</mat-select>
<div class="select-arrow">
<i class="material-icons">keyboard_arrow_down</i>
</div>
<mat-error *ngIf="originatingAgencySelect?.errors?.required"
i18n="Application@@agenciesErrorRequiredField">Veuillez sélectionner au moins un service
</mat-error>
</mat-form-field>
</div>
</div>
<div class="row">
<div class="col-10 form-control">
<vitamui-common-slide-toggle formControlName="everyOriginatingAgency">Tous les services producteurs </vitamui-common-slide-toggle>
<div class="form-group" *ngIf="!form.value.everyOriginatingAgency">
<mat-form-field class="vitamui-mat-select">
<mat-select
formControlName="originatingAgencies"
placeholder="Sélectionnez les services producteurs"
i18n-placeholder="Application@@profilesFormApplicationPlaceholder"
panelclass="vitamui-mat-select"
multiple
required
>
<mat-option *ngFor="let originatingAgencie of originatingAgencies" [value]="originatingAgencie.key">
{{ originatingAgencie.label }}
</mat-option>
</mat-select>
<div class="select-arrow">
<i class="material-icons">keyboard_arrow_down</i>
</div>
<mat-error *ngIf="form.controls.originatingAgencies?.errors?.required" i18n="Application@@agenciesErrorRequiredField">
Veuillez sélectionner au moins un service
</mat-error>
</mat-form-field>
</div>
</div>
</div>


<div class="row">
<div class="col-10 form-control">
<vitamui-common-slide-toggle formControlName="everyDataObjectVersion">Tous les usages
</vitamui-common-slide-toggle>
<div class="form-group" *ngIf="form?.get('everyDataObjectVersion')?.value === false">
<mat-form-field class="vitamui-mat-select">
<mat-select [formControl]="usageSelect" placeholder="Sélectionnez les usages"
i18n-placeholder="Application@@profilesFormApplicationPlaceholder"
panelclass="vitamui-mat-select" multiple required>
<mat-option *ngFor='let usage of usages' [value]="usage.key">
{{usage.label}}</mat-option>
</mat-select>
<div class="select-arrow">
<i class="material-icons">keyboard_arrow_down</i>
</div>
<mat-error *ngIf="usageSelect?.errors?.required"
i18n="Application@@usagesErrorRequiredField">Veuillez sélectionner au moins un usage
</mat-error>
</mat-form-field>
</div>
</div>

<div class="row">
<div class="col-10 form-control">
<vitamui-common-slide-toggle formControlName="everyDataObjectVersion">Tous les usages</vitamui-common-slide-toggle>
<div class="form-group" *ngIf="!form.value.everyDataObjectVersion">
<mat-form-field class="vitamui-mat-select">
<mat-select
formControlName="dataObjectVersion"
placeholder="Sélectionnez les usages"
i18n-placeholder="Application@@profilesFormApplicationPlaceholder"
panelclass="vitamui-mat-select"
multiple
required
>
<mat-option *ngFor="let usage of usages" [value]="usage.key"> {{ usage.label }}</mat-option>
</mat-select>
<div class="select-arrow">
<i class="material-icons">keyboard_arrow_down</i>
</div>
<mat-error *ngIf="form.controls.dataObjectVersion?.errors?.required" i18n="Application@@usagesErrorRequiredField">
Veuillez sélectionner au moins un usage
</mat-error>
</mat-form-field>
</div>
</div>
</div>

<div class="form-group bottom">
<button type="submit" class="btn secondary"
[disabled]="unchanged() || isInvalid() || submited">Enregistrer</button>
</div>
<div class="form-group bottom">
<button type="submit" class="btn secondary" [disabled]="form.invalid || !changed || submitting">Enregistrer</button>
</div>
</form>
53 changes: 8 additions & 45 deletions ...-contract-usage-and-services-tab/access-contract-usage-and-services-tab.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
import { of } from 'rxjs';
import { AccessContract } from 'ui-frontend-common';
import { VitamUICommonTestModule } from 'ui-frontend-common/testing';
import { AgencyService } from '../../../agency/agency.service';
import { AccessContractService } from '../../access-contract.service';
Expand All @@ -49,54 +48,14 @@ describe('AccessContractUsageAndServicesTabComponent', () => {
let component: AccessContractUsageAndServicesTabComponent;
let fixture: ComponentFixture<AccessContractUsageAndServicesTabComponent>;

const accessContractValue = {
everyOriginatingAgency: true,
originatingAgencies: ['test'],
everyDataObjectVersion: true,
dataObjectVersion: ['test'],
};

const previousValue: AccessContract = {
tenant: 0,
version: 1,
description: 'desc',
status: 'ACTIVE',
id: 'vitam_id',
name: 'Name',
identifier: 'SP-000001',
everyOriginatingAgency: true,
originatingAgencies: ['test'],
everyDataObjectVersion: true,
dataObjectVersion: ['test'],
creationDate: '01-01-20',
lastUpdate: '01-01-20',
activationDate: '01-01-20',
deactivationDate: '01-01-20',
writingPermission: true,
writingRestrictedDesc: true,
accessLog: '',
ruleFilter: true,
ruleCategoryToFilter: ['rule'],
rootUnits: [],
excludedRootUnits: [],
};

const agencyServiceMock = {
getAll: () => of([]),
};
const accessContractServiceMock = {
// tslint:disable-next-line:variable-name
patch: (_data: any) => of(null),
};

beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [ReactiveFormsModule, VitamUICommonTestModule],
declarations: [AccessContractUsageAndServicesTabComponent],
providers: [
FormBuilder,
{ provide: AccessContractService, useValue: accessContractServiceMock },
{ provide: AgencyService, useValue: agencyServiceMock },
{ provide: AccessContractService, useValue: { patch: (_data: any) => of(null) } },
{ provide: AgencyService, useValue: { getAll: () => of([]) } },
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
}).compileComponents();
Expand All @@ -105,8 +64,12 @@ describe('AccessContractUsageAndServicesTabComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(AccessContractUsageAndServicesTabComponent);
component = fixture.componentInstance;
component.form.setValue(accessContractValue);
component.previousValue = (): AccessContract => previousValue;
component.form.setValue({
everyOriginatingAgency: true,
originatingAgencies: ['test'],
everyDataObjectVersion: true,
dataObjectVersion: ['test'],
});
fixture.detectChanges();
});

Expand Down
Loading