From b06883142c3179e13867ee1a7afd33f8ff66d9de Mon Sep 17 00:00:00 2001 From: Elblinator Date: Wed, 10 Apr 2024 10:26:30 +0200 Subject: [PATCH 1/3] add subscription --- .../pages/meetings/pages/agenda/agenda.subscription.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 index eee2d73986..f6857cb908 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts @@ -8,8 +8,6 @@ import { FollowList } from 'src/app/site/services/model-request-builder'; import { pollModelRequest } from '../polls/polls.subscription'; import { ViewListOfSpeakers, ViewTopic } from './modules'; -export const AGENDA_LIST_ITEM_SUBSCRIPTION = `agenda_list`; - export const agendaItemFollow: FollowList = [ { idField: `list_of_speakers_id`, @@ -43,6 +41,8 @@ export const agendaItemFollow: FollowList = [ } ]; +export const AGENDA_LIST_ITEM_SUBSCRIPTION = `agenda_list`; + export const getAgendaListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, @@ -59,6 +59,10 @@ export const getAgendaListSubscriptionConfig: SubscriptionConfigGenerator = (id: { idField: `list_of_speakers_id`, ...listOfSpeakersSpeakerCountSubscription + }, + { + idField: `submitter_ids`, + fieldset: FULL_FIELDSET } ] } From 9d74888320fa13927d1dc9829860abcc550122cd Mon Sep 17 00:00:00 2001 From: Elblinator Date: Wed, 10 Apr 2024 14:23:12 +0200 Subject: [PATCH 2/3] move subscriptions to top --- .../meetings/pages/agenda/agenda.subscription.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 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 index f6857cb908..a5ba2f4172 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts @@ -8,6 +8,12 @@ import { FollowList } from 'src/app/site/services/model-request-builder'; import { pollModelRequest } from '../polls/polls.subscription'; import { ViewListOfSpeakers, ViewTopic } from './modules'; +export const AGENDA_LIST_ITEM_SUBSCRIPTION = `agenda_list`; +export const AGENDA_LIST_ITEM_MINIMAL_SUBSCRIPTION = `agenda_list_minimal`; +export const TOPIC_ITEM_SUBSCRIPTION = `topic_detail`; +export const TOPIC_ITEM_DUBLICATE_SUBSCRIPTION = `topic_detail`; +export const LIST_OF_SPEAKERS_SUBSCRIPTION = `los_detail`; + export const agendaItemFollow: FollowList = [ { idField: `list_of_speakers_id`, @@ -41,8 +47,6 @@ export const agendaItemFollow: FollowList = [ } ]; -export const AGENDA_LIST_ITEM_SUBSCRIPTION = `agenda_list`; - export const getAgendaListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, @@ -74,8 +78,6 @@ export const getAgendaListSubscriptionConfig: SubscriptionConfigGenerator = (id: subscriptionName: AGENDA_LIST_ITEM_SUBSCRIPTION }); -export const AGENDA_LIST_ITEM_MINIMAL_SUBSCRIPTION = `agenda_list_minimal`; - export const getAgendaListMinimalSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewMeeting, @@ -96,8 +98,6 @@ export const getAgendaListMinimalSubscriptionConfig: SubscriptionConfigGenerator subscriptionName: AGENDA_LIST_ITEM_MINIMAL_SUBSCRIPTION }); -export const TOPIC_ITEM_SUBSCRIPTION = `topic_detail`; - export const getTopicDetailSubscriptionConfig: SubscriptionConfigGenerator = (...ids: Id[]) => ({ modelRequest: { viewModelCtor: ViewTopic, @@ -125,7 +125,7 @@ export const getTopicDuplicateSubscriptionConfig: SubscriptionConfigGenerator = ids, fieldset: FULL_FIELDSET }, - subscriptionName: TOPIC_ITEM_SUBSCRIPTION + subscriptionName: TOPIC_ITEM_DUBLICATE_SUBSCRIPTION }); export const listOfSpeakersSpeakerCountSubscription = { @@ -144,8 +144,6 @@ export const listOfSpeakersSpeakerCountSubscription = { ] }; -export const LIST_OF_SPEAKERS_SUBSCRIPTION = `los_detail`; - export const getListOfSpeakersDetailSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({ modelRequest: { viewModelCtor: ViewListOfSpeakers, From f04b082f9da940f4dd8b06e94fcb7b22c83a2838 Mon Sep 17 00:00:00 2001 From: Elblinator Date: Wed, 10 Apr 2024 15:43:06 +0200 Subject: [PATCH 3/3] typo --- .../site/pages/meetings/pages/agenda/agenda.subscription.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 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 index a5ba2f4172..26c5e00305 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts @@ -11,7 +11,7 @@ import { ViewListOfSpeakers, ViewTopic } from './modules'; export const AGENDA_LIST_ITEM_SUBSCRIPTION = `agenda_list`; export const AGENDA_LIST_ITEM_MINIMAL_SUBSCRIPTION = `agenda_list_minimal`; export const TOPIC_ITEM_SUBSCRIPTION = `topic_detail`; -export const TOPIC_ITEM_DUBLICATE_SUBSCRIPTION = `topic_detail`; +export const TOPIC_ITEM_DUPLICATE_SUBSCRIPTION = `topic_detail`; export const LIST_OF_SPEAKERS_SUBSCRIPTION = `los_detail`; export const agendaItemFollow: FollowList = [ @@ -125,7 +125,7 @@ export const getTopicDuplicateSubscriptionConfig: SubscriptionConfigGenerator = ids, fieldset: FULL_FIELDSET }, - subscriptionName: TOPIC_ITEM_DUBLICATE_SUBSCRIPTION + subscriptionName: TOPIC_ITEM_DUPLICATE_SUBSCRIPTION }); export const listOfSpeakersSpeakerCountSubscription = {