Merge branch 'main' of github.com:CenterForOpenScience/angular-osf into feat/502-add-community-metadata

Author: nmykhalkevch-exoft

.github/rules/All Branch Rules.json

@@ -0,0 +1,37 @@
+{
+  "id": 7359757,
+  "name": "All Branch Rules",
+  "target": "branch",
+  "source_type": "Repository",
+  "source": "CenterForOpenScience/angular-osf",
+  "enforcement": "disabled",
+  "conditions": {
+    "ref_name": {
+      "exclude": ["refs/heads/main", "refs/heads/develop"],
+      "include": ["~ALL"]
+    }
+  },
+  "rules": [
+    {
+      "type": "deletion"
+    },
+    {
+      "type": "required_review_thread_resolution",
+      "parameters": {
+        "enabled": true
+      }
+    },
+    {
+      "type": "pull_request",
+      "parameters": {
+        "required_approving_review_count": 1,
+        "dismiss_stale_reviews_on_push": true,
+        "require_code_owner_review": false,
+        "require_last_push_approval": true,
+        "automatic_copilot_code_review_enabled": false,
+        "allowed_merge_methods": ["squash"]
+      }
+    }
+  ],
+  "bypass_actors": []
+}

.github/rules/Main_Develop Branch Rules.json

@@ -0,0 +1,52 @@
+{
+  "id": 7359601,
+  "name": "Main/Develop Branch Rules",
+  "target": "branch",
+  "source_type": "Repository",
+  "source": "CenterForOpenScience/angular-osf",
+  "enforcement": "active",
+  "conditions": {
+    "ref_name": {
+      "exclude": [],
+      "include": ["~DEFAULT_BRANCH", "refs/heads/develop"]
+    }
+  },
+  "rules": [
+    {
+      "type": "deletion"
+    },
+    {
+      "type": "non_fast_forward"
+    },
+    {
+      "type": "merge_queue",
+      "parameters": {
+        "merge_method": "SQUASH",
+        "max_entries_to_build": 8,
+        "min_entries_to_merge": 1,
+        "max_entries_to_merge": 5,
+        "min_entries_to_merge_wait_minutes": 5,
+        "grouping_strategy": "ALLGREEN",
+        "check_response_timeout_minutes": 90
+      }
+    },
+    {
+      "type": "required_review_thread_resolution",
+      "parameters": {
+        "enabled": true
+      }
+    },
+    {
+      "type": "pull_request",
+      "parameters": {
+        "required_approving_review_count": 1,
+        "dismiss_stale_reviews_on_push": true,
+        "require_code_owner_review": false,
+        "require_last_push_approval": true,
+        "automatic_copilot_code_review_enabled": false,
+        "allowed_merge_methods": ["squash"]
+      }
+    }
+  ],
+  "bypass_actors": []
+}

.github/workflows/review.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const {owner, repo} = context.repo;
+            const { owner, repo } = context.repo;
 
             // Determine PR number for both pull_request and pull_request_review events
             let number;
@@ -41,11 +41,13 @@ jobs:
             const latestByUser = new Map();
             for (const r of reviews) latestByUser.set(r.user.id, r.state);
 
-            // Count approvals
             const approvals = [...latestByUser.values()].filter(s => s === 'APPROVED').length;
+            const hasRequestChanges = [...latestByUser.values()].includes('CHANGES_REQUESTED');
 
             if (approvals < 1) {
               core.setFailed(`PR #${number} requires at least one approving review before merging.`);
+            } else if (hasRequestChanges) {
+              core.setFailed(`PR #${number} cannot be merged because at least one reviewer has requested changes.`);
             } else {
               core.info(`Approvals found: ${approvals}. Check passed.`);
             }

eslint.config.js

@@ -90,6 +90,7 @@ module.exports = tseslint.config(
     files: ['**/*.spec.ts'],
     rules: {
       '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-empty-function': 'off',
     },
   }
 );

package-lock.json

@@ -67,6 +67,8 @@
     "@commitlint/cli": "^19.7.1",
     "@commitlint/config-conventional": "^19.7.1",
     "@compodoc/compodoc": "^1.1.26",
