Version Bump to v2.2.0

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to ELMO
 
-Thank you for your interest in contributing to ELMO! We welcome contributions of all kinds.
+Thank you for your interest in contributing to ELMO! We welcome contributions of all kinds. Before adding or renaming files, read the [project structure](../docs/project-structure.md) and [file-name conventions](../docs/file-naming-conventions.md).
 
 ## Branching Strategy
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,13 +1,18 @@
 name: Bug Report
 description: Report a bug or unexpected behavior in one of the ELMOs
 title: "[BUG] "
-labels: ["bug"]
+labels: ["bug", "DoR not met"]
+projects: ["McNamara84/10"]
 body:
   - type: markdown
     attributes:
       value: |
         Thanks for taking the time to report a bug! Please fill out the sections below.
 
+        ## Use ELMO terms
+
+        Please use the exact terms shown in the affected ELMO. Do not use abbreviations. For example, a digital dataset is named **Resource**, and a physical sample is named **IGSN**.
+
   - type: textarea
     id: description
     attributes:
@@ -22,11 +27,9 @@ body:
     attributes:
       label: Steps to Reproduce
       description: Step-by-step instructions to reproduce the behavior.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '...'
-        3. Scroll down to '...'
-        4. See error
+      value: |
+        1. Open the affected ELMO
+        2. Navigate to page ... with route /...
     validations:
       required: true
 
@@ -66,18 +69,37 @@ body:
       required: false
 
   - type: input
-    id: ernie-version
+    id: elmo-version
     attributes:
-      label: ELMO Version
-      description: Which version of ELMO are you using?
-      placeholder: e.g. ELMO-MSL v2.0.6
+      label: ELMO Version / Branch
+      description: Which ELMO version or branch are you using?
+      placeholder: e.g. ELMO-MSL v2.0.6, main
     validations:
       required: false
 
+  - type: checkboxes
+    id: definition-of-ready
+    attributes:
+      label: Definition of Ready
+      description: Check every item that is already true for this bug report.
+      options:
+        - label: The affected ELMO page, route, or workflow is named.
+        - label: If the bug is reported from stakeholders, the bug was reproduced by at least one team member.
+        - label: The affected Resource or Sample is named/linked when relevant.
+        - label: The user role, browser, ELMO version or branch, and environment are added when relevant.
+        - label: The current behavior and expected behavior are clear.
+        - label: The steps to reproduce are testable.
+        - label: Screenshots, logs, or error messages are attached when they could be helpful.
+
   - type: textarea
     id: additional-context
     attributes:
       label: Additional Context
       description: Any other context about the problem.
     validations:
-      required: false
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        **Ready for work?** This issue is created with the `DoR not met` label by default. Remove it only when the Definition of Ready is met.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,20 +1,25 @@
 name: Feature Request
 description: Suggest a new feature or improvement for one of the ELMOs
 title: "[FEATURE] "
-labels: ["enhancement"]
+labels: ["enhancement", "DoR not met"]
+projects: ["McNamara84/10"]
 body:
   - type: markdown
     attributes:
       value: |
         Thanks for suggesting a feature! Please describe your idea below.
 
+        ## Use ELMO terms
+
+        Please use the exact terms shown in the affected ELMO. Do not use abbreviations. For example, a digital dataset is named **Resource**, and a physical sample is named **IGSN**.
+
   - type: textarea
     id: user-story
     attributes:
       label: User Story
       description: Describe the feature from a user's perspective.
       value: |
-        As a **…**, I want **…**, so that **…**.
+        As a **...**, I want **...**, so that **...**.
     validations:
       required: true
 
@@ -46,10 +51,30 @@ body:
     validations:
       required: false
 
+  - type: checkboxes
+    id: definition-of-ready
+    attributes:
+      label: Definition of Ready
+      description: Check every item that is already true for this feature request.
+      options:
+        - label: The user role or target user (not Product Owner, not Scrum Master) is named at least in the user story.
+        - label: The user story follows the INVEST criteria (Independent, Negotiable, Valuable, Estimable, Small, Testable).
+        - label: The affected ELMO page, route, workflow, or data type is named.
+        - label: The problem or user need is clear.
+        - label: The acceptance criteria follow the Given-When-Then format.
+        - label: Acceptance criteria are testable.
+        - label: Relevant Resource or Sample is included/linked when relevant.
+        - label: Sketches, mockups, or wireframes are attached when they could be helpful.
+
   - type: textarea
     id: additional-context
     attributes:
       label: Additional Context
       description: Any mockups, references, or further information.
     validations:
-      required: false
+      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        **Ready for work?** This issue is created with the `DoR not met` label by default. Remove it only when the Definition of Ready is met.

.github/workflows/mirror-to-gitlab.yml

