Téléchargement carte 56

.eslintrc.json

@@ -1,7 +1,7 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nx"],
+  "plugins": ["@nx", "no-only-tests"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -73,6 +73,12 @@
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
       "rules": {}
+    },
+    {
+      "files": ["*.spec.ts", "*.cy.ts"],
+      "rules": {
+        "no-only-tests/no-only-tests": "error"
+      }
     }
   ]
 }

.github/workflows/artifacts.yml

@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.checks.outputs.ref }} # use the PR head ref if applicable; otherwise keep default behaviour
           persist-credentials: false
@@ -57,9 +57,7 @@ jobs:
           cache: 'npm'
 
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
-        with:
-          main-branch-name: 'main'
+        uses: nrwl/nx-set-shas@v3
 
       - name: Install dependencies
         run: npm ci

.github/workflows/checks.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -38,9 +38,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
-        with:
-          main-branch-name: 'main'
+        uses: nrwl/nx-set-shas@v3
       - run: npm ci
       - run: npx nx format:check
       - run: npx nx affected -t lint --parallel=3
@@ -79,7 +77,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -89,9 +87,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
-        with:
-          main-branch-name: 'main'
+        uses: nrwl/nx-set-shas@v3
       - run: npm ci
       - run: npx nx affected -t build --parallel=3
 
@@ -102,7 +98,7 @@ jobs:
 
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -142,38 +138,54 @@ jobs:
           comment_tag: build-options
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  cypress-run:
-    name: End-to-end tests
+  e2e-run:
+    name: E2E tests / ${{ matrix.app }} / GN v${{ matrix.gn_version }}
     runs-on: ubuntu-latest
-    outputs:
-      screenshotsUrl: ${{ steps.upload-screenshots.outputs.artifact-url }}
+    strategy:
+      fail-fast: false
+      matrix:
+        gn_version: [4.2.2, 4.2.8, 4.4.0]
+        app: [datahub, metadata-editor]
+        exclude:
+          - gn_version: 4.2.2 # metadata-editor requires v4.2.5+
+            app: metadata-editor
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          fetch-depth: 0
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
 
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v3
+
       - name: Create pipeline docker image
-        run: cd tools && docker build . -f pipelines/Dockerfile -t geonetwork/geonetwork-ui-tools-pipelines:latest
+        working-directory: tools
+        run: docker build . -f pipelines/Dockerfile -t geonetwork/geonetwork-ui-tools-pipelines:latest
 
-      - name: Build the backend
-        run: sudo docker-compose -f support-services/docker-compose.yml up -d init
+      - name: Start up backend support services
+        env:
+          GEONETWORK_VERSION: ${{ matrix.gn_version }}
+        working-directory: support-services
+        run: docker compose up --quiet-pull init
 
-      - name: Install dependencies
-        run: |
-          npm ci
+      - run: npm ci
 
-      - name: Run tests
-        run: npx nx run-many --target=e2e
+      - name: Run e2e tests for ${{ matrix.app }}
+        env:
+          APP: ${{ matrix.app }}
+        run: npx nx e2e "$APP-e2e"
 
       - uses: actions/upload-artifact@v4
         if: always()
         id: upload-screenshots
         with:
-          name: cypress-screenshots
+          name: cypress-screenshots-app-${{ matrix.app }}-gn-${{ matrix.gn_version }}
           path: |
             apps/datahub-e2e/cypress/screenshots/**/*
             apps/metadata-editor-e2e/cypress/screenshots/**/*
@@ -193,7 +205,7 @@ jobs:
 
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0

.github/workflows/deploy.yml

@@ -105,3 +105,33 @@ jobs:
           comment_tag: github-links
           pr_number: ${{ github.event.issue.number }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  apps:
+    needs: checks
+    if: github.event_name != 'issue_comment'
+    name: Deploy Apps to GitHub Pages
+    runs-on: ubuntu-latest
+    env:
+      BRANCH_NAME: main
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
+
+      - name: Install
+        run: npm ci
+
+      - name: Build metadata-converter
+        run: npx nx build metadata-converter --prod
+
+      - name: Deploy to directory ${{ env.BRANCH_NAME }}
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          npx gh-pages --dist dist/apps/ --dest ${{env.BRANCH_NAME}} --remove "${{env.BRANCH_NAME}}/**" --no-history --repo "https://${GITHUB_ACTOR}:${{secrets.GITHUB_TOKEN}}@github.com/${GITHUB_REPOSITORY}.git"

.github/workflows/docker-publish.yml

@@ -70,7 +70,7 @@ jobs:
       - name: Npm install
         run: npm install
       - name: npx build
-        run: npx nx build datahub --base-href=/catalogue/
+        run: npx nx build datahub --base-href=/catalogue/ --skip-nx-cache
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action

.github/workflows/snyk-security.yml

@@ -35,7 +35,7 @@ jobs:
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Run Snyk to check for vulnerabilities
         uses: snyk/actions/node@master

.github/workflows/webcomponents.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.checks.outputs.ref }}
           persist-credentials: false

