Merge branch 'main' into test/387-settings-page-tokens

Author: dinlvkdn

eslint.config.js

@@ -82,6 +82,7 @@ module.exports = tseslint.config(
       ],
       'simple-import-sort/exports': 'error',
       'unused-imports/no-unused-imports': 'error',
+      'no-console': 'error',
     },
   },
   {

src/app/features/project/addons/addons.component.spec.ts

@@ -10,7 +10,7 @@ import { AddonsComponent } from './addons.component';
 
 import { OSFTestingModule } from '@testing/osf.testing.module';
 
-describe('AddonsComponent', () => {
+describe('Component: Addons', () => {
   let component: AddonsComponent;
   let fixture: ComponentFixture<AddonsComponent>;
 
@@ -33,10 +33,6 @@ describe('AddonsComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
   it('should render the connected description paragraph', () => {
     component['selectedTab'].set(component['AddonTabValue'].ALL_ADDONS);
     fixture.detectChanges();

src/app/features/project/addons/components/configure-addon/configure-addon.component.html

@@ -65,6 +65,7 @@ <h2 class="align-self-center">
       </div>
       <osf-folder-selector
         [isGoogleFilePicker]="isGoogleDrive()"
+        [accountId]="addon()?.baseAccountId || ''"
         [accountName]="addon()?.displayName || ''"
         [operationInvocationResult]="operationInvocation()?.operationResult || []"
         [accountNameControl]="accountNameControl"

src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.html

@@ -114,7 +114,8 @@ <h2 class="pt-2">{{ 'settings.addons.connectAddon.chooseExistingAccount' | trans
           <section class="flex flex-column gap-5">
             <h2 class="pt-2">{{ 'settings.addons.connectAddon.configure' | translate }} {{ addon()?.displayName }}</h2>
             <osf-folder-selector
-              [isGoogleFilePicker]="false"
+              [isGoogleFilePicker]="isGoogleDrive()"
+              [accountId]="chosenAccountId()"
               [accountName]="chosenAccountName()"
               [operationInvocationResult]="operationInvocation()?.operationResult || []"
               [accountNameControl]="accountNameControl"

src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts

@@ -81,6 +81,10 @@ export class ConnectConfiguredAddonComponent {
   protected chosenAccountId = signal('');
   protected chosenAccountName = signal('');
   protected selectedRootFolderId = signal('');
+  private selectedAccount = signal<AuthorizedAccountModel>({} as AuthorizedAccountModel);
+  public readonly isGoogleDrive = computed(() => {
+    return this.selectedAccount()?.externalServiceName === 'googledrive';
+  });
 
   protected addonsUserReference = select(AddonsSelectors.getAddonsUserReference);
   protected createdAuthorizedAddon = select(AddonsSelectors.getCreatedOrUpdatedAuthorizedAddon);
@@ -137,14 +141,15 @@ export class ConnectConfiguredAddonComponent {
 
   protected handleCreateConfiguredAddon() {
     const addon = this.addon();
-    const selectedAccount = this.currentAuthorizedAddonAccounts().find(
-      (account) => account.id === this.chosenAccountId()
+    this.selectedAccount.set(
+      this.currentAuthorizedAddonAccounts().find((account) => account.id === this.chosenAccountId()) ||
+        ({} as AuthorizedAccountModel)
     );
-    if (!addon || !selectedAccount) return;
+    if (!addon || !this.selectedAccount()) return;
 
     const payload = this.addonFormService.generateConfiguredAddonCreatePayload(
       addon,
-      selectedAccount,
+      this.selectedAccount(),
       this.userReferenceId(),
       this.resourceUri(),
       this.accountNameControl.value || '',
@@ -181,19 +186,20 @@ export class ConnectConfiguredAddonComponent {
   }
 
   protected handleConfirmAccountConnection(): void {
-    const selectedAccount = this.currentAuthorizedAddonAccounts().find(
-      (account) => account.id === this.chosenAccountId()
+    this.selectedAccount.set(
+      this.currentAuthorizedAddonAccounts().find((account) => account.id === this.chosenAccountId()) ||
+        ({} as AuthorizedAccountModel)
     );
 
-    if (!selectedAccount) return;
+    if (!this.selectedAccount()) return;
 
-    const dialogRef = this.addonDialogService.openConfirmAccountConnectionDialog(selectedAccount);
+    const dialogRef = this.addonDialogService.openConfirmAccountConnectionDialog(this.selectedAccount());
 
     dialogRef.subscribe((result) => {
       if (result?.success) {
         this.stepper()?.value.set(ProjectAddonsStepperValue.CONFIGURE_ROOT_FOLDER);
-        this.chosenAccountName.set(selectedAccount.displayName);
-        this.accountNameControl.setValue(selectedAccount.displayName);
+        this.chosenAccountName.set(this.selectedAccount().displayName);
+        this.accountNameControl.setValue(this.selectedAccount().displayName);
       }
     });
   }

src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html

@@ -38,15 +38,15 @@
           <p-checkbox
             variant="filled"
             binary="true"
-            [class.pl-4]="!isCurrentProject(item)"
+            [class.pl-4]="!item.isCurrentResource"
             [ngModel]="selectedComponents()[item.id]"
             (ngModelChange)="onCheckboxToggle(item.id, $event)"
-            [disabled]="isCurrentProject(item)"
+            [disabled]="item.isCurrentResource"
           >
           </p-checkbox>
           <p>
             {{ item.title }}
-            @if (isCurrentProject(item)) {
+            @if (item.isCurrentResource) {
               <span>
                 {{ 'myProjects.settings.viewOnlyLinkCurrentProject' | translate }}
               </span>
@@ -86,7 +86,7 @@
       class="w-full"
       styleClass="w-full"
       (onClick)="addLink()"
-      [disabled]="!isFormValid"
+      [disabled]="linkName.invalid"
       [label]="'project.contributors.addDialog.next' | translate"
     ></p-button>
   </div>

src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.ts

@@ -9,11 +9,13 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 import { ChangeDetectionStrategy, Component, effect, inject, OnInit, signal } from '@angular/core';
 import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
 
-import { GetComponents, ProjectOverviewSelectors } from '@osf/features/project/overview/store';
 import { LoadingSpinnerComponent, TextInputComponent } from '@osf/shared/components';
 import { InputLimits } from '@osf/shared/constants';
 import { CustomValidators } from '@osf/shared/helpers';
-import { ViewOnlyLinkComponent } from '@shared/models';
+import { CurrentResourceSelectors, GetResourceChildren } from '@osf/shared/stores';
+import { ViewOnlyLinkChildren } from '@shared/models';
+
+import { ResourceInfoModel } from '../../models';
 
 @Component({
   selector: 'osf-create-view-link-dialog',
@@ -31,44 +33,42 @@ import { ViewOnlyLinkComponent } from '@shared/models';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CreateViewLinkDialogComponent implements OnInit {
-  linkName = new FormControl('', { nonNullable: true, validators: [CustomValidators.requiredTrimmed()] });
-
   readonly dialogRef = inject(DynamicDialogRef);
-  protected readonly config = inject(DynamicDialogConfig);
-  inputLimits = InputLimits;
+  readonly config = inject(DynamicDialogConfig);
+  readonly inputLimits = InputLimits;
+
+  linkName = new FormControl('', { nonNullable: true, validators: [CustomValidators.requiredTrimmed()] });
 
   anonymous = signal(true);
-  protected selectedComponents = signal<Record<string, boolean>>({});
-  protected components = select(ProjectOverviewSelectors.getComponents);
-  protected isLoading = select(ProjectOverviewSelectors.getComponentsLoading);
+  selectedComponents = signal<Record<string, boolean>>({});
+  components = select(CurrentResourceSelectors.getResourceChildren);
+  isLoading = select(CurrentResourceSelectors.isResourceChildrenLoading);
 
-  protected actions = createDispatchMap({
-    getComponents: GetComponents,
-  });
+  actions = createDispatchMap({ getComponents: GetResourceChildren });
 
-  get currentProjectId(): string {
-    return this.config.data?.['projectId'] || '';
+  get currentResource() {
+    return this.config.data as ResourceInfoModel;
   }
 
-  get allComponents(): ViewOnlyLinkComponent[] {
-    const currentProjectData = this.config.data?.['currentProject'];
+  get allComponents(): ViewOnlyLinkChildren[] {
+    const currentResourceData = this.currentResource;
     const components = this.components();
 
-    const result: ViewOnlyLinkComponent[] = [];
+    const result: ViewOnlyLinkChildren[] = [];
 
-    if (currentProjectData) {
+    if (currentResourceData) {
       result.push({
-        id: currentProjectData.id,
-        title: currentProjectData.title,
-        isCurrentProject: true,
+        id: currentResourceData.id,
+        title: currentResourceData.title,
+        isCurrentResource: true,
       });
     }
 
     components.forEach((comp) => {
       result.push({
         id: comp.id,
         title: comp.title,
-        isCurrentProject: false,
+        isCurrentResource: false,
       });
     });
 
@@ -85,10 +85,10 @@ export class CreateViewLinkDialogComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const projectId = this.currentProjectId;
+    const projectId = this.currentResource.id;
 
     if (projectId) {
-      this.actions.getComponents(projectId);
+      this.actions.getComponents(projectId, this.currentResource.type);
     } else {
       this.initializeSelection();
     }
@@ -98,28 +98,20 @@ export class CreateViewLinkDialogComponent implements OnInit {
     const initialState: Record<string, boolean> = {};
 
     this.allComponents.forEach((component) => {
-      initialState[component.id] = component.isCurrentProject;
+      initialState[component.id] = component.isCurrentResource;
     });
 
     this.selectedComponents.set(initialState);
   }
 
-  isCurrentProject(item: ViewOnlyLinkComponent): boolean {
-    return item.isCurrentProject;
-  }
-
-  get isFormValid(): boolean {
-    return this.linkName.valid && !!this.linkName.value.trim().length;
-  }
-
   addLink(): void {
-    if (!this.isFormValid) return;
+    if (this.linkName.invalid) return;
 
     const selectedIds = Object.entries(this.selectedComponents())
       .filter(([, checked]) => checked)
       .map(([id]) => id);
 
-    const rootProjectId = this.currentProjectId;
+    const rootProjectId = this.currentResource.id;
     const rootProject = selectedIds.includes(rootProjectId) ? [{ id: rootProjectId, type: 'nodes' }] : [];
 
     const relationshipComponents = selectedIds
@@ -160,7 +152,7 @@ export class CreateViewLinkDialogComponent implements OnInit {
   deselectAllComponents(): void {
     const allIds: Record<string, boolean> = {};
     this.allComponents.forEach((component) => {
-      allIds[component.id] = component.isCurrentProject;
+      allIds[component.id] = component.isCurrentResource;
     });
     this.selectedComponents.set(allIds);
   }