@@ -0,0 +1,33 @@
+name: Mirror latest release to GitLab
+
+on:
+  workflow_dispatch: # manual trigger for initial setup
+  release:
+    types: [published]
+
+jobs:
+  mirror:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository with full history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get latest release
+        id: release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          TAG=$(gh release view --json tagName --jq .tagName)
+          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+          echo "Latest release: $TAG"
+
+      - name: Push tag and state to GitLab
+        env:
+          GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
+          TAG: ${{ steps.release.outputs.tag }}
+        run: |
+          git remote add gitlab "https://oauth2:${GITLAB_TOKEN}@git.gfz-potsdam.de/data_services/elmo.git"
+          git push gitlab "refs/tags/${TAG}:refs/tags/${TAG}"
+          git push --force gitlab "refs/tags/${TAG}^{commit}:refs/heads/main"

.github/workflows/phpunit.yml

@@ -30,6 +30,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
@@ -65,6 +67,11 @@ jobs:
       - name: Validate composer.json and composer.lock
         run: composer validate --strict
 
+      - name: Check file-name conventions
+        env:
+          FILE_NAME_BASE: ${{ github.event.pull_request.base.sha || github.event.before }}
+        run: composer check:file-names -- --base="$FILE_NAME_BASE"
+
       - name: Install JS dependencies
         run: npm ci
 
@@ -179,7 +186,7 @@ jobs:
           PHP
 
       - name: Initialize database structure and lookup data
-        run: php -r "require 'install.php'; createDatabaseStructure(\$connection); insertLookupData(\$connection);"
+        run: php -r "require 'scripts/install.php'; createDatabaseStructure(\$connection); insertLookupData(\$connection);"
 
       - name: Start PHP built-in web server
         run: |

.github/workflows/playwright.yml

@@ -179,7 +179,7 @@ jobs:
         EOF
 
     - name: Initialize database structure and lookup data
-      run: php -r "require 'install.php'; createDatabaseStructure(\$connection); insertLookupData(\$connection);"
+      run: php -r "require 'scripts/install.php'; createDatabaseStructure(\$connection); insertLookupData(\$connection);"
 
     - name: Shrink large JSON fixtures for faster page loads
       run: echo '[{"crossRefId":"100000001","name":"National Science Foundation"}]' > json/funders.json

.htaccess

@@ -1,16 +1,37 @@
 <IfModule mod_rewrite.c>
-    # Enable the RewriteEngine module, which allows URL rewriting
     RewriteEngine On
 
-    # If the requested filename exists as a file (-f) or directory (-d), skip the next rule
+    # CLI maintenance tools are never public HTTP endpoints.
+    RewriteRule ^scripts(?:/|$) - [R=404,L]
+
+    # Temporary compatibility aliases for the former root endpoints.
+    RewriteRule ^api\.php$ api/deprecated_v1.php [QSA,L]
+    RewriteRule ^doc/privacyPolicy\.html$ doc/privacy-policy.html [L]
+    RewriteRule ^log_page_event\.php$ endpoints/log_page_event.php [QSA,L]
+    RewriteRule ^send_feedback_mail\.php$ endpoints/send_feedback_mail.php [QSA,L]
+    RewriteRule ^send_xml_file\.php$ endpoints/send_xml_file.php [QSA,L]
+
+    # Temporary compatibility aliases for browser icons moved to assets/icons.
+    RewriteRule ^apple-touch-icon\.png$ assets/icons/apple-touch-icon.png [L]
+    RewriteRule ^favicon-96x96\.png$ assets/icons/favicon-96x96.png [L]
+    RewriteRule ^favicon\.ico$ assets/icons/favicon.ico [L]
+    RewriteRule ^favicon\.svg$ assets/icons/favicon.svg [L]
+    RewriteRule ^web-app-manifest-192x192\.png$ assets/icons/web-app-manifest-192x192.png [L]
+    RewriteRule ^web-app-manifest-512x512\.png$ assets/icons/web-app-manifest-512x512.png [L]
+
+    # Temporary compatibility aliases for logos moved to assets/logos.
+    RewriteRule ^logos/doi\.logo\.svg$ assets/logos/doi-logo.svg [L]
+    RewriteRule ^logos/EPOS_logo\.png$ assets/logos/epos-logo.png [L]
+    RewriteRule ^logos/GFZ_Data_Services_logo\.png$ assets/logos/gfz-data-services-logo.svg [L]
+    RewriteRule ^logos/GFZ-logo\.png$ assets/logos/gfz-logo.svg [L]
+    RewriteRule ^logos/orcid\.logo\.png$ assets/logos/orcid-logo.png [L]
+    RewriteRule ^logos/ror-logo\.svg$ assets/logos/ror-logo.svg [L]
+
+    # Existing files and directories are served without additional routing.
     RewriteCond %{REQUEST_FILENAME} -f [OR]
     RewriteCond %{REQUEST_FILENAME} -d
     RewriteRule ^ - [L]
 
-    # For API requests: rewrite URLs starting with 'api/' to 'api/index.php'
+    # API v2 uses the shared API front controller.
     RewriteRule ^api/(.*)$ api/index.php [QSA,L]
-
-    # For all other requests (if needed), rewrite to 'index.php'
-    # Uncomment the following line if you want all other routes to point to 'index.php'
-    # RewriteRule ^(.*)$ index.php [QSA,L]
-</IfModule>
+</IfModule>