Skip to content

Commit 42c596e

Browse files
committed
fix(issues): fixed files and wiki issues
1 parent f8ac5f3 commit 42c596e

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

src/app/shared/components/files-tree/files-tree.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
[lazy]="true"
3232
[loading]="isLoadingMore()"
3333
[selectionMode]="selectionMode()"
34-
[selection]="selectedFiles()"
34+
[selection]="selectedNodes()"
3535
[scrollHeight]="scrollHeight()"
3636
[value]="nodes()"
3737
[virtualScroll]="true"

src/app/shared/components/files-tree/files-tree.component.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { select } from '@ngxs/store';
22

33
import { TranslatePipe } from '@ngx-translate/core';
44

5-
import { PrimeTemplate } from 'primeng/api';
5+
import { PrimeTemplate, TreeNode } from 'primeng/api';
66
import { Tree, TreeLazyLoadEvent, TreeNodeDropEvent, TreeNodeSelectEvent } from 'primeng/tree';
77

88
import { Clipboard } from '@angular/cdk/clipboard';
@@ -52,6 +52,9 @@ import { CurrentResourceSelectors } from '@shared/stores/current-resource';
5252
import { FileMenuComponent } from '../file-menu/file-menu.component';
5353
import { LoadingSpinnerComponent } from '../loading-spinner/loading-spinner.component';
5454

55+
// [NS] Temporary fix
56+
type FileTreeNode = FileModel & TreeNode;
57+
5558
@Component({
5659
selector: 'osf-files-tree',
5760
imports: [
@@ -149,6 +152,9 @@ export class FilesTreeComponent implements OnDestroy, AfterViewInit {
149152
}
150153
});
151154

155+
// [NS] Temporary fix
156+
readonly selectedNodes = computed(() => this.selectedFiles() as FileTreeNode[]);
157+
152158
constructor() {
153159
effect(() => {
154160
const storageChanged = this.storage();

src/app/shared/components/wiki/edit-section/edit-section.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h2 class="mr-2">{{ 'project.wiki.edit' | translate }}</h2>
2323
[options]="options"
2424
(onEditorLoaded)="onEditorLoaded($event)"
2525
(onPreviewDomChanged)="onPreviewDomChanged()"
26-
height="100%"
26+
height="400px"
2727
>
2828
<slot custom-btns>
2929
<button class="btn btn-sm btn-default" [attr.title]="'project.wiki.undo' | translate" (click)="undo()">

0 commit comments

Comments
 (0)