Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move identifier of *.subscription.ts on top #3550

Merged
merged 3 commits into from
Apr 16, 2024
Merged

Move identifier of *.subscription.ts on top #3550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
733d46b
Move identifier of *.subscription.ts on top
reiterl Apr 11, 2024
f88f9c6
Update client/src/app/site/pages/meetings/pages/projectors/projectors…
bastianjoel Apr 16, 2024
84d1c81
Update client/src/app/site/pages/organization/pages/committees/commit…
bastianjoel Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions client/src/app/site/pages/meetings/pages/assignments/assignments.subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions client/src/app/site/pages/meetings/pages/mediafiles/mediafiles.subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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,
Expand Down
21 changes: 8 additions & 13 deletions client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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,
Expand All @@ -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],
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
9 changes: 3 additions & 6 deletions client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
7 changes: 3 additions & 4 deletions client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand All @@ -33,8 +36,6 @@ export const pollModelRequest: BaseSimplifiedModelRequest = {
]
};

export const POLL_LIST_SUBSCRIPTION = `poll_list`;

export const getPollListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({
modelRequest: {
viewModelCtor: ViewMeeting,
Expand All @@ -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,
Expand Down
6 changes: 2 additions & 4 deletions client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export const projectionContentObjectFieldset = [
];

export const PROJECTOR_LIST_SUBSCRIPTION = `projector_list`;
export const PROJECTOR_LIST_MINIMAL_SUBSCRIPTION = `projector_list_minimal`;
export const PROJECTOR_SUBSCRIPTION = `projector_detail`;

export const getProjectorListSubscriptionConfig: SubscriptionConfigGenerator = (id: Id) => ({
modelRequest: {
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/site/pages/organization/organization.subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
9 changes: 3 additions & 6 deletions client/src/app/site/pages/organization/pages/committees/committees.subscription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_minimal`;
export const COMMITTEE_DETAIL_SUBSCRIPTION = `committee_detail`;
const MEETING_DETAIL_EDIT_SUBSCRIPTION = `committee_meeting_detail`;

export const getCommitteeListSubscriptionConfig: SubscriptionConfigGenerator = () => ({
modelRequest: {
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
Loading