Changes

Author: Elblinator

client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts

@@ -1,10 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Id } from 'src/app/domain/definitions/key-types';
-import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc';
 import { MeetingUser } from 'src/app/domain/models/meeting-users/meeting-user';
 import { toDecimal } from 'src/app/infrastructure/utils';
 import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user';
-import { Fieldsets, TypedFieldset } from 'src/app/site/services/model-request-builder';
+import { DEFAULT_FIELDSET, Fieldsets, TypedFieldset } from 'src/app/site/services/model-request-builder';
 
 import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository';
 import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service';
@@ -41,7 +40,7 @@ export class MeetingUserRepositoryService extends BaseMeetingRelatedRepository<V
         const detailFields: TypedFieldset<MeetingUser> = [`about_me`, `user_id`, `meeting_id`];
 
         return {
-            [FULL_FIELDSET]: detailFields,
+            [DEFAULT_FIELDSET]: detailFields,
             groups: groupFields,
             participantListMinimal: participantListFieldsMinimal,
             all: detailFields.concat(participantListFieldsMinimal)

client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts

@@ -1,9 +1,8 @@
 import { Injectable } from '@angular/core';
 import { _ } from '@ngx-translate/core';
-import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc';
 import { PollCandidateList } from 'src/app/domain/models/poll-candidate-lists/poll-candidate-list';
 import { ViewPollCandidateList } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list';
-import { Fieldsets } from 'src/app/site/services/model-request-builder';
+import { DEFAULT_FIELDSET, Fieldsets } from 'src/app/site/services/model-request-builder';
 
 import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository';
 import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service';
@@ -35,7 +34,7 @@ export class PollCandidateListRepositoryService extends BaseMeetingRelatedReposi
     public override getFieldsets(): Fieldsets<PollCandidateList> {
         const detailFieldset: (keyof PollCandidateList)[] = [`poll_candidate_ids`, `option_id`, `meeting_id`];
         return {
-            [FULL_FIELDSET]: detailFieldset
+            [DEFAULT_FIELDSET]: detailFieldset
         };
     }
 }

client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
-import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc';
 import { PollCandidate } from 'src/app/domain/models/poll-candidate-lists/poll-candidate';
 import { ViewPollCandidate } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate';
-import { Fieldsets } from 'src/app/site/services/model-request-builder';
+import { DEFAULT_FIELDSET, Fieldsets } from 'src/app/site/services/model-request-builder';
 
 import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository';
 import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service';
@@ -31,7 +30,7 @@ export class PollCandidateRepositoryService extends BaseMeetingRelatedRepository
     public override getFieldsets(): Fieldsets<PollCandidate> {
         const detailFieldset: (keyof PollCandidate)[] = [`poll_candidate_list_id`, `user_id`, `weight`, `meeting_id`];
         return {
-            [FULL_FIELDSET]: detailFieldset
+            [DEFAULT_FIELDSET]: detailFieldset
         };
     }
 }

client/src/app/site/pages/login/pages/login-mask/components/login-mask/login-mask.component.ts

@@ -4,7 +4,6 @@ import { ActivatedRoute } from '@angular/router';
 import { _ } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { filter, Observable, Subscription } from 'rxjs';
-import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc';
 import { Meeting } from 'src/app/domain/models/meetings/meeting';
 import { fadeInAnim } from 'src/app/infrastructure/animations';
 import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component';
@@ -14,7 +13,7 @@ import { OrganizationSettingsService } from 'src/app/site/pages/organization/ser
 import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization';
 import { AuthService } from 'src/app/site/services/auth.service';
 import { AutoupdateService } from 'src/app/site/services/autoupdate';
-import { ModelRequestBuilderService } from 'src/app/site/services/model-request-builder';
+import { DEFAULT_FIELDSET, ModelRequestBuilderService } from 'src/app/site/services/model-request-builder';
 import { OpenSlidesRouterService } from 'src/app/site/services/openslides-router.service';
 import { OperatorService } from 'src/app/site/services/operator.service';
 import { ParentErrorStateMatcher } from 'src/app/ui/modules/search-selector/validators';
