Move IdField and fieldset next to each other (#4352)

OpenSlides · Nov 15, 2024 · 4b3635c · 4b3635c
1 parent 759d894
commit 4b3635c
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts b/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts
@@ -128,13 +128,13 @@ export const listOfSpeakersSpeakerCountSubscription = {
     follow: [
         {
             idField: `speaker_ids`,
+            fieldset: [`begin_time`, `end_time`],
             follow: [
                 {
                     idField: `point_of_order_category_id`,
                     fieldset: FULL_FIELDSET
                 }
-            ],
-            fieldset: [`begin_time`, `end_time`]
+            ]
         }
     ]
 };
@@ -151,11 +151,11 @@ export const getListOfSpeakersDetailSubscriptionConfig: SubscriptionConfigGenera
                 follow: [
                     {
                         idField: `meeting_user_id`,
+                        fieldset: [`number`, `vote_weight`],
                         follow: [
                             { idField: `user_id`, ...UserFieldsets.FullNameSubscription },
                             { idField: `structure_level_ids`, fieldset: [`name`] }
-                        ],
-                        fieldset: [`number`, `vote_weight`]
+                        ]
                     },
                     {
                         idField: `structure_level_list_of_speakers_id`,

diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/mediafiles.subscription.ts b/client/src/app/site/pages/meetings/pages/mediafiles/mediafiles.subscription.ts
@@ -43,7 +43,7 @@ export const getMediafilesListMinimalSubscriptionConfig: SubscriptionConfigGener
     modelRequest: {
         viewModelCtor: ViewMeeting,
         ids: [id],
-        follow: [`mediafile_ids`, `meeting_mediafile_ids`]
+        follow: [{ idField: `mediafile_ids` }, { idField: `meeting_mediafile_ids` }]
     },
     subscriptionName: MEDIAFILES_LIST_MINIMAL_SUBSCRIPTION
 });
diff --git a/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts b/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts
@@ -119,12 +119,12 @@ export const getMotionWorkflowDetailSubscriptionConfig: SubscriptionConfigGenera
     modelRequest: {
         ids: [id],
         viewModelCtor: ViewMotionWorkflow,
+        fieldset: [],
         follow: [
             {
                 idField: `state_ids`
             }
-        ],
-        fieldset: ``
+        ]
     },
     subscriptionName: MOTION_WORKFLOW_DETAIL_SUBSCRIPTION
 });
@@ -189,13 +189,13 @@ export const getMotionDetailSubscriptionConfig: SubscriptionConfigGenerator = (.
             { idField: `comment_ids`, fieldset: FULL_FIELDSET },
             {
                 idField: `supporter_meeting_user_ids`,
+                fieldset: `participantListMinimal`,
                 follow: [
                     {
                         idField: `user_id`,
                         fieldset: `participantList`
                     }
-                ],
-                fieldset: `participantListMinimal`
+                ]
             }
         ],
         fieldset: [

diff --git a/client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts b/client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts
@@ -37,8 +37,8 @@ export const getParticipantVoteInfoSubscriptionConfig: SubscriptionConfigGenerat
                     },
                     {
                         idField: `vote_delegated_to_id`,
-                        follow: [{ idField: `user_id`, fieldset: [`is_present_in_meeting_ids`] }],
-                        fieldset: [`meeting_id`]
+                        fieldset: [`meeting_id`],
+                        follow: [{ idField: `user_id`, fieldset: [`is_present_in_meeting_ids`] }]
                     }
                 ]
             }

diff --git a/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts b/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts
@@ -24,6 +24,7 @@ export const getProjectorListSubscriptionConfig: SubscriptionConfigGenerator = (
     modelRequest: {
         viewModelCtor: ViewMeeting,
         ids: [id],
+        additionalFields: [`reference_projector_id`],
         follow: [
             {
                 idField: `projector_ids`,
@@ -61,14 +62,13 @@ export const getProjectorListSubscriptionConfig: SubscriptionConfigGenerator = (
                     }
                 ]
             },
-            `projector_countdown_ids`,
-            `projector_message_ids`,
-            ...MEETING_DEFAULT_PROJECTOR_IDS_KEYS,
+            { idField: `projector_countdown_ids` },
+            { idField: `projector_message_ids` },
             { idField: `speaker_ids`, additionalFields: [`meeting_user_id`] },
-            `list_of_speakers_ids`,
-            { idField: `agenda_item_ids`, fieldset: [`item_number`, `content_object_id`] }
-        ],
-        additionalFields: [`reference_projector_id`]
+            { idField: `list_of_speakers_ids` },
+            { idField: `agenda_item_ids`, fieldset: [`item_number`, `content_object_id`] },
+            ...MEETING_DEFAULT_PROJECTOR_IDS_KEYS
+        ]
     },
     subscriptionName: PROJECTOR_LIST_SUBSCRIPTION
 });

diff --git a/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts b/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts
@@ -54,14 +54,14 @@ export function getActiveMeetingSubscriptionConfig(id: Id, settingsKeys: string[
                 }, // TODO: Remove and count unread messages by chat_group_ids/chat_message_ids
                 {
                     idField: `poll_ids`,
+                    fieldset: [`title`, `state`, `entitled_group_ids`],
                     follow: [
                         {
                             idField: `content_object_id`,
                             fieldset: [`title`],
                             follow: [{ idField: `agenda_item_id`, fieldset: [`item_number`, `content_object_id`] }]
                         }
-                    ],
-                    fieldset: [`title`, `state`, `entitled_group_ids`]
+                    ]
                 },
                 {
                     idField: `point_of_order_category_ids`,

diff --git a/client/src/app/site/pages/organization/organization.subscription.ts b/client/src/app/site/pages/organization/organization.subscription.ts
@@ -56,11 +56,11 @@ function getMeetingListFollowConfig(
 ): any {
     return {
         idField: idField,
+        fieldset: `list`,
         follow: [
             { idField: `committee_id`, fieldset: `name` },
             { idField: `organization_tag_ids`, fieldset: FULL_FIELDSET }
-        ],
-        fieldset: `list`
+        ]
     };
 }
 

diff --git a/client/src/app/site/pages/organization/pages/accounts/accounts.subscription.ts b/client/src/app/site/pages/organization/pages/accounts/accounts.subscription.ts
@@ -16,8 +16,8 @@ export const getAccountDetailSubscriptionConfig: SubscriptionConfigGenerator = (
             { idField: `committee_ids`, fieldset: [`name`, `manager_ids`] },
             {
                 idField: `meeting_ids`,
-                follow: [{ idField: `group_ids`, fieldset: [`name`], isFullList: false }],
-                fieldset: [`name`, `committee_id`]
+                fieldset: [`name`, `committee_id`],
+                follow: [{ idField: `group_ids`, fieldset: [`name`], isFullList: false }]
             },
             { idField: `gender_id`, fieldset: [`name`] }
         ]

diff --git a/...src/app/site/pages/organization/pages/organization-tags/organization-tags.subscription.ts b/...src/app/site/pages/organization/pages/organization-tags/organization-tags.subscription.ts
@@ -9,6 +9,6 @@ export const getOrganizationTagListSubscriptionConfig: SubscriptionConfigGenerat
     modelRequest: {
         viewModelCtor: ViewOrganization,
         ids: [ORGANIZATION_ID],
-        follow: [`organization_tag_ids`]
+        follow: [{ idField: `organization_tag_ids` }]
     }
 });