Suffix all queries with "Query" #12176

This avoids name collision with fragments whose usage
should be prioritized over queries.

Author: PowerKiKi

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

@@ -6,7 +6,7 @@ import {
     NaturalSidenavContainerComponent,
     NaturalSidenavContentComponent,
 } from '@ecodev/natural';
-import {CurrentUserForProfile} from '../../shared/generated-types';
+import {CurrentUserForProfileQuery} from '../../shared/generated-types';
 import {MatListItem, MatNavList} from '@angular/material/list';
 import {
     MatAccordion,
@@ -44,7 +44,7 @@ import {MatToolbar} from '@angular/material/toolbar';
 export class AdminComponent implements OnInit {
     private readonly route = inject(ActivatedRoute);
 
-    protected viewer: CurrentUserForProfile['viewer'] = null;
+    protected viewer: CurrentUserForProfileQuery['viewer'] = null;
 
     public ngOnInit(): void {
         this.viewer = this.route.snapshot.data.viewer ? this.route.snapshot.data.viewer : null;

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

@@ -31,7 +31,7 @@ const commentMetaFragment = gql`
 `;
 
 export const commentsQuery = gql`
-    query Comments($filter: CommentFilter, $sorting: [CommentSorting!], $pagination: PaginationInput) {
+    query CommentsQuery($filter: CommentFilter, $sorting: [CommentSorting!], $pagination: PaginationInput) {
         comments(filter: $filter, sorting: $sorting, pagination: $pagination) {
             items {
                 ...CommentMeta
@@ -45,7 +45,7 @@ export const commentsQuery = gql`
 `;
 
 export const commentQuery = gql`
-    query Comment($id: CommentID!) {
+    query CommentQuery($id: CommentID!) {
         comment(id: $id) {
             ...CommentMeta
             permissions {

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

@@ -1,11 +1,11 @@
 import {Injectable} from '@angular/core';
 import {NaturalAbstractModelService} from '@ecodev/natural';
 import {
-    Comment,
+    CommentQuery,
     CommentInput,
-    Comments,
-    CommentsVariables,
-    CommentVariables,
+    CommentsQuery,
+    CommentsQueryVariables,
+    CommentQueryVariables,
     CreateComment,
     CreateCommentVariables,
     DeleteComments,
@@ -19,10 +19,10 @@ import {commentQuery, commentsQuery, createComment, deleteComments, updateCommen
     providedIn: 'root',
 })
 export class CommentService extends NaturalAbstractModelService<
-    Comment['comment'],
-    CommentVariables,
-    Comments['comments'],
-    CommentsVariables,
+    CommentQuery['comment'],
+    CommentQueryVariables,
+    CommentsQuery['comments'],
+    CommentsQueryVariables,
     CreateComment['createComment'],
     CreateCommentVariables,
     UpdateComment['updateComment'],

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

@@ -2,7 +2,7 @@ import {gql} from '@apollo/client/core';
 import {userMetaFragment} from '../../../shared/queries/fragments';
 
 export const eventsQuery = gql`
-    query Events($filter: EventFilter, $sorting: [EventSorting!], $pagination: PaginationInput) {
+    query EventsQuery($filter: EventFilter, $sorting: [EventSorting!], $pagination: PaginationInput) {
         events(filter: $filter, sorting: $sorting, pagination: $pagination) {
             items {
                 id
@@ -19,7 +19,7 @@ export const eventsQuery = gql`
 `;
 
 export const eventQuery = gql`
-    query Event($id: EventID!) {
+    query EventQuery($id: EventID!) {
         event(id: $id) {
             id
             name

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

@@ -5,11 +5,11 @@ import {
     CreateEventVariables,
     DeleteEvents,
     DeleteEventsVariables,
-    Event,
+    EventQuery,
     EventInput,
-    Events,
-    EventsVariables,
-    EventVariables,
+    EventsQuery,
+    EventsQueryVariables,
+    EventQueryVariables,
     UpdateEvent,
     UpdateEventVariables,
 } from '../../../shared/generated-types';
@@ -20,10 +20,10 @@ import {Validators} from '@angular/forms';
     providedIn: 'root',
 })
 export class EventService extends NaturalAbstractModelService<
-    Event['event'],
-    EventVariables,
-    Events['events'],
-    EventsVariables,
+    EventQuery['event'],
+    EventQueryVariables,
+    EventsQuery['events'],
+    EventsQueryVariables,
     CreateEvent['createEvent'],
     CreateEventVariables,
     UpdateEvent['updateEvent'],

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

@@ -23,7 +23,7 @@ export const facilitatorDocumentMetaFragment = gql`
 `;
 
 export const facilitatorDocumentsQuery = gql`
-    query FacilitatorDocuments(
+    query FacilitatorDocumentsQuery(
         $filter: FacilitatorDocumentFilter
         $sorting: [FacilitatorDocumentSorting!]
         $pagination: PaginationInput
@@ -41,7 +41,7 @@ export const facilitatorDocumentsQuery = gql`
 `;
 
 export const facilitatorDocumentQuery = gql`
-    query FacilitatorDocument($id: FacilitatorDocumentID!) {
+    query FacilitatorDocumentQuery($id: FacilitatorDocumentID!) {
         facilitatorDocument(id: $id) {
             ...FacilitatorDocumentMeta
             permissions {

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

@@ -5,11 +5,11 @@ import {
     CreateFacilitatorDocumentVariables,
     DeleteFacilitatorDocuments,
     DeleteFacilitatorDocumentsVariables,
-    FacilitatorDocument,
+    FacilitatorDocumentQuery,
     FacilitatorDocumentInput,
-    FacilitatorDocuments,
-    FacilitatorDocumentsVariables,
-    FacilitatorDocumentVariables,
+    FacilitatorDocumentsQuery,
+    FacilitatorDocumentsQueryVariables,
+    FacilitatorDocumentQueryVariables,
     UpdateFacilitatorDocument,
     UpdateFacilitatorDocumentVariables,
 } from '../../../shared/generated-types';
@@ -25,10 +25,10 @@ import {
     providedIn: 'root',
 })
 export class FacilitatorDocumentsService extends NaturalAbstractModelService<
-    FacilitatorDocument['facilitatorDocument'],
-    FacilitatorDocumentVariables,
-    FacilitatorDocuments['facilitatorDocuments'],
-    FacilitatorDocumentsVariables,
+    FacilitatorDocumentQuery['facilitatorDocument'],
+    FacilitatorDocumentQueryVariables,
+    FacilitatorDocumentsQuery['facilitatorDocuments'],
+    FacilitatorDocumentsQueryVariables,
     CreateFacilitatorDocument['createFacilitatorDocument'],
     CreateFacilitatorDocumentVariables,
     UpdateFacilitatorDocument['updateFacilitatorDocument'],

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

@@ -2,7 +2,7 @@ import {gql} from '@apollo/client/core';
 import {userMetaFragment} from '../../../shared/queries/fragments';
 
 export const newsesQuery = gql`
-    query Newses($filter: NewsFilter, $sorting: [NewsSorting!], $pagination: PaginationInput) {
+    query NewsesQuery($filter: NewsFilter, $sorting: [NewsSorting!], $pagination: PaginationInput) {
         newses(filter: $filter, sorting: $sorting, pagination: $pagination) {
             items {
                 id
@@ -19,7 +19,7 @@ export const newsesQuery = gql`
 `;
 
 export const newsQuery = gql`
-    query News($id: NewsID!) {
+    query NewsQuery($id: NewsID!) {
         news(id: $id) {
             id
             isActive

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

@@ -5,12 +5,12 @@ import {
     CreateNewsVariables,
     DeleteNewses,
     DeleteNewsesVariables,
-    News,
-    Newses,
-    NewsesVariables,
+    NewsQuery,
+    NewsesQuery,
+    NewsesQueryVariables,
     NewsInput,
     NewsPartialInput,
-    NewsVariables,
+    NewsQueryVariables,
     UpdateNews,
     UpdateNewsVariables,
 } from '../../../shared/generated-types';
@@ -21,10 +21,10 @@ import {Validators} from '@angular/forms';
     providedIn: 'root',
 })
 export class NewsService extends NaturalAbstractModelService<
-    News['news'],
-    NewsVariables,
-    Newses['newses'],
-    NewsesVariables,
+    NewsQuery['news'],
+    NewsQueryVariables,
+    NewsesQuery['newses'],
+    NewsesQueryVariables,
     CreateNews['createNews'],
     CreateNewsVariables,
     UpdateNews['updateNews'],

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

@@ -3,9 +3,9 @@ import {MAT_DIALOG_DATA, MatDialogModule} from '@angular/material/dialog';
 import {NaturalAlertService, NaturalDialogTriggerProvidedData, NaturalSelectEnumComponent} from '@ecodev/natural';
 import {CurrencyPipe, DatePipe} from '@angular/common';
 import {
-    CurrentUserForProfile,
-    Order,
-    OrderLinesVariables,
+    CurrentUserForProfileQuery,
+    OrderQuery,
+    OrderLinesQueryVariables,
     OrderStatus,
     UserRole,
 } from '../../../shared/generated-types';
@@ -35,17 +35,17 @@ export class OrderComponent {
     protected readonly orderService = inject(OrderService);
     private readonly alertService = inject(NaturalAlertService);
 
-    protected forcedVariables: OrderLinesVariables = {};
+    protected forcedVariables: OrderLinesQueryVariables = {};
 
     /**
      * Preserves usual model that extends AbstractDetail where main object in stored in data.model
      */
-    protected data!: {model: Order['order']};
+    protected data!: {model: OrderQuery['order']};
 
     /**
      * Currently connected user
      */
-    protected viewer: CurrentUserForProfile['viewer'] = null;
+    protected viewer: CurrentUserForProfileQuery['viewer'] = null;
 
     /**
      * Template usage
@@ -58,7 +58,7 @@ export class OrderComponent {
             : null;
 
         // Initialize resolved item
-        const model$ = this.dialogData.activatedRoute.snapshot.data.model as Observable<Order['order']>;
+        const model$ = this.dialogData.activatedRoute.snapshot.data.model as Observable<OrderQuery['order']>;
         model$.pipe(takeUntilDestroyed()).subscribe(order => {
             this.data = {model: order};
             // Filter productLines for this current order