@@ -239,7 +238,7 @@ export class LoginMaskComponent extends BaseMeetingComponent implements OnInit,
             await this.modelRequestBuilder.build({
                 ids: [ORGANIZATION_ID],
                 viewModelCtor: ViewOrganization,
-                fieldset: FULL_FIELDSET,
+                fieldset: DEFAULT_FIELDSET,
                 follow: [{ idField: `active_meeting_ids`, fieldset: [`enable_anonymous`] }]
             }),
             `meeting_login`

client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.ts

@@ -5,7 +5,6 @@ import { ActivatedRoute } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { distinctUntilChanged, filter, Observable, Subject, Subscription, switchMap } from 'rxjs';
 import { Collection, Fqid, Id } from 'src/app/domain/definitions/key-types';
-import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc';
 import { Selectable } from 'src/app/domain/interfaces';
 import { Assignment } from 'src/app/domain/models/assignments/assignment';
 import { BaseModel } from 'src/app/domain/models/base/base-model';
@@ -25,6 +24,7 @@ import {
 import { BaseViewModel } from 'src/app/site/base/base-view-model';
 import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component';
 import { CollectionMapperService } from 'src/app/site/services/collection-mapper.service';
+import { DEFAULT_FIELDSET } from 'src/app/site/services/model-request-builder';
 import { OperatorService } from 'src/app/site/services/operator.service';
 import { ViewModelStoreService } from 'src/app/site/services/view-model-store.service';
 
@@ -323,7 +323,7 @@ export class HistoryListComponent extends BaseMeetingComponent implements OnInit
                 modelRequest: {
                     viewModelCtor: this.collectionMapperService.getViewModelConstructor(collection),
                     ids,
-                    fieldset: FULL_FIELDSET
+                    fieldset: DEFAULT_FIELDSET
                 },
                 subscriptionName
             });
@@ -354,7 +354,7 @@ export class HistoryListComponent extends BaseMeetingComponent implements OnInit
             modelRequest: {
                 viewModelCtor: this.collectionMapperService.getViewModelConstructor(collection),
                 ids: [id],
-                fieldset: FULL_FIELDSET,
+                fieldset: DEFAULT_FIELDSET,
                 follow: [
                     {
                         idField: `history_entry_ids`,

client/src/app/site/pages/meetings/pages/mediafiles/mediafiles.subscription.ts

@@ -43,7 +43,6 @@ export const getMediafilesListMinimalSubscriptionConfig: SubscriptionConfigGener
     modelRequest: {
         viewModelCtor: ViewMeeting,
         ids: [id],
-        fieldset: FULL_FIELDSET,
         follow: [
             { idField: `mediafile_ids`, fieldset: [`id`, `owner_id`, `title`, `filename`] },
             { idField: `meeting_mediafile_ids`, fieldset: [] }

client/src/app/site/pages/meetings/services/active-polls.subscription.ts

@@ -1,5 +1,4 @@
 import { Id } from 'src/app/domain/definitions/key-types';
-import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc';
 import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config';
 
 import { ViewPoll } from '../pages/polls';
@@ -11,7 +10,6 @@ export const getActivePollsSubscriptionConfig: SubscriptionConfigGenerator = (..
     modelRequest: {
         viewModelCtor: ViewPoll,
         ids: ids,
-        fieldset: FULL_FIELDSET,
         ...pollModelRequest
     },
     subscriptionName: ACTIVE_POLLS_SUBSCRIPTION

client/src/app/site/services/model-request-builder/model-request-builder.service.ts

@@ -126,7 +126,7 @@ export class ModelRequestBuilderService {
         const fieldset = modelRequestObject.simplifiedRequest.fieldset || FULL_FIELDSET;
         let fieldsetFields: AdditionalField[];
         if (!modelRequestObject.simplifiedRequest.fieldset) {
-            console.warn(`Non explicit use of default fieldset`, [modelRequestObject], modelRequestObject.collection);
+            console.warn(`Non explicit use of full fieldset`, [modelRequestObject], modelRequestObject.collection);
         }
 
         if (typeof fieldset === `string`) {