README.md

@@ -2,38 +2,15 @@
 
 # GeoNetwork UI
 
-GeoNetwork UI is a suite of Applications made to provide a modern facade to your GeoNetwork 4 catalog.
+GeoNetwork-UI provides several applications to improve the user experience of your GeoNetwork catalog.
 
 It also provides Web Components to embed various parts of your data catalog in third party websites.
 
-## Documentation
+End users are [invited](https://discourse.osgeo.org/t/about-the-geonetwork-ui-category/59280) to join us on the GeoNetwork-UI forum on OsGeo Discourse: https://discourse.osgeo.org/c/geonetwork/ui
 
-To check out docs, visit [geonetwork-ui website](https://geonetwork.github.io/geonetwork-ui/main/docs/)
+Developers should check out the [GitHub discussions](https://github.com/geonetwork/geonetwork-ui/discussions).
 
-## Requirements
-
-- GeoNetwork version 4.2.2
-- ElasticSearch version 7.11+
-
-:warning: A bug currently in GeoNetwork 4.2.2 prevents the organizations of showing up correctly in the Datahub application.
-
-As a temporary workaround, the following change is necessary in GeoNetwork data directory:
-
-```diff
-diff --git a/web/src/main/webResources/WEB-INF/data/config/index/records.json b/web/src/main/webResources/WEB-INF/data/config/index/records.json
-index 1d7e499af7..78e682e3db 100644
---- a/web/src/main/webResources/WEB-INF/data/config/index/records.json
-+++ b/web/src/main/webResources/WEB-INF/data/config/index/records.json
-@@ -1317,7 +1317,7 @@
-           "mapping": {
-             "type": "nested",
-             "properties": {
--              "org": {
-+              "organisation": {
-                 "type": "keyword"
-               },
-               "role": {
-```
+To learn more about the project, visit the [GeoNetwork-UI website](https://geonetwork.github.io/geonetwork-ui/main/docs/)
 
 ## Getting started
 
@@ -99,67 +76,6 @@ npx nx build (app_name)
 
 The build artifacts will be stored in the `dist/` directory. Note: this always produces a production build.
 
-### A word on authentication
-
-GeoNetwork-UI applications rely on the GeoNetwork authentication mechanism. This means that if the user is authenticated in GeoNetwork, they will have access to authenticated features in the corresponding GeoNetwork-UI apps.
-
-There are a few caveats, depending on the deployment scenario:
-
-#### 1. GeoNetwork and GeoNetwork-UI are deployed on the same host, e.g. https://my.host/geonetwork and https://my.host/datahub
-
-In this scenario, requests from the GeoNetwork-UI app to GeoNetwork are _not_ [cross-origin requests](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#what_requests_use_cors), so CORS rules do not apply.
-
-GeoNetwork has an XSRF protection by default, which _will_ make authenticated requests fail unless the following is done:
-
-- either make sure that the XSRF cookies sent by GeoNetwork have a `path` value of `/`; this is typically done like so in GeoNetwork:
-
-  ```diff
-  --- a/web/src/main/webapp/WEB-INF/config-security/config-security-core.xml
-  +++ b/web/src/main/webapp/WEB-INF/config-security/config-security-core.xml
-  @@ -361,6 +361,7 @@
-     <bean class="org.fao.geonet.security.web.csrf.CookieCsrfTokenRepository"
-           id="csrfTokenRepository">
-       <property name="cookieHttpOnly" value="false"/>
-  +    <property name="cookiePath" value="/"/>
-     </bean>
-  ```
-
-  Also make sure that the GeoNetwork API URL used by the application is _not_ an absolute URL; a relative URL should be enough in that scenario:
-
-  ```diff
-  --- a/conf/default.toml
-  +++ b/conf/default.toml
-  @@ -5,7 +5,7 @@
-  [global]
-  -geonetwork4_api_url = "https://my.host/geonetwork/srv/api"
-  +geonetwork4_api_url = "/geonetwork/srv/api"
-  ```
-
-- or disable the XSRF protection selectively for non-critical endpoints of GeoNetwork, e.g. https://my.host/geonetwork/srv/api/userSelections for marking records as favorites; this is typically done like so in GeoNetwork:
-
-  ```diff
-  --- a/web/src/main/webapp/WEB-INF/config-security/config-security-core.xml
-  +++ b/web/src/main/webapp/WEB-INF/config-security/config-security-core.xml
-  @@ -374,6 +374,9 @@
-           <value>/[a-zA-Z0-9_\-]+/[a-z]{2,3}/csw!?.*</value>
-           <value>/[a-zA-Z0-9_\-]+/api/search/.*</value>
-           <value>/[a-zA-Z0-9_\-]+/api/site</value>
-  +        <value>/[a-zA-Z0-9_\-]+/api/userselections.*</value>
-         </set>
-       </constructor-arg>
-     </bean>
-  ```
-
-  :warning: Please do this responsibly as this could have security implications! :warning:
-
-#### 2. GeoNetwork and GeoNetwork-UI are _not_ deployed on the same host, e.g. https://my.host/geonetwork and https://another.org/datahub
-
-In this scenario, even if CORS settings are correctly set up on GeoNetwork side, most authenticated request will probably fail because by default they are not sent with the [`withCredentials: true`](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/withCredentials) option.
-
-As such, **authenticated requests are not yet supported in GeoNetwork-UI in the case of a cross-origin deployment**; non-authenticated requests (e.g. public search) should still work provided CORS settings were correctly set up on the GeoNetwork side (see [CORS resonse headers](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#the_http_response_headers)).
-
-Lastly, even if authenticated requests were cleared regarding CORS rules, it would still be needed to disable the XSRF mechanism for the endpoints that GeoNetwork-UI relies on; XSRF protections works by making the client read the content of an HTTP cookie, and that is forbidden in a cross-origin context
-
 ### Tests
 
 #### Unit tests
@@ -183,31 +99,24 @@ npx nx test --test-match=/data/dev/gn/ui/libs/common/src/lib/services/bootstrap.
 
 #### End-to-end-tests
 
-You can test the datahub app by page :
-
-- home page
-- search page
-- organisations page
-- dataset pages
-
-##### To run the tests with the interface :
+##### To run the tests with the interface:
 
-Start docker from 'support-services', and then in the 'geonetwork-ui' folder :
+Start docker from 'support-services', and then in the project root folder :
 
 ```shell script
-npx nx e2e appname --watch
+npx nx e2e (app_name) --watch
 ```
 
 Then select the file(s) you want to test in the interface.
 
 ##### To run the tests without interface :
 
-Start docker from 'support-services', and then in the 'geonetwork-ui' folder :
+Start docker from 'support-services', and then in the project root folder :
 
 --> ALl tests :
 
 ```shell script
-npx nx e2e appname
+npx nx e2e  (app_name)
 ```
 
 ## Project structure

apps/datafeeder/src/app/app-routing.module.ts

@@ -11,6 +11,7 @@ import { PublicationLockGuard } from './router/publication-lock.guard'
 import { PublicationStatusGuard } from './router/publication-status.guard'
 import { UploadProgressGuard } from './router/upload-progress.guard'
 import { UploadStatusGuard } from './router/upload-status.guard'
+import { DatasetValidationCsvPageComponent } from './presentation/pages/dataset-validation-csv-page/dataset-validation-csv-page'
 
 const routes: Routes = [
   { path: '', component: UploadDataPageComponent },
@@ -24,6 +25,11 @@ const routes: Routes = [
     component: DatasetValidationPageComponent,
     canActivate: [UploadStatusGuard, PublicationLockGuard],
   },
+  {
+    path: ':id/validation-csv',
+    component: DatasetValidationCsvPageComponent,
+    canActivate: [UploadStatusGuard, PublicationLockGuard],
+  },
   {
     path: ':id/step/:stepId',
     component: FormsPageComponent,