From 733d46b8ee4a2f30ad1c85371cecf4789cb14608 Mon Sep 17 00:00:00 2001 From: Ludwig Reiter Date: Thu, 11 Apr 2024 17:09:28 +0200 Subject: [PATCH 1/3] Move identifier of *.subscription.ts on top --- .../assignments/assignments.subscription.ts | 3 +-- .../mediafiles/mediafiles.subscription.ts | 3 +-- .../pages/motions/motions.subscription.ts | 21 +++++++------------ .../participants/participants.subscription.ts | 9 +++----- .../pages/polls/polls.subscription.ts | 7 +++---- .../projectors/projectors.subscription.ts | 6 ++---- .../organization/organization.subscription.ts | 4 ++-- .../committees/committees.subscription.ts | 9 +++----- 8 files changed, 23 insertions(+), 39 deletions(-) diff --git a/client/src/app/site/pages/meetings/pages/assignments/assignments.subscription.ts b/client/src/app/site/pages/meetings/pages/assignments/assignments.subscription.ts index 90b1432a2c..2a998078dc 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/assignments.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/assignments.subscription.ts @@ -7,6 +7,7 @@ import { listOfSpeakersSpeakerCountSubscription } from '../agenda/agenda.subscri import { pollModelRequest } from '../polls/polls.subscription'; export const ASSIGNMENT_LIST_SUBSCRIPTION = `assignment_list`; +export const ASSIGNMENT_LIST_MINIMAL_SUBSCRIPTION = `assignment_list_minimal`; export const getAssignmentSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { @@ -40,8 +41,6 @@ export const getAssignmentSubscriptionConfig: SubscriptionConfigGenerator = (id: subscriptionName: ASSIGNMENT_LIST_SUBSCRIPTION }); -export const ASSIGNMENT_LIST_MINIMAL_SUBSCRIPTION = `assignment_list_minimal`; - export const getAssignmentListMinimalSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, 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 index 83c60def49..c0c9234349 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/mediafiles.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/mediafiles.subscription.ts @@ -4,6 +4,7 @@ import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscript import { ViewMeeting } from '../../view-models/view-meeting'; export const MEDIAFILES_SUBSCRIPTION = `mediafiles_list`; +export const MEDIAFILES_LIST_MINIMAL_SUBSCRIPTION = `mediafiles_list_minimal`; export const getMediafilesSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { @@ -14,8 +15,6 @@ export const getMediafilesSubscriptionConfig: SubscriptionConfigGenerator = (id: subscriptionName: MEDIAFILES_SUBSCRIPTION }); -export const MEDIAFILES_LIST_MINIMAL_SUBSCRIPTION = `mediafiles_list_minimal`; - export const getMediafilesListMinimalSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, 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 index 8837032871..dfd9019a95 100644 --- a/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts @@ -9,10 +9,16 @@ import { pollModelRequest } from '../polls/polls.subscription'; import { ViewMotionWorkflow } from './modules'; import { ViewMotion } from './view-models'; -export const MOTION_LIST_SUBSCRIPTION = `motion_list`; -export const MOTION_LIST_MINIMAL_SUBSCRIPTION = `motion_list_minimal`; +export const AMENDMENT_LIST_SUBSCRIPTION = `amendment_list`; +export const MOTION_ADDITIONAL_DETAIL_SUBSCRIPTION = `motion_additional_detail`; export const MOTION_BLOCK_SUBSCRIPTION = `motion_block_list`; +export const MOTION_DETAIL_SUBSCRIPTION = `motion_detail`; +export const MOTION_FORWARD_DATA_SUBSCRIPTION = `motion_forward_data`; +export const MOTION_LIST_MINIMAL_SUBSCRIPTION = `motion_list_minimal`; +export const MOTION_LIST_SUBSCRIPTION = `motion_list`; export const MOTION_SUBMODELS_SUBSCRIPTION = `motion_submodel_list`; +export const MOTION_WORKFLOW_DETAIL_SUBSCRIPTION = `motion_workflow_detail`; +export const MOTION_WORKFLOW_SUBSCRIPTION = `motion_workflow_list`; export const getMotionListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { @@ -133,8 +139,6 @@ export const getMotionBlockSubscriptionConfig: SubscriptionConfigGenerator = (id subscriptionName: MOTION_BLOCK_SUBSCRIPTION }); -export const MOTION_WORKFLOW_SUBSCRIPTION = `motion_workflow_list`; - export const getMotionWorkflowSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, @@ -144,7 +148,6 @@ export const getMotionWorkflowSubscriptionConfig: SubscriptionConfigGenerator = subscriptionName: MOTION_WORKFLOW_SUBSCRIPTION }); -export const MOTION_WORKFLOW_DETAIL_SUBSCRIPTION = `motion_workflow_detail`; export const getMotionWorkflowDetailSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { ids: [id], @@ -186,8 +189,6 @@ export const getMotionsSubmodelSubscriptionConfig: SubscriptionConfigGenerator = subscriptionName: MOTION_SUBMODELS_SUBSCRIPTION }); -export const MOTION_ADDITIONAL_DETAIL_SUBSCRIPTION = `motion_additional_detail`; - export const getMotionAdditionalDetailSubscriptionConfig: SubscriptionConfigGenerator = (...ids: Id[]) => ({ modelRequest: { ids, @@ -198,8 +199,6 @@ export const getMotionAdditionalDetailSubscriptionConfig: SubscriptionConfigGene subscriptionName: MOTION_ADDITIONAL_DETAIL_SUBSCRIPTION }); -export const MOTION_DETAIL_SUBSCRIPTION = `motion_detail`; - export const getMotionDetailSubscriptionConfig: SubscriptionConfigGenerator = (...ids: Id[]) => ({ modelRequest: { ids, @@ -257,8 +256,6 @@ export const getMotionListMinimalSubscriptionConfig: SubscriptionConfigGenerator subscriptionName: MOTION_LIST_MINIMAL_SUBSCRIPTION }); -export const AMENDMENT_LIST_SUBSCRIPTION = `amendment_list`; - export const getAmendmentListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, @@ -283,8 +280,6 @@ export const getAmendmentListSubscriptionConfig: SubscriptionConfigGenerator = ( subscriptionName: AMENDMENT_LIST_SUBSCRIPTION }); -export const MOTION_FORWARD_DATA_SUBSCRIPTION = `motion_forward_data`; - export const getMotionForwardDataSubscriptionConfig: SubscriptionConfigGenerator = (...ids: Id[]) => ({ modelRequest: { ids, 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 index 4c0d7d80c9..bc1523e7e5 100644 --- a/client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts @@ -11,6 +11,9 @@ export const PARTICIPANT_LIST_SUBSCRIPTION = `participant_list`; export const PARTICIPANT_VOTE_INFO_SUBSCRIPTION = `participant_vote_info_list`; export const PARTICIPANT_IS_PRESENT_LIST_SUBSCRIPTION = `participant_is_present_list`; export const PARTICIPANT_LIST_SUBSCRIPTION_MINIMAL = `participant_list_minimal`; +export const PARTICIPANT_DETAIL_SUBSCRIPTION = `participant_detail`; +export const STRUCTURE_LEVEL_LIST_SUBSCRIPTION = `structure_level_list`; +export const SPEAKERS_LIST_SUBSCRIPTION = `speakers_list`; export const getParticipantVoteInfoSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { @@ -97,8 +100,6 @@ export const getParticipantMinimalSubscriptionConfig: SubscriptionConfigGenerato subscriptionName: PARTICIPANT_LIST_SUBSCRIPTION_MINIMAL }); -export const PARTICIPANT_DETAIL_SUBSCRIPTION = `participant_detail`; - export const getParticipantDetailSubscription: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewUser, @@ -114,8 +115,6 @@ export const getParticipantDetailSubscription: SubscriptionConfigGenerator = (id subscriptionName: PARTICIPANT_DETAIL_SUBSCRIPTION }); -export const STRUCTURE_LEVEL_LIST_SUBSCRIPTION = `structure_level_list`; - export const getStructureLevelListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, @@ -130,8 +129,6 @@ export const getStructureLevelListSubscriptionConfig: SubscriptionConfigGenerato subscriptionName: STRUCTURE_LEVEL_LIST_SUBSCRIPTION }); -export const SPEAKERS_LIST_SUBSCRIPTION = `speakers_list`; - export const getSpeakersListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, diff --git a/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts b/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts index 7bc02a4fbc..a59216f442 100644 --- a/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts @@ -7,6 +7,9 @@ import { BaseSimplifiedModelRequest } from 'src/app/site/services/model-request- import { ViewMeeting } from '../../view-models/view-meeting'; import { ViewPoll } from './view-models'; +export const POLL_LIST_SUBSCRIPTION = `poll_list`; +export const POLL_DETAIL_SUBSCRIPTION = `poll_detail`; + export const pollModelRequest: BaseSimplifiedModelRequest = { fieldset: FULL_FIELDSET, follow: [ @@ -33,8 +36,6 @@ export const pollModelRequest: BaseSimplifiedModelRequest = { ] }; -export const POLL_LIST_SUBSCRIPTION = `poll_list`; - export const getPollListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, @@ -44,8 +45,6 @@ export const getPollListSubscriptionConfig: SubscriptionConfigGenerator = (id: I subscriptionName: POLL_LIST_SUBSCRIPTION }); -export const POLL_DETAIL_SUBSCRIPTION = `poll_detail`; - export const getPollDetailSubscriptionConfig: SubscriptionConfigGenerator = (...ids: Id[]) => ({ modelRequest: { viewModelCtor: ViewPoll, 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 index 64d9ba6e41..aafdf23cdb 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts @@ -18,6 +18,8 @@ export const projectionContentObjectFieldset = [ ]; export const PROJECTOR_LIST_SUBSCRIPTION = `projector_list`; +export const PROJECTOR_LIST_MINIMAL_SUBSCRIPTION = `projector_list`; +export const PROJECTOR_SUBSCRIPTION = `projector_detail`; export const getProjectorListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { @@ -54,8 +56,6 @@ export const getProjectorListSubscriptionConfig: SubscriptionConfigGenerator = ( subscriptionName: PROJECTOR_LIST_SUBSCRIPTION }); -export const PROJECTOR_LIST_MINIMAL_SUBSCRIPTION = `projector_list`; - export const getProjectorListMinimalSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, @@ -66,8 +66,6 @@ export const getProjectorListMinimalSubscriptionConfig: SubscriptionConfigGenera subscriptionName: PROJECTOR_LIST_MINIMAL_SUBSCRIPTION }); -export const PROJECTOR_SUBSCRIPTION = `projector_detail`; - export const getProjectorSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewProjector, diff --git a/client/src/app/site/pages/organization/organization.subscription.ts b/client/src/app/site/pages/organization/organization.subscription.ts index 0bd7fa636e..0af40b6761 100644 --- a/client/src/app/site/pages/organization/organization.subscription.ts +++ b/client/src/app/site/pages/organization/organization.subscription.ts @@ -9,6 +9,8 @@ import { ViewOrganization } from 'src/app/site/pages/organization/view-models/vi import { DEFAULT_FIELDSET } from '../../services/model-request-builder'; +export const ORGANIZATION_SUBSCRIPTION = `organization_detail`; + export const getMeetingListSubscriptionConfig: SubscriptionConfigGenerator = () => ({ modelRequest: { viewModelCtor: ViewOrganization, @@ -22,8 +24,6 @@ export const getMeetingListSubscriptionConfig: SubscriptionConfigGenerator = () subscriptionName: MEETING_LIST_SUBSCRIPTION }); -export const ORGANIZATION_SUBSCRIPTION = `organization_detail`; - export const getOrganizationSubscriptionConfig: SubscriptionConfigGenerator = () => ({ modelRequest: { viewModelCtor: ViewOrganization, diff --git a/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts b/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts index 5b0103ae3c..e575739ea6 100644 --- a/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts +++ b/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts @@ -8,6 +8,9 @@ import { ViewMeeting } from '../../../meetings/view-models/view-meeting'; import { ViewCommittee } from './view-models'; export const COMMITTEE_LIST_SUBSCRIPTION = `committee_list`; +export const COMMITTEE_LIST_MINIMAL_SUBSCRIPTION = `committee_list`; +export const COMMITTEE_DETAIL_SUBSCRIPTION = `committee_detail`; +const MEETING_DETAIL_EDIT_SUBSCRIPTION = `committee_meeting_detail`; export const getCommitteeListSubscriptionConfig: SubscriptionConfigGenerator = () => ({ modelRequest: { @@ -20,8 +23,6 @@ export const getCommitteeListSubscriptionConfig: SubscriptionConfigGenerator = ( subscriptionName: COMMITTEE_LIST_SUBSCRIPTION }); -export const COMMITTEE_LIST_MINIMAL_SUBSCRIPTION = `committee_list`; - export const getCommitteeListMinimalSubscriptionConfig: SubscriptionConfigGenerator = () => ({ modelRequest: { viewModelCtor: ViewOrganization, @@ -45,8 +46,6 @@ export const getCommitteeListMinimalSubscriptionConfig: SubscriptionConfigGenera subscriptionName: COMMITTEE_LIST_SUBSCRIPTION }); -export const COMMITTEE_DETAIL_SUBSCRIPTION = `committee_detail`; - export const getCommitteeDetailSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewCommittee, @@ -66,8 +65,6 @@ export const getCommitteeDetailSubscriptionConfig: SubscriptionConfigGenerator = subscriptionName: COMMITTEE_DETAIL_SUBSCRIPTION }); -const MEETING_DETAIL_EDIT_SUBSCRIPTION = `committee_meeting_detail`; - export const getCommitteeMeetingDetailSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, From f88f9c633484375d7b24e1bafcbaab9501e47a84 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Tue, 16 Apr 2024 09:56:03 +0200 Subject: [PATCH 2/3] Update client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts --- .../pages/meetings/pages/projectors/projectors.subscription.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index aafdf23cdb..4205a5bb88 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts @@ -18,7 +18,7 @@ export const projectionContentObjectFieldset = [ ]; export const PROJECTOR_LIST_SUBSCRIPTION = `projector_list`; -export const PROJECTOR_LIST_MINIMAL_SUBSCRIPTION = `projector_list`; +export const PROJECTOR_LIST_MINIMAL_SUBSCRIPTION = `projector_list_minimal`; export const PROJECTOR_SUBSCRIPTION = `projector_detail`; export const getProjectorListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ From 84d1c81eb4e1266d2659c5690d29093abd56a2fd Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Tue, 16 Apr 2024 09:56:09 +0200 Subject: [PATCH 3/3] Update client/src/app/site/pages/organization/pages/committees/committees.subscription.ts --- .../organization/pages/committees/committees.subscription.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts b/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts index e575739ea6..554a8cdfca 100644 --- a/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts +++ b/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts @@ -8,7 +8,7 @@ import { ViewMeeting } from '../../../meetings/view-models/view-meeting'; import { ViewCommittee } from './view-models'; export const COMMITTEE_LIST_SUBSCRIPTION = `committee_list`; -export const COMMITTEE_LIST_MINIMAL_SUBSCRIPTION = `committee_list`; +export const COMMITTEE_LIST_MINIMAL_SUBSCRIPTION = `committee_list_minimal`; export const COMMITTEE_DETAIL_SUBSCRIPTION = `committee_detail`; const MEETING_DETAIL_EDIT_SUBSCRIPTION = `committee_meeting_detail`;