Apollo Client v4 #11733

client/app/admin/admin.routes.ts

@@ -1,5 +1,5 @@
-import {Routes} from '@angular/router';
-import {NaturalDialogTriggerComponent, NaturalDialogTriggerRoutingData, NaturalSeo} from '@ecodev/natural';
+import {type Routes} from '@angular/router';
+import {NaturalDialogTriggerComponent, type NaturalDialogTriggerRoutingData, type NaturalSeo} from '@ecodev/natural';
 import {canActivateAdministration} from '../shared/guards/administration.guard';
 import {AdminComponent} from './admin/admin.component';
 import {CommentComponent} from './comments/comment/comment.component';

client/app/admin/admin/admin.component.ts

@@ -1,12 +1,12 @@
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {ActivatedRoute, RouterLink, RouterLinkActive, RouterOutlet} from '@angular/router';
 import {
     NaturalIconDirective,
     NaturalSidenavComponent,
     NaturalSidenavContainerComponent,
     NaturalSidenavContentComponent,
 } from '@ecodev/natural';
-import {CurrentUserForProfileQuery} from '../../shared/generated-types';
+import {type CurrentUserForProfileQuery} from '../../shared/generated-types';
 import {MatListItem, MatNavList} from '@angular/material/list';
 import {
     MatAccordion,

client/app/admin/comments/comment/comment.component.ts

@@ -5,10 +5,10 @@ import {
     NaturalFixedButtonDetailComponent,
     NaturalLinkableTabDirective,
     NaturalSelectComponent,
-    NaturalSeoResolveData,
+    type NaturalSeoResolveData,
     NaturalStampComponent,
 } from '@ecodev/natural';
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {PermissionsService} from '../../../shared/services/permissions.service';
 import {EventService} from '../../events/services/event.service';
 import {NewsService} from '../../newses/services/news.service';

client/app/admin/comments/comments/comments.component.ts

@@ -1,6 +1,6 @@
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {
-    AvailableColumn,
+    type AvailableColumn,
     NaturalAbstractList,
     NaturalColumnsPickerComponent,
     NaturalSearchComponent,

client/app/admin/comments/services/comment.queries.ts

@@ -1,4 +1,4 @@
-import {gql} from '@apollo/client/core';
+import {gql} from '@apollo/client';
 import {permissionsFragment, userMetaFragment} from '../../../shared/queries/fragments';
 
 const commentMetaFragment = gql`

client/app/admin/comments/services/comment.resolver.ts

@@ -1,7 +1,7 @@
 import {inject} from '@angular/core';
-import {ActivatedRouteSnapshot} from '@angular/router';
+import {type ActivatedRouteSnapshot} from '@angular/router';
 import {last} from 'rxjs';
-import {ErrorService} from '../../../shared/components/error/error.service';
+import {ErrorService} from '@ecodev/natural';
 import {CommentService} from './comment.service';
 
 /**

client/app/admin/comments/services/comment.service.ts

@@ -1,17 +1,17 @@
 import {Injectable} from '@angular/core';
 import {NaturalAbstractModelService} from '@ecodev/natural';
 import {
-    CommentInput,
-    CommentQuery,
-    CommentQueryVariables,
-    CommentsQuery,
-    CommentsQueryVariables,
-    CreateComment,
-    CreateCommentVariables,
-    DeleteComments,
-    DeleteCommentsVariables,
-    UpdateComment,
-    UpdateCommentVariables,
+    type CommentInput,
+    type CommentQuery,
+    type CommentQueryVariables,
+    type CommentsQuery,
+    type CommentsQueryVariables,
+    type CreateComment,
+    type CreateCommentVariables,
+    type DeleteComments,
+    type DeleteCommentsVariables,
+    type UpdateComment,
+    type UpdateCommentVariables,
 } from '../../../shared/generated-types';
 import {commentQuery, commentsQuery, createComment, deleteComments, updateComment} from './comment.queries';
 

client/app/admin/events/event/event.component.ts

@@ -5,10 +5,10 @@ import {
     NaturalFixedButtonDetailComponent,
     NaturalIconDirective,
     NaturalLinkableTabDirective,
-    NaturalSeoResolveData,
+    type NaturalSeoResolveData,
     NaturalStampComponent,
 } from '@ecodev/natural';
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {RouterLink} from '@angular/router';
 import {PermissionsService} from '../../../shared/services/permissions.service';
 import {EventService} from '../services/event.service';

client/app/admin/events/events/events.component.ts

@@ -1,6 +1,6 @@
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {
-    AvailableColumn,
+    type AvailableColumn,
     NaturalAbstractList,
     NaturalColumnsPickerComponent,
     NaturalFixedButtonComponent,

client/app/admin/events/services/event.queries.ts

@@ -1,4 +1,4 @@
-import {gql} from '@apollo/client/core';
+import {gql} from '@apollo/client';
 import {userMetaFragment} from '../../../shared/queries/fragments';
 
 export const eventsQuery = gql`

client/app/admin/events/services/event.resolver.ts

@@ -1,7 +1,7 @@
 import {inject} from '@angular/core';
-import {ActivatedRouteSnapshot} from '@angular/router';
+import {type ActivatedRouteSnapshot} from '@angular/router';
 import {last} from 'rxjs';
-import {ErrorService} from '../../../shared/components/error/error.service';
+import {ErrorService} from '@ecodev/natural';
 import {EventService} from './event.service';
 
 /**

client/app/admin/events/services/event.service.ts

@@ -1,17 +1,17 @@
 import {Injectable} from '@angular/core';
-import {formatIsoDateTime, FormValidators, NaturalAbstractModelService} from '@ecodev/natural';
+import {formatIsoDateTime, type FormValidators, NaturalAbstractModelService} from '@ecodev/natural';
 import {
-    CreateEvent,
-    CreateEventVariables,
-    DeleteEvents,
-    DeleteEventsVariables,
-    EventInput,
-    EventQuery,
-    EventQueryVariables,
-    EventsQuery,
-    EventsQueryVariables,
-    UpdateEvent,
-    UpdateEventVariables,
+    type CreateEvent,
+    type CreateEventVariables,
+    type DeleteEvents,
+    type DeleteEventsVariables,
+    type EventInput,
+    type EventQuery,
+    type EventQueryVariables,
+    type EventsQuery,
+    type EventsQueryVariables,
+    type UpdateEvent,
+    type UpdateEventVariables,
 } from '../../../shared/generated-types';
 import {createEvent, deleteEvents, eventQuery, eventsQuery, updateEvent} from './event.queries';
 import {Validators} from '@angular/forms';

client/app/admin/facilitator-documents/facilitator-document/facilitator-document.component.ts

@@ -6,14 +6,14 @@ import {
     NaturalFixedButtonDetailComponent,
     NaturalIconDirective,
     NaturalLinkableTabDirective,
-    NaturalSeoResolveData,
+    type NaturalSeoResolveData,
     NaturalStampComponent,
 } from '@ecodev/natural';
 import {Component, inject} from '@angular/core';
 import {FilesService} from '../../files/services/files.service';
 import {FacilitatorDocumentsService} from '../services/facilitator-documents.service';
-import {CreateFile} from '../../../shared/generated-types';
-import {map, Observable, of, switchMap} from 'rxjs';
+import {type CreateFile} from '../../../shared/generated-types';
+import {map, type Observable, of, switchMap} from 'rxjs';
 import {MatDivider} from '@angular/material/divider';
 import {MatInput} from '@angular/material/input';
 import {MatError, MatFormField, MatLabel} from '@angular/material/form-field';

client/app/admin/facilitator-documents/facilitator-documents/facilitator-documents.component.ts

@@ -1,4 +1,4 @@
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {RouterLink} from '@angular/router';
 import {
     NaturalAbstractList,

client/app/admin/facilitator-documents/services/facilitator-document.resolver.ts

@@ -1,6 +1,6 @@
 import {inject} from '@angular/core';
-import {ActivatedRouteSnapshot} from '@angular/router';
-import {ErrorService} from '../../../shared/components/error/error.service';
+import {type ActivatedRouteSnapshot} from '@angular/router';
+import {ErrorService} from '@ecodev/natural';
 import {FacilitatorDocumentsService} from './facilitator-documents.service';
 
 /**

client/app/admin/facilitator-documents/services/facilitator-documents.queries.ts

@@ -1,4 +1,4 @@
-import {gql} from '@apollo/client/core';
+import {gql} from '@apollo/client';
 import {permissionsFragment, userMetaFragment} from '../../../shared/queries/fragments';
 
 export const facilitatorDocumentMetaFragment = gql`

client/app/admin/facilitator-documents/services/facilitator-documents.service.ts

@@ -1,17 +1,17 @@
 import {Injectable} from '@angular/core';
 import {NaturalAbstractModelService} from '@ecodev/natural';
 import {
-    CreateFacilitatorDocument,
-    CreateFacilitatorDocumentVariables,
-    DeleteFacilitatorDocuments,
-    DeleteFacilitatorDocumentsVariables,
-    FacilitatorDocumentInput,
-    FacilitatorDocumentQuery,
-    FacilitatorDocumentQueryVariables,
-    FacilitatorDocumentsQuery,
-    FacilitatorDocumentsQueryVariables,
-    UpdateFacilitatorDocument,
-    UpdateFacilitatorDocumentVariables,
+    type CreateFacilitatorDocument,
+    type CreateFacilitatorDocumentVariables,
+    type DeleteFacilitatorDocuments,
+    type DeleteFacilitatorDocumentsVariables,
+    type FacilitatorDocumentInput,
+    type FacilitatorDocumentQuery,
+    type FacilitatorDocumentQueryVariables,
+    type FacilitatorDocumentsQuery,
+    type FacilitatorDocumentsQueryVariables,
+    type UpdateFacilitatorDocument,
+    type UpdateFacilitatorDocumentVariables,
 } from '../../../shared/generated-types';
 import {
     createFacilitatorDocument,

client/app/admin/files/services/files.queries.ts

@@ -1,4 +1,4 @@
-import {gql} from '@apollo/client/core';
+import {gql} from '@apollo/client';
 import {userMetaFragment} from '../../../shared/queries/fragments';
 
 export const createFileMutation = gql`

client/app/admin/files/services/files.service.ts

@@ -1,11 +1,11 @@
 import {Injectable} from '@angular/core';
 import {NaturalAbstractModelService} from '@ecodev/natural';
 import {
-    CreateFile,
-    CreateFileVariables,
-    DeleteFile,
-    DeleteFileVariables,
-    FileInput,
+    type CreateFile,
+    type CreateFileVariables,
+    type DeleteFile,
+    type DeleteFileVariables,
+    type FileInput,
 } from '../../../shared/generated-types';
 import {createFileMutation, deleteFileMutation} from './files.queries';
 

client/app/admin/newses/news/news.component.ts

@@ -5,10 +5,10 @@ import {
     NaturalFixedButtonDetailComponent,
     NaturalIconDirective,
     NaturalLinkableTabDirective,
-    NaturalSeoResolveData,
+    type NaturalSeoResolveData,
     NaturalStampComponent,
 } from '@ecodev/natural';
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {RouterLink} from '@angular/router';
 import {PermissionsService} from '../../../shared/services/permissions.service';
 import {NewsService} from '../services/news.service';

client/app/admin/newses/newses/newses.component.ts

@@ -1,6 +1,6 @@
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {
-    AvailableColumn,
+    type AvailableColumn,
     NaturalAbstractList,
     NaturalColumnsPickerComponent,
     NaturalFixedButtonComponent,

client/app/admin/newses/services/news.queries.ts

@@ -1,4 +1,4 @@
-import {gql} from '@apollo/client/core';
+import {gql} from '@apollo/client';
 import {userMetaFragment} from '../../../shared/queries/fragments';
 
 export const newsesQuery = gql`

client/app/admin/newses/services/news.resolver.ts

@@ -1,7 +1,7 @@
 import {inject} from '@angular/core';
-import {ActivatedRouteSnapshot} from '@angular/router';
+import {type ActivatedRouteSnapshot} from '@angular/router';
 import {last} from 'rxjs';
-import {ErrorService} from '../../../shared/components/error/error.service';
+import {ErrorService} from '@ecodev/natural';
 import {NewsService} from './news.service';
 
 /**

client/app/admin/newses/services/news.service.ts

@@ -1,18 +1,18 @@
 import {Injectable} from '@angular/core';
-import {formatIsoDateTime, FormValidators, Literal, NaturalAbstractModelService} from '@ecodev/natural';
+import {formatIsoDateTime, type FormValidators, type Literal, NaturalAbstractModelService} from '@ecodev/natural';
 import {
-    CreateNews,
-    CreateNewsVariables,
-    DeleteNewses,
-    DeleteNewsesVariables,
-    NewsesQuery,
-    NewsesQueryVariables,
-    NewsInput,
-    NewsPartialInput,
-    NewsQuery,
-    NewsQueryVariables,
-    UpdateNews,
-    UpdateNewsVariables,
+    type CreateNews,
+    type CreateNewsVariables,
+    type DeleteNewses,
+    type DeleteNewsesVariables,
+    type NewsesQuery,
+    type NewsesQueryVariables,
+    type NewsInput,
+    type NewsPartialInput,
+    type NewsQuery,
+    type NewsQueryVariables,
+    type UpdateNews,
+    type UpdateNewsVariables,
 } from '../../../shared/generated-types';
 import {createNews, deleteNewses, newsesQuery, newsQuery, updateNews} from './news.queries';
 import {Validators} from '@angular/forms';

client/app/admin/order/order-line/order-line.component.ts

@@ -3,9 +3,9 @@ import {
     NaturalErrorMessagePipe,
     NaturalSelectComponent,
     NaturalSelectEnumComponent,
-    NaturalSeoResolveData,
+    type NaturalSeoResolveData,
 } from '@ecodev/natural';
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {MatDialogModule} from '@angular/material/dialog';
 import {ProductService} from '../../products/services/product.service';
 import {OrderLineService} from '../services/order-lines.service';

client/app/admin/order/order-lines/order-lines.component.ts

@@ -1,6 +1,6 @@
-import {Component, inject, Input, input, OnInit} from '@angular/core';
+import {Component, inject, Input, input, type OnInit} from '@angular/core';
 import {
-    AvailableColumn,
+    type AvailableColumn,
     NaturalAbstractList,
     NaturalColumnsPickerComponent,
     NaturalEnumPipe,

client/app/admin/order/order/order.component.ts

@@ -1,19 +1,19 @@
 import {Component, inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogModule} from '@angular/material/dialog';
-import {NaturalAlertService, NaturalDialogTriggerProvidedData, NaturalSelectEnumComponent} from '@ecodev/natural';
+import {NaturalAlertService, type NaturalDialogTriggerProvidedData, NaturalSelectEnumComponent} from '@ecodev/natural';
 import {CurrencyPipe, DatePipe} from '@angular/common';
 import {
-    CurrentUserForProfileQuery,
-    OrderLinesQueryVariables,
-    OrderQuery,
-    OrderStatus,
+    type CurrentUserForProfileQuery,
+    type OrderLinesQueryVariables,
+    type OrderQuery,
+    type OrderStatus,
     UserRole,
 } from '../../../shared/generated-types';
 import {OrderService} from '../services/order.service';
 import {MatButton} from '@angular/material/button';
 import {OrderLinesComponent} from '../order-lines/order-lines.component';
 import {FormsModule} from '@angular/forms';
-import {Observable} from 'rxjs';
+import {type Observable} from 'rxjs';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 
 @Component({

client/app/admin/order/orders/orders.component.ts

@@ -1,6 +1,6 @@
-import {Component, inject, OnInit} from '@angular/core';
+import {Component, inject, type OnInit} from '@angular/core';
 import {
-    AvailableColumn,
+    type AvailableColumn,
     NaturalAbstractList,
     NaturalAvatarComponent,
     NaturalColumnsPickerComponent,

client/app/admin/order/services/order-line.resolver.ts

@@ -1,7 +1,7 @@
 import {inject} from '@angular/core';
-import {ActivatedRouteSnapshot} from '@angular/router';
+import {type ActivatedRouteSnapshot} from '@angular/router';
 import {last} from 'rxjs';
-import {ErrorService} from '../../../shared/components/error/error.service';
+import {ErrorService} from '@ecodev/natural';
 import {OrderLineService} from './order-lines.service';
 
 /**

client/app/admin/order/services/order-lines.queries.ts

@@ -1,4 +1,4 @@
-import {gql} from '@apollo/client/core';
+import {gql} from '@apollo/client';
 import {permissionsFragment, userMetaFragment} from '../../../shared/queries/fragments';
 
 export const orderLineMetaFragment = gql`