Merge remote-tracking branch 'origin/develop' into uat

superdesk · Sep 9, 2024 · 933320f · 933320f
2 parents 3970de5 + 404310a
commit 933320f
Show file tree

Hide file tree

Showing 42 changed files with 2,585 additions and 1,710 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ jobs:
 
   server:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     services:
       redis:
@@ -36,7 +36,7 @@ jobs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.8'
+        python-version: '3.10'
 
     - run: |
         sudo apt-get update
@@ -59,7 +59,7 @@ jobs:
 
   client:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     defaults:
       run:
@@ -72,6 +72,6 @@ jobs:
       with:
         node-version: '14.x'
 
-    - run: npm ci
+    - run: npm ci --verbose
 
     - run: npm run build
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/DEVSETUP.md b/DEVSETUP.md
diff --git a/Dockerfile b/Dockerfile
diff --git a/client/.dockerignore b/client/.dockerignore
@@ -0,0 +1 @@
+**/node_modules
diff --git a/client/Dockerfile b/client/Dockerfile
@@ -0,0 +1,14 @@
+FROM node:14
+
+RUN useradd -ms /bin/sh -u 1001 app
+USER app
+
+WORKDIR /opt/client
+COPY package.json package-lock.json ./
+RUN npm ci
+
+COPY --chown=app:app . /opt/client
+
+RUN npm run build
+
+CMD ["npm", "run", "start"]
diff --git a/client/extensions/auto-tagger/src/adapter.ts b/client/extensions/auto-tagger/src/adapter.ts
@@ -46,10 +46,12 @@ export function toClientFormat(response: IServerResponse): OrderedMap<string, IT
     let tags = OrderedMap<string, ITagUi>();
 
     response.subject?.forEach((item) => {
+
         const {name, description, qcode, source, altids, aliases, original_source, parent, scheme, relevance, creator} = item;
 
         // Checking if the item has original_source to filter auto tagger tags
         if (original_source != null) {
+
             if (scheme === 'http://cv.iptc.org/newscodes/mediatopic/' || scheme === 'subject') {
                 const tag: ITagUi = {
                     name,
@@ -67,7 +69,6 @@ export function toClientFormat(response: IServerResponse): OrderedMap<string, IT
                     relevance,
                     creator,
                 };
-
                 tags = tags.set(tag.qcode, tag);
             } else {
                 const tag: ITagUi = {
@@ -86,7 +87,6 @@ export function toClientFormat(response: IServerResponse): OrderedMap<string, IT
                     relevance,
                     creator,
                 };
-
                 tags = tags.set(tag.qcode, tag);
             }
         }