+    "@types/gapi": "^0.0.47",
+    "@types/gapi.auth2": "^0.0.61",
     "@types/jest": "^29.5.14",
     "@types/markdown-it": "^14.1.2",
     "angular-eslint": "19.1.0",

package.json

@@ -0,0 +1,10 @@
+import type gapi from 'gapi-script'; // or just `import gapi from 'gapi-script';`
+
+declare global {
+  interface Window {
+    gapi: typeof gapi;
+    google: {
+      picker: typeof google.picker;
+    };
+  }
+}

src/@types/global.d.ts

@@ -0,0 +1,8 @@
+import { InjectionToken } from '@angular/core';
+
+import { environment } from 'src/environments/environment';
+
+export const ENVIRONMENT = new InjectionToken<typeof environment>('App Environment', {
+  providedIn: 'root',
+  factory: () => environment,
+});

src/app/core/constants/environment.token.ts

@@ -7,7 +7,13 @@
   <p-step [value]="targetStepValue()" [disabled]="isDisabled()">
     <ng-template #content>
       <div class="flex flex-column gap-4 w-full">
-        <h3>{{ 'collections.addToCollection.projectContributors' | translate }}</h3>
+        <div class="flex align-items-baseline gap-1">
+          <h3>{{ 'collections.addToCollection.projectContributors' | translate }}</h3>
+          <osf-info-icon
+            [tooltipText]="'collections.addToCollection.contributorsTooltip' | translate"
+            tooltipPosition="bottom"
+          ></osf-info-icon>
+        </div>
         @if (!isDisabled() && stepperActiveValue() !== targetStepValue()) {
           @if (projectContributors().length) {
             <div class="flex flex-column gap-2">

src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.html

@@ -13,21 +13,27 @@ import { filter } from 'rxjs/operators';
 import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, input, output, signal } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
-import { findChangedItems } from '@osf/shared/helpers';
+import { InfoIconComponent } from '@osf/shared/components';
 import {
   AddContributorDialogComponent,
   AddUnregisteredContributorDialogComponent,
   ContributorsListComponent,
-} from '@shared/components/contributors';
-import { AddContributorType, ResourceType } from '@shared/enums';
-import { ContributorDialogAddModel, ContributorModel } from '@shared/models';
-import { CustomConfirmationService, ToastService } from '@shared/services';
-import { AddContributor, ContributorsSelectors, DeleteContributor, UpdateContributor } from '@shared/stores';
-import { ProjectsSelectors } from '@shared/stores/projects/projects.selectors';
+} from '@osf/shared/components/contributors';
+import { AddContributorType, ResourceType } from '@osf/shared/enums';
+import { findChangedItems } from '@osf/shared/helpers';
+import { ContributorDialogAddModel, ContributorModel } from '@osf/shared/models';
+import { CustomConfirmationService, ToastService } from '@osf/shared/services';
+import {
+  AddContributor,
+  ContributorsSelectors,
+  DeleteContributor,
+  ProjectsSelectors,
+  UpdateContributor,
+} from '@osf/shared/stores';
 
 @Component({
   selector: 'osf-project-contributors-step',
-  imports: [Button, TranslatePipe, ContributorsListComponent, Step, StepItem, StepPanel, Tooltip],
+  imports: [Button, Step, StepItem, StepPanel, Tooltip, TranslatePipe, ContributorsListComponent, InfoIconComponent],
   templateUrl: './project-contributors-step.component.html',
   styleUrl: './project-contributors-step.component.scss',
   providers: [DialogService],
@@ -40,9 +46,9 @@ export class ProjectContributorsStepComponent {
   private readonly toastService = inject(ToastService);
   private readonly customConfirmationService = inject(CustomConfirmationService);
 
-  protected readonly projectContributors = select(ContributorsSelectors.getContributors);
-  protected readonly isContributorsLoading = select(ContributorsSelectors.isContributorsLoading);
-  protected readonly selectedProject = select(ProjectsSelectors.getSelectedProject);
+  readonly projectContributors = select(ContributorsSelectors.getContributors);
+  readonly isContributorsLoading = select(ContributorsSelectors.isContributorsLoading);
+  readonly selectedProject = select(ProjectsSelectors.getSelectedProject);
 
   private initialContributors = signal<ContributorModel[]>([]);