Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
feat(frontend): extend group parent model with description and adjust anchor file dialog layout
johaven01bc72bfd9e3
diff --git a/backend/src/applications/users/interfaces/admin-group.interface.ts b/backend/src/applications/users/interfaces/admin-group.interface.tsindex cc21e4e9..5cc12820 100644--- a/backend/src/applications/users/interfaces/admin-group.interface.ts+++ b/backend/src/applications/users/interfaces/admin-group.interface.ts@@ -10,5 +10,5 @@ export interface AdminGroup extends Omit<Group, 'parentId' | 'type'> {visibility: GROUP_VISIBILITYcreatedAt: DatemodifiedAt: Date- parent: Pick<Group, 'id' | 'name'>+ parent: Pick<Group, 'id' | 'name'> & { description?: Group['description'] }}diff --git a/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.ts b/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.tsindex 2410fee3..d782bbed 100644--- a/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.ts+++ b/frontend/src/app/applications/admin/components/dialogs/admin-group-dialog.component.ts@@ -79,7 +79,7 @@ export class AdminGroupDialogComponent implements OnInit {}onSetParent(item: AdminGroupModel['parent']) {- this.groupForm.controls.parent.setValue(item ? { id: item.id, name: item.name } : null)+ this.groupForm.controls.parent.setValue(item ? { id: item.id, name: item.name, description: item.description } : null)this.groupForm.controls.parent.markAsDirty()}@@ -88,9 +88,9 @@ export class AdminGroupDialogComponent implements OnInit {search: query,onlyGroups: true,excludePersonalGroups: true,- ignoreGroupIds: this.groupForm.value.parent ? [this.groupForm.value.parent.id] : []+ ignoreGroupIds: [this.group.id, ...(this.groupForm.value.parent ? [this.groupForm.value.parent.id] : [])]}- return this.adminService.searchMembers(search, true)+ return this.adminService.searchMembers(search)}onSubmit() {diff --git a/frontend/src/app/applications/spaces/components/dialogs/space-anchor-file-dialog.component.html b/frontend/src/app/applications/spaces/components/dialogs/space-anchor-file-dialog.component.htmlindex fafda0d1..4e1ca318 100644--- a/frontend/src/app/applications/spaces/components/dialogs/space-anchor-file-dialog.component.html+++ b/frontend/src/app/applications/spaces/components/dialogs/space-anchor-file-dialog.component.html@@ -9,7 +9,7 @@<button (click)="layout.closeDialog()" aria-label="Close" class="btn-close btn-close-white ms-auto" type="button"></button></div><div class="modal-body">- <div class="mb-3">+ <div class="mb-3 col-12 col-md-7"><label for="space" l10nTranslate>Space</label><app-select id="space"[searchFunction]="onSearchSpaces.bind(this)"diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts b/frontend/src/app/applications/spaces/components/spaces-browser.component.tsindex 3855e93a..bb27c683 100644--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts@@ -550,7 +550,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy}openSpaceAnchorFileDialog() {- const modalRef: BsModalRef<SpaceAnchorFileDialogComponent> = this.layout.openDialog(SpaceAnchorFileDialogComponent, 'lg', {+ const modalRef: BsModalRef<SpaceAnchorFileDialogComponent> = this.layout.openDialog(SpaceAnchorFileDialogComponent, 'md', {initialState: { files: this.selection } as SpaceAnchorFileDialogComponent})modalRef.content.addAnchoredFiles.pipe(take(1)).subscribe((up: { space: SpaceModel; rootFiles: { id: number; name: string }[] }) => {