feat(support-services): set default pipeline before reindexing all re…

…cords
geonetwork · Dec 27, 2023 · 6fdbd84 · 6fdbd84
1 parent 0192cd9
commit 6fdbd84
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 30 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -158,7 +158,7 @@ jobs:
         run: cd tools && 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 tools-pipelines
+        run: sudo docker-compose -f support-services/docker-compose.yml up -d init
 
       - name: Install dependencies
         run: |

diff --git a/apps/datahub-e2e/src/e2e/datasets.cy.ts b/apps/datahub-e2e/src/e2e/datasets.cy.ts
@@ -470,31 +470,12 @@ describe('datasets', () => {
 
     describe('metadata quality widget enabled', () => {
       beforeEach(() => {
-        // this will enable spatial filtering
+        // this will enable metadata quality widget
         cy.intercept('GET', '/assets/configuration/default.toml', {
           fixture: 'config-with-metadata-quality.toml',
         })
         cy.visit('/search')
       })
-      it('should not display widget', () => {
-        cy.get('@results')
-          .eq(2)
-          .get('gn-ui-metadata-quality')
-          .should('not.exist')
-      })
-
-      it('should reindex records', () => {
-        cy.login('admin', 'admin', false)
-        cy.visit(
-          `http://localhost:8080/geonetwork/srv/eng/admin.console#/tools`
-        )
-        cy.intercept({
-          method: 'PUT',
-          url: 'http://localhost:8080/geonetwork/srv/api/site/index?reset=false&asynchronous=true',
-        }).as('indexingRecordsXHR')
-        cy.get('[class=panel-body]').find('button').first().click()
-        cy.wait('@indexingRecordsXHR')
-      })
 
       it('should display quality widget', () => {
         cy.visit('/search')

diff --git a/support-services/docker-compose.yml b/support-services/docker-compose.yml
@@ -99,6 +99,15 @@ services:
     ports:
       - '8080:8080'
 
+  init-pipeline:
+    image: geonetwork/geonetwork-ui-tools-pipelines:latest
+    environment:
+      ES_HOST: http://elasticsearch:9200
+      RECORDS_INDEX: gn-records
+    depends_on:
+      elasticsearch:
+        condition: service_healthy
+
   init:
     image: alpine/curl
     # only run init if volumes were cleared
@@ -110,6 +119,8 @@ services:
         condition: service_healthy
       elasticsearch:
         condition: service_healthy
+      init-pipeline:
+        condition: service_completed_successfully
     healthcheck:
       test: ['CMD-SHELL', "sh -c '[ -f /done ]'"]
       interval: 5s
@@ -140,12 +151,3 @@ services:
         condition: service_healthy
     ports:
       - '8081:8080'
-
-  tools-pipelines:
-    image: geonetwork/geonetwork-ui-tools-pipelines:latest
-    environment:
-      ES_HOST: http://elasticsearch:9200
-      RECORDS_INDEX: gn-records
-    depends_on:
-      init:
-        condition: service_completed_successfully
diff --git a/support-services/docker-entrypoint.d/02-set-default-pipeline.sh b/support-services/docker-entrypoint.d/02-set-default-pipeline.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+indexConfigDir=/mnt/geonetwork_data/config/index/
+
+echo "Setting default pipeline to geonetwork-ui ..."
+jq '.settings.index.default_pipeline = "geonetwork-ui"' ${indexConfigDir}records.json > /tmp.json
+mv /tmp.json ${indexConfigDir}records.json