Skip to content

Commit

Permalink
fix(frontend): fix types imports
Browse files Browse the repository at this point in the history
  • Loading branch information
pYassine committed Oct 16, 2024
1 parent 1947e9a commit eba11fe
Show file tree
Hide file tree
Showing 20 changed files with 27 additions and 30 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// @index('./*', f => `export * from '${f.path}'`)
export * from "./constants";
export * from "./ETAPES_DEMANDE_URL.const";
1 change: 0 additions & 1 deletion packages/frontend/src/_common/model/usager/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export * from "./dossier";
export * from "./entretien";
export * from "./form";
export * from "./HISTORY_ACTIONS.const";
export * from "./rdv";
export * from "./UsagerEcheanceInfos.type";
export * from "./UsagerLight.type";
export * from "./UsagersImportMode.type";
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export class StepDocumentsComponent extends BaseUsagerDossierPageComponent {
this.subscription.add(
this.usagerDossierService.nextStep(this.usager.ref, step).subscribe({
next: (usager: UsagerLight) => {
this.router.navigate(["usager/" + usager.ref + "/edit/decision"]);
this.router.navigate([`usager/${usager.ref}/edit/decision`]);
this.toastService.success("Enregistrement réussi");
},
error: () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export class StepEntretienComponent
this.subscription.add(
this.usagerDossierService.nextStep(this.usager.ref, step).subscribe({
next: (usager: UsagerLight) => {
this.router.navigate(["usager/" + usager.ref + "/edit/documents"]);
this.router.navigate([`usager/${usager.ref}/edit/documents`]);
},
error: () => {
this.toastService.error("Une erreure inattendue est survenue");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { EtatCivilParentFormComponent } from "./../../../usager-shared/components/etat-civil-parent-form/etat-civil-parent-form.component";
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from "@angular/core";
import { UntypedFormBuilder } from "@angular/forms";
import { ActivatedRoute, Router } from "@angular/router";
Expand All @@ -22,6 +21,7 @@ import {
import { UsagerFormModel } from "../../../usager-shared/interfaces";
import { Usager } from "@domifa/common";
import { merge, debounceTime, distinctUntilChanged } from "rxjs";
import { EtatCivilParentFormComponent } from "../../../usager-shared/components/etat-civil-parent-form/etat-civil-parent-form.component";

@Component({
animations: [fadeInOut],
Expand Down Expand Up @@ -139,9 +139,7 @@ export class StepEtatCivilComponent
.subscribe({
next: (usager: Usager) => {
this.toastService.success("Enregistrement réussi");
this.router.navigate([
"usager/" + usager.ref + "/edit/rendez-vous",
]);
this.router.navigate([`usager/${usager.ref}/edit/rendez-vous`]);
},
error: () => {
this.loading = false;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { Component, Input } from "@angular/core";

import { UsagerFormModel } from "./../../../usager-shared/interfaces/UsagerFormModel";

import { AuthService } from "../../../shared/services";
import { UserStructure } from "@domifa/common";
import { UsagerFormModel } from "../../../usager-shared/interfaces";

@Component({
selector: "app-step-footer",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@ import { Component, Input, OnDestroy, OnInit } from "@angular/core";

import { Title } from "@angular/platform-browser";
import { Router } from "@angular/router";
import {
ETAPES_DEMANDE_URL,
ETAPES_FORM_DOM,
ETAPES_FORM_DOM_TITRES,
UsagerLight,
} from "../../../../../_common/model";
import { ETAPES_DEMANDE_URL, UsagerLight } from "../../../../../_common/model";
import { selectUsagerById, UsagerState } from "../../../../shared";
import { CustomToastService } from "../../../shared/services";
import { UsagerFormModel } from "../../../usager-shared/interfaces";
import { Store } from "@ngrx/store";
import { Subscription } from "rxjs";
import { getUsagerNomComplet } from "../../../usager-shared/utils/getUsagerNomComplet";
import { ETAPES_FORM_DOM_TITRES, ETAPES_FORM_DOM } from "../../constants";

@Component({
selector: "app-step-header",
Expand Down Expand Up @@ -51,7 +47,7 @@ export class StepHeaderComponent implements OnInit, OnDestroy {
this.toastService.warning(
"Vous ne pouvez pas revenir sur une décision déjà prise"
);
this.router.navigate(["/profil/general/" + this.usager.ref]);
this.router.navigate([`/profil/general/${this.usager.ref}`]);
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { ActivatedRoute, Router } from "@angular/router";
import { NgbDateStruct } from "@ng-bootstrap/ng-bootstrap";

import { UsagerLight, RdvForm } from "../../../../../_common/model";
import { UsagerLight } from "../../../../../_common/model";
import { DocumentService } from "../../../usager-shared/services/document.service";
import { UsagerDossierService } from "../../services/usager-dossier.service";
import {
Expand Down Expand Up @@ -38,6 +38,7 @@ import {
CustomToastService,
} from "../../../shared/services";
import { UserStructure, CerfaDocType, Usager } from "@domifa/common";
import { RdvForm } from "../../types";

@Component({
animations: [fadeInOut],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//@index('./*', f => `export * from '${f.path}'`)
export * from "./ETAPES_FORM_DOM.const";
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { RdvForm } from "./../../../../_common/model/usager/rdv/RdvForm.type";
import { HttpClient } from "@angular/common/http";
import { Injectable } from "@angular/core";
import { Observable } from "rxjs";
Expand All @@ -13,12 +12,13 @@ import { userStructureBuilder } from "../../users/services";
import { Store } from "@ngrx/store";
import { UserStructure, Usager } from "@domifa/common";
import { usagerActions, UsagerState } from "../../../shared";
import { RdvForm } from "../types";

@Injectable({
providedIn: "root",
})
export class UsagerDossierService {
public endPointUsagers = environment.apiUrl + "usagers";
public endPointUsagers = `${environment.apiUrl}usagers`;

constructor(
private readonly http: HttpClient,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export type RdvForm = {
export interface RdvForm {
isNow: boolean;
dateRdv?: Date;
userId: number;
};
}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
//@index('./*', f => `export * from '${f.path}'`)
export * from "./RdvForm.type";
export * from "./RdvForm.interface";
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ import { UserStructure } from "@domifa/common";
})
export class FormContactDetailsComponent implements OnInit, OnDestroy {
@Input() public usager!: UsagerFormModel;
@Output() public editContactDetailsChange = new EventEmitter<boolean>();
@Output() public readonly editContactDetailsChange =
new EventEmitter<boolean>();

public contactDetailsForm!: FormGroup;
// skipcq: JS-0331
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { SharedModule } from "../../../../shared/shared.module";
import { USAGER_VALIDE_MOCK } from "../../../../../../_common/mocks";
import { StoreModule } from "@ngrx/store";
import { _usagerReducer } from "../../../../../shared";
import { UsagerNomCompletPipe } from "../../../pipes";

describe("SetInteractionInFormComponent", () => {
let component: SetInteractionInFormComponent;
Expand All @@ -24,6 +25,7 @@ describe("SetInteractionInFormComponent", () => {
HttpClientTestingModule,
SharedModule,
FormsModule,
UsagerNomCompletPipe,
StoreModule.forRoot({ app: _usagerReducer }),
],
providers: [{ provide: APP_BASE_HREF, useValue: "/" }],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ export class SetInteractionInFormComponent implements OnDestroy {
@Input() public usager!: UsagerFormModel;

@Output()
public cancelReception = new EventEmitter<void>();
public readonly cancelReception = new EventEmitter<void>();

@Output()
public updateInteractions = new EventEmitter<void>();
public readonly updateInteractions = new EventEmitter<void>();

private subscription = new Subscription();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { SharedModule } from "./../../../../shared/shared.module";
import { APP_BASE_HREF } from "@angular/common";
import { HttpClientTestingModule } from "@angular/common/http/testing";
import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
Expand All @@ -12,6 +11,8 @@ import { SetInteractionOutFormComponent } from "./set-interaction-out-form.compo
import { FormsModule } from "@angular/forms";
import { StoreModule } from "@ngrx/store";
import { _usagerReducer } from "../../../../../shared";
import { UsagerNomCompletPipe } from "../../../pipes";
import { SharedModule } from "../../../../shared/shared.module";

describe("SetInteractionOutFormComponent", () => {
let component: SetInteractionOutFormComponent;
Expand All @@ -25,6 +26,7 @@ describe("SetInteractionOutFormComponent", () => {
HttpClientTestingModule,
FormsModule,
SharedModule,
UsagerNomCompletPipe,
StoreModule.forRoot({ app: _usagerReducer }),
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
Expand Down

0 comments on commit eba11fe

Please sign in to comment.