Merge branch 'main' into feat/478-view-only-links

# Conflicts:
#	src/app/features/files/pages/files/files.component.html
#	src/app/features/files/pages/files/files.component.ts
#	src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.ts
#	src/app/features/project/overview/project-overview.component.ts
#	src/app/shared/mappers/registration/page-schema.mapper.ts
#	src/app/shared/stores/addons/addons.state.ts

Author: rnastyuk

.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.`);
             }

README.md

@@ -17,14 +17,16 @@ take up to 60 seconds once the docker build finishes.
 ### First steps
 
 - Install git commit template: [Commit Template](docs/commit.template.md).
-- Volta: [Volta](#volta)
+- [Volta](#volta)
 
 ### Recommended
 
-- Compodoc: [Compodoc Conventions](docs/compodoc.md).
-- Docker Commands: [Docker Commands](docs/docker.md).
-- Git Conventions: [Git Conventions](docs/git-convention.md).
-- NGXS: [NGXS Conventions](docs/ngxs.md).
+- [Compodoc Conventions](docs/compodoc.md).
+- [Docker Commands](docs/docker.md).
+- [ESLint Strategy](docs/eslint.md).
+- [Git Conventions](docs/git-convention.md).
+- [NGXS Conventions](docs/ngxs.md).
+- [Testing Strategy](docs/testing.md).
 
 ### Optional
 

angular.json

@@ -78,6 +78,17 @@
               "outputHashing": "none",
               "namedChunks": true
             },
+            "local": {
+              "optimization": false,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.local.ts"
+                }
+              ]
+            },
             "development": {
               "optimization": false,
               "extractLicenses": false,
@@ -101,6 +112,10 @@
             "development": {
               "buildTarget": "osf:build:development",
               "hmr": false
+            },
+            "local": {
+              "buildTarget": "osf:build:local",
+              "hmr": false
             }
           },
           "defaultConfiguration": "development"

docs/eslint.md

@@ -0,0 +1,105 @@
+# Linting Strategy – OSF Angular
+
+---
+
+## Overview
+
+This project uses a **unified, modern ESLint flat config** approach to enforce consistent coding styles, accessibility standards, and TypeScript best practices. Linting runs on:
+
+- TypeScript (`*.ts`)
+- HTML templates (`*.html`)
+- Specs (`*.spec.ts`)
+
+It also integrates into the **Git workflow** via `pre-commit` hooks to ensure clean, compliant code before every commit.
+
+---
+
+## Linting Commands
+
+```bash
+# Run full project lint
+npm run lint
+```
+
+---
+
+## ESLint Config Structure
+
+### 1. TypeScript Files (`**/*.ts`)
+
+**Extends**:
+
+- `@eslint/js` → base ESLint config
+- `typescript-eslint` recommended & stylistic configs
+- `angular-eslint` TypeScript rules
+- `eslint-plugin-prettier/recommended`
+
+**Plugins**:
+
+- `eslint-plugin-import`
+- `eslint-plugin-simple-import-sort`
+- `eslint-plugin-unused-imports`
+
+**Key Rules**:
+
+- Enforces Angular selector styles:
+  - Directives → `osfFoo` (camelCase)
+  - Components → `<osf-bar>` (kebab-case)
+- Enforces import sorting and duplicate prevention
+- Removes unused imports automatically
+- Allows unused variables named `_` to support convention (e.g., destructuring)
+
+---
+
+### 2. HTML Templates (`**/*.html`)
+
+**Extends**:
+
+- `angular-eslint/templateRecommended`
+- `angular-eslint/templateAccessibility`
+
+**Parser**:
+
+- `@angular-eslint/template-parser`
+
+**Key A11y Rules** (All Set to `"error"`):
+
+- `alt-text`
+- `valid-aria`
+- `click-events-have-key-events`
+- `role-has-required-aria`
+- `interactive-supports-focus`
+- `no-distracting-elements`
+- `no-autofocus`
+- `label-has-associated-control`
+
+> This enforces **WCAG accessibility compliance** directly in Angular templates.
+
+---
+
+### 3. Test Files (`**/*.spec.ts`)
+
+Loosened restrictions for developer convenience:
+
+```ts
+'@typescript-eslint/no-explicit-any': 'off',
+'@typescript-eslint/no-empty-function': 'off',
+```
+
+---
+
+## Pre-Commit Hook
+
+The `pre-commit` file includes:
+
+- `npx lint-staged` → Lint only **staged files** before every commit
+- Ensures **TypeScript and template linting** run automatically
+
+## Summary
+
+| File Type    | Purpose                               | Key Rules                               |
+| ------------ | ------------------------------------- | --------------------------------------- |
+| `*.ts`       | Lint Angular + TS logic               | Unused imports, selector rules, sorting |
+| `*.html`     | Enforce a11y & Angular best practices | All template a11y rules enforced        |
+| `*.spec.ts`  | Relaxed for test convenience          | Some TS rules turned off                |
+| `pre-commit` | Git hook to lint before committing    | Ensures consistent PR quality           |