Improved data display and added use restrictions

Javier Borrego · Javier Borrego · commit 6f0d2bb8319b · 2026-04-24T11:09:07.000+02:00
diff --git a/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.html b/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.html
@@ -10,16 +10,18 @@
 >
     <div class="references">
         <h1 aria-label="Insert/edit external link" mat-dialog-title translate>Insert/edit external link</h1>
-        <button #btn class="arrows" matIconButton (click)="toggleArrow('toggleExternalReference')">
-            @if (toggleExternalReference) {
-                <mat-icon>keyboard_arrow_up</mat-icon>
-            } @else {
-                <mat-icon>keyboard_arrow_down</mat-icon>
-            }
-        </button>
+        @if (allowedToEmbed) {
+            <button #btn class="arrows" matIconButton>
+                @if (toggleExternalReference) {
+                    <mat-icon>keyboard_arrow_up</mat-icon>
+                } @else {
+                    <mat-icon>keyboard_arrow_down</mat-icon>
+                }
+            </button>
+        }
     </div>
 </div>
-@if (toggleExternalReference) {
+@if (toggleExternalReference || !allowedToEmbed) {
     <div mat-dialog-content [formGroup]="externalLink">
         <div class="card-grid">
             <mat-form-field>
@@ -46,82 +48,88 @@ <h1 aria-label="Insert/edit external link" mat-dialog-title translate>Insert/edi
         </div>
     </div>
 }
-<div
-    cdkTrapFocus
-    class="title"
-    role="button"
-    tabindex="0"
-    (click)="toggleArrow('toggleInternalReference')"
-    (keydown.enter)="toggleArrow('toggleInternalReference')"
-    (keydown.space)="toggleArrow('toggleInternalReference')"
->
-    <div class="references">
-        <h1 aria-label="Link a topic/motion/assignment" mat-dialog-title translate>Link a topic/motion/assignment</h1>
-        <button class="arrows" matIconButton (click)="toggleArrow('toggleInternalReference')">
-            @if (toggleInternalReference) {
-                <mat-icon>keyboard_arrow_up</mat-icon>
-            } @else {
-                <mat-icon>keyboard_arrow_down</mat-icon>
-            }
-        </button>
-    </div>
-</div>
-@if (toggleInternalReference) {
-    <div mat-dialog-content>
-        <div class="card-grid" [formGroup]="internalRadioOptions">
-            <mat-radio-group aria-label="Select an option" class="radio-group" formControlName="options">
-                <mat-radio-button
-                    aria-label="Topics"
-                    translate
-                    [disabled]="!!externalUrl"
-                    [value]="0"
-                    (click)="changeEditMode()"
-                >
-                    Topics
-                </mat-radio-button>
-                <mat-radio-button
-                    aria-label="Motions"
-                    translate
-                    [disabled]="!!externalUrl"
-                    [value]="1"
-                    (click)="changeEditMode()"
-                >
-                    Motions
-                </mat-radio-button>
-                <mat-radio-button
-                    aria-label="Assignments"
-                    translate
-                    [disabled]="!!externalUrl"
-                    [value]="2"
-                    (click)="changeEditMode()"
-                >
-                    Assignments
-                </mat-radio-button>
-            </mat-radio-group>
-            <mat-form-field [formGroup]="internalReferenceForm">
-                <mat-label translate>
-                    {{ searchLists[selectedRepoValue].label }}
-                </mat-label>
-                @for (searchRepo of searchRepos; track $index) {
-                    @if (selectedRepoValue === $index) {
-                        <os-repo-search-selector
-                            formControlName="{{ searchLists[$index].label }}FormControl"
-                            [disabled]="!!externalUrl"
-                            [keepOpen]="searchRepo.keepOpen"
-                            [repo]="searchRepo"
-                            [subscriptionConfig]="subscriptionConfig"
-                            [wider]="searchRepo.wider"
-                        ></os-repo-search-selector>
-                    }
+
+@if (allowedToEmbed) {
+    <div
+        cdkTrapFocus
+        class="title"
+        role="button"
+        tabindex="0"
+        (click)="toggleArrow('toggleInternalReference')"
+        (keydown.enter)="toggleArrow('toggleInternalReference')"
+        (keydown.space)="toggleArrow('toggleInternalReference')"
+    >
+        <div class="references">
+            <h1 aria-label="Link a topic/motion/assignment" mat-dialog-title translate>
+                Link a topic/motion/assignment
+            </h1>
+            <button class="arrows" matIconButton>
+                @if (toggleInternalReference) {
+                    <mat-icon>keyboard_arrow_up</mat-icon>
+                } @else {
+                    <mat-icon>keyboard_arrow_down</mat-icon>
                 }
-            </mat-form-field>
-        </div>
-        <div class="clear-button">
-            <button aria-label="Reset" color="gray" mat-icon-button translate (click)="initForm()">
-                <mat-icon>clear</mat-icon>
             </button>
         </div>
     </div>
+
+    @if (toggleInternalReference) {
+        <div mat-dialog-content>
+            <div class="card-grid" [formGroup]="internalRadioOptions">
+                <mat-radio-group aria-label="Select an option" class="radio-group" formControlName="options">
+                    <mat-radio-button
+                        aria-label="Topics"
+                        translate
+                        [disabled]="!!externalUrl"
+                        [value]="0"
+                        (click)="changeEditMode()"
+                    >
+                        Topics
+                    </mat-radio-button>
+                    <mat-radio-button
+                        aria-label="Motions"
+                        translate
+                        [disabled]="!!externalUrl"
+                        [value]="1"
+                        (click)="changeEditMode()"
+                    >
+                        Motions
+                    </mat-radio-button>
+                    <mat-radio-button
+                        aria-label="Assignments"
+                        translate
+                        [disabled]="!!externalUrl"
+                        [value]="2"
+                        (click)="changeEditMode()"
+                    >
+                        Assignments
+                    </mat-radio-button>
+                </mat-radio-group>
+                <mat-form-field [formGroup]="internalReferenceForm">
+                    <mat-label translate>
+                        {{ searchLists[selectedRepoValue].label }}
+                    </mat-label>
+                    @for (searchRepo of searchRepos; track $index) {
+                        @if (selectedRepoValue === $index) {
+                            <os-repo-search-selector
+                                formControlName="{{ searchLists[$index].label }}FormControl"
+                                [disabled]="!!externalUrl"
+                                [keepOpen]="searchRepo.keepOpen"
+                                [repo]="searchRepo"
+                                [subscriptionConfig]="searchSubscriptionConfig[$index]"
+                                [wider]="searchRepo.wider"
+                            ></os-repo-search-selector>
+                        }
+                    }
+                </mat-form-field>
+            </div>
+            <div class="clear-button">
+                <button aria-label="Reset" color="gray" mat-icon-button translate (click)="initForm()">
+                    <mat-icon>clear</mat-icon>
+                </button>
+            </div>
+        </div>
+    }
 }
 
 <div class="matDialogActions" mat-dialog-actions>
diff --git a/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.scss b/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.scss
@@ -30,7 +30,7 @@ mat-form-field {
     outline: none;
     box-shadow: none;
     & h1 {
-        background-color: #eee;
+        text-decoration: underline 2px #ccc;
         border-radius: 25px;
     }
 }
diff --git a/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.ts b/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.ts
@@ -4,12 +4,14 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { AgendaItemRepositoryService } from 'src/app/gateways/repositories/agenda';
 import { AssignmentRepositoryService } from 'src/app/gateways/repositories/assignments/assignment-repository.service';
 import { MotionRepositoryService } from 'src/app/gateways/repositories/motions';
+import { TopicRepositoryService } from 'src/app/gateways/repositories/topics/topic-repository.service';
+import { ViewTopic } from 'src/app/site/pages/meetings/pages/agenda';
 import { getAgendaListMinimalSubscriptionConfig } from 'src/app/site/pages/meetings/pages/agenda/agenda.subscription';
-import { ViewAgendaItem } from 'src/app/site/pages/meetings/pages/agenda/view-models';
+import { getAssignmentListMinimalSubscriptionConfig } from 'src/app/site/pages/meetings/pages/assignments/assignments.subscription';
 import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments/view-models/view-assignment';
+import { getMotionListMinimalSubscriptionConfig } from 'src/app/site/pages/meetings/pages/motions/motions.subscription';
 import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions/view-models/view-motion';
 import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service';
 import { SubscribeToConfig } from 'src/app/site/services/model-request.service';
@@ -42,13 +44,17 @@ export class EditorLinkDialogComponent implements OnInit {
 
     public internalText = ``;
 
+    public allowedToEmbed: boolean;
+
     public toggleInternalReference: boolean;
     public toggleExternalReference: boolean;
 
+    // subscriptions config
+    public searchSubscriptionConfig;
     private activeMeetingIdService = inject(ActiveMeetingIdService);
-    public subscriptionConfig: SubscribeToConfig = getAgendaListMinimalSubscriptionConfig(
-        this.activeMeetingIdService.meetingId
-    );
+    public subscriptionTopicConfig: SubscribeToConfig;
+    public subscriptionMotionConfig: SubscribeToConfig;
+    public subscriptionAssignmentConfig: SubscribeToConfig;
 
     /**
      * Initial value of the input-field.
@@ -69,13 +75,13 @@ export class EditorLinkDialogComponent implements OnInit {
     /**
      * Init Repos
      */
-    public agendaItemRepo = inject(AgendaItemRepositoryService);
+    public agendaItemRepo = inject(TopicRepositoryService);
     public motionItemRepo = inject(MotionRepositoryService);
     public assignmentItemRepo = inject(AssignmentRepositoryService);
     /**
      * Define lists
      */
-    protected agendaItemList: Observable<ViewAgendaItem<any>[]>;
+    protected agendaItemList: Observable<ViewTopic[]>;
     protected motionItemList: Observable<ViewMotion[]>;
     protected assignmentItemList: Observable<ViewAssignment[]>;
 
@@ -143,18 +149,30 @@ export class EditorLinkDialogComponent implements OnInit {
     }
 
     public ngOnInit(): void {
-        this.agendaItemList = this.agendaItemRepo.getSortedViewModelListObservable();
-        this.motionItemList = this.motionItemRepo.getSortedViewModelListObservable();
-        this.assignmentItemList = this.assignmentItemRepo.getSortedViewModelListObservable();
-
-        this.searchLists = [
-            { observable: this.agendaItemList, label: this.translate.instant('Topic') },
-            { observable: this.motionItemList, label: this.translate.instant('Motion') },
-            { observable: this.assignmentItemList, label: this.translate.instant('Assignment') }
-        ];
-        this.searchRepos = [this.agendaItemRepo, this.motionItemRepo, this.assignmentItemRepo];
-        this.initInput();
-        this.initForm();
+        if ((this.allowedToEmbed = !this.router.url.includes('motions') ? true : false)) {
+            this.agendaItemList = this.agendaItemRepo.getViewModelListObservable();
+            this.motionItemList = this.motionItemRepo.getSortedViewModelListObservable();
+            this.assignmentItemList = this.assignmentItemRepo.getSortedViewModelListObservable();
+            this.searchLists = [
+                { observable: this.agendaItemList, label: this.translate.instant('Topic') },
+                { observable: this.motionItemList, label: this.translate.instant('Motion') },
+                { observable: this.assignmentItemList, label: this.translate.instant('Assignment') }
+            ];
+            this.searchRepos = [this.agendaItemRepo, this.motionItemRepo, this.assignmentItemRepo];
+            this.searchSubscriptionConfig = [
+                (this.subscriptionTopicConfig = getAgendaListMinimalSubscriptionConfig(
+                    this.activeMeetingIdService.meetingId
+                )),
+                (this.subscriptionMotionConfig = getMotionListMinimalSubscriptionConfig(
+                    this.activeMeetingIdService.meetingId
+                )),
+                (this.subscriptionAssignmentConfig = getAssignmentListMinimalSubscriptionConfig(
+                    this.activeMeetingIdService.meetingId
+                ))
+            ];
+            this.initInput();
+            this.initForm();
+        }
     }
 
     public removeLink(): void {
@@ -244,20 +262,13 @@ export class EditorLinkDialogComponent implements OnInit {
     }
 
     public urlBuilder(item): string {
-        const parts = item.content_object_id?.split('/');
-        const isAgendaItem = item.collection === 'agenda_item' && item.content_object_id?.split('/')[0] === 'topic';
-        const setCollection: string = isAgendaItem
-            ? 'agenda/topic'
-            : item.collection === 'agenda_item'
-              ? parts?.[0]
-              : item.collection;
-        const setId: number = isAgendaItem
-            ? item.content_object.sequential_number
-            : item.content_object_id
-              ? parts?.[1]
-              : item.sequential_number;
-        const builtUrl = `${this.activeMeetingIdService.meetingId}/${setCollection}s/${setId}`;
-        const url = this.router.url.replace(/^\/.*$/, `/${builtUrl}`);
+        const isAgendaItem = item.collection === 'topic';
+        console.log(isAgendaItem, item.collection, item.id, item.sequential_number);
+        const setCollection: string = isAgendaItem ? 'agenda/topic' : item.collection;
+        const builtUrl = `${this.activeMeetingIdService.meetingId}/${setCollection}s/`;
+        const setId: number = item.collection === 'assignment' ? item.id : item.sequential_number;
+        console.log(builtUrl);
+        const url = this.router.url.replace(/^\/.*$/, `/${builtUrl}${setId}`);
         return url;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ mat-form-field {`
`30`	`30`	`outline: none;`
`31`	`31`	`box-shadow: none;`
`32`	`32`	`& h1 {`
`33`		`- background-color: #eee;`
	`33`	`+ text-decoration: underline 2px #ccc;`
`34`	`34`	`border-radius: 25px;`
`35`	`35`	`}`
`36`	`36`	`}`