Merge master (v1.18.2) into develop

.github/workflows/build.yml

@@ -22,7 +22,9 @@ jobs:
         node-version: 20
         cache: 'npm'
     - run: npm ci
-    - run: npm run ${{ inputs.build_script }}
+    - run: npm run "$BUILD_SCRIPT"
+      env:
+        BUILD_SCRIPT: ${{ inputs.build_script }}
     - name: Create build-output-US artifact
       uses: actions/upload-artifact@v4
       with:

.github/workflows/build_i18n.yml

@@ -45,7 +45,11 @@ jobs:
         node-version: 20
         cache: 'npm'
     - run: npm ci
-    - run: LANGUAGE=${{ matrix.language }} CLOUD_REGION=${{ inputs.cloud_region }} npm run ${{ inputs.build_script }}
+    - run: LANGUAGE="$LANGUAGE" CLOUD_REGION="$CLOUD_REGION" npm run "$BUILD_SCRIPT"
+      env:
+        LANGUAGE: ${{ matrix.language }}
+        CLOUD_REGION: ${{ inputs.cloud_regiont }}
+        BUILD_SCRIPT: ${{ inputs.build_script }}
     - run: |
         if [ "${{ matrix.language }}" == "en" ]; then 
           npm run size
@@ -55,7 +59,7 @@ jobs:
       with:
         name: build-output-${{ inputs.cloud_region }}-${{ matrix.language }}
         path: dist/
-        
+
   merge_multiple_artifacts:
       needs: build
       runs-on: ubuntu-latest

.github/workflows/deploy.yml

@@ -38,7 +38,11 @@ jobs:
           aws-region: us-east-1
       - name: Deploy to S3
         run: |
-          aws s3 cp ./dist/ s3://assets.sitescdn.net/${{ inputs.bucket }}/${{ inputs.directory }} \
+          aws s3 cp ./dist/ s3://assets.sitescdn.net/"$BUCKET"/"$DIRECTORY" \
           --acl public-read \
           --recursive \
-          --cache-control ${{ inputs.cache-control }}
+          --cache-control "CACHE_CONTROL"
+        env:
+          BUCKET: ${{ inputs.bucket }}
+          DIRECTORY: ${{ inputs.directory }}
+          CACHE_CONTROL: ${{ inputs.cache-control }}

.github/workflows/deploy_hold.yml

@@ -41,10 +41,14 @@ jobs:
           aws-region: us-east-1
       - name: Deploy to S3
         run: |
-          aws s3 cp ./dist/ s3://assets.sitescdn.net/${{ inputs.bucket }}/${{ inputs.directory }} \
+          aws s3 cp ./dist/ s3://assets.sitescdn.net/"$BUCKET"/"$DIRECTORY" \
           --acl public-read \
           --recursive \
-          --cache-control ${{ inputs.cache-control }}
+          --cache-control "$CACHE_CONTROL"
+        env:
+          BUCKET: ${{ inputs.bucket }}
+          DIRECTORY: ${{ inputs.directory }}
+          CACHE_CONTROL: ${{ inputs.cache-control }}
 
   deploy-gcp:
     runs-on: ubuntu-latest

.github/workflows/extract_versions.yml

@@ -8,11 +8,11 @@ on:
         default: ''
         type: string
     outputs:
-      major_version: 
+      major_version:
         value: ${{ jobs.extract_versions.outputs.major_version }}
-      minor_version: 
+      minor_version:
         value: ${{ jobs.extract_versions.outputs.minor_version }}
-      full_version: 
+      full_version:
         value: ${{ jobs.extract_versions.outputs.full_version }}
 
 jobs:
@@ -26,12 +26,14 @@ jobs:
       - name: extract major and minor version substrings
         id: vars
         run: |
-          MAJOR_VERSION="$(echo "${GITHUB_REF_NAME##${{ inputs.ignore_prefix }}}" | cut -d '.' -f 1)"
+          MAJOR_VERSION="$(echo "${GITHUB_REF_NAME##"$IGNORE_PREFIX"}" | cut -d '.' -f 1)"
           echo "Major version: $MAJOR_VERSION"
           echo major_version=${MAJOR_VERSION} >> $GITHUB_OUTPUT
-          MINOR_VERSION="$(echo "${GITHUB_REF_NAME##${{ inputs.ignore_prefix }}}" | cut -d '.' -f 1,2)"  
+          MINOR_VERSION="$(echo "${GITHUB_REF_NAME##"$IGNORE_PREFIX"}" | cut -d '.' -f 1,2)"  
           echo "Minor version: $MINOR_VERSION"
           echo minor_version=${MINOR_VERSION} >> $GITHUB_OUTPUT
-          FULL_VERSION="${GITHUB_REF_NAME##${{ inputs.ignore_prefix }}}"
+          FULL_VERSION="${GITHUB_REF_NAME##"$IGNORE_PREFIX"}"
           echo "Full version: $FULL_VERSION"
           echo full_version=${FULL_VERSION} >> $GITHUB_OUTPUT
+        env:
+          IGNORE_PREFIX: ${{ inputs.ignore_prefix }}}

.github/workflows/should_deploy_major_version.yml

@@ -8,7 +8,7 @@ on:
         default: ''
         type: string
     outputs:
-      should_deploy_major_version: 
+      should_deploy_major_version:
         value: ${{ jobs.should_deploy_major_version.outputs.should_deploy_major_version }}
 
 jobs:
@@ -23,14 +23,16 @@ jobs:
       - name: allow for major version deployment if the next minor version from current tag does not exist
         id: vars
         run: |
-          MINOR_VERSION=$(echo "${GITHUB_REF_NAME##${{ inputs.ignore_prefix }}}" | cut -d '.' -f 2) 
-          MAJOR_VERSION=$(echo "${GITHUB_REF_NAME##${{ inputs.ignore_prefix }}}" | cut -d '.' -f 1)
+          MINOR_VERSION=$(echo "${GITHUB_REF_NAME##"$IGNORE_PREFIX"}" | cut -d '.' -f 2) 
+          MAJOR_VERSION=$(echo "${GITHUB_REF_NAME##"$IGNORE_PREFIX"}" | cut -d '.' -f 1)
           NEXT_MINOR_VERSION=$(( $MINOR_VERSION + 1 ))
-          TAGS_FOR_NEXT_MINOR=$(git tag --list "${{ inputs.ignore_prefix }}$MAJOR_VERSION.$NEXT_MINOR_VERSION.*")
+          TAGS_FOR_NEXT_MINOR=$(git tag --list ""$IGNORE_PREFIX"$MAJOR_VERSION.$NEXT_MINOR_VERSION.*")
           if [ -z "$TAGS_FOR_NEXT_MINOR" ]
           then
             echo 'Major version should be deployed.'
             echo should_deploy_major_version=true >> $GITHUB_OUTPUT
           else
             echo 'Major version should not be deployed.'
           fi
+        env:
+          IGNORE_PREFIX: ${{ inputs.ignore_prefix }}}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yext/answers-search-ui",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "description": "Javascript Search Programming Interface",
   "main": "dist/answers-umd.js",
   "repository": {

src/core/models/generativedirectanswer.js

@@ -24,10 +24,16 @@ export default class GenerativeDirectAnswer {
 
     const verticalKey = searcher === Searcher.UNIVERSAL ? '' : verticalResults[0].verticalKey;
 
+    const citationIds = new Set(gdaResponse.citations);
     const citationsData = verticalResults
       .flatMap(vr => vr.results)
-      .filter(result => result.rawData?.uid && result.id && result.name)
-      .filter(result => gdaResponse.citations.includes(result.rawData.uid))
+      .filter(result => {
+        if (!result.rawData?.uid || !result.id || !result.name || !citationIds.has(result.rawData.uid)) {
+          return false;
+        }
+        citationIds.delete(result.rawData.uid);
+        return true;
+      })
       .map(result => {
         return {
           id: result.id,

tests/core/models/generativedirectanswer.js

@@ -189,4 +189,85 @@ describe('Constructs a generative direct answer from an answers-core generative
 
     expect(actualGenerativeDirectAnswer).toMatchObject(expectedGenerativeDirectAnswer);
   });
+
+  it('GDA citations on universal search are deduplicated', () => {
+    const coreGenerativeDirectAnswerResponse = {
+      directAnswer: 'This is some generated text **with bold**.',
+      resultStatus: 'SUCCESS',
+      citations: ['uuid-1']
+    };
+
+    const verticalResults = [
+      {
+        results: [
+          {
+            id: 'entityid-1',
+            rawData: {
+              uid: 'uuid-1',
+              someField: 'someValue'
+            },
+            name: 'name-1',
+            description: 'description-1',
+            otherData: 'otherData'
+          }
+        ],
+        resultsCount: 1,
+        verticalKey: 'vertical-key-1'
+      },
+      {
+        results: [
+          {
+            id: 'entityid-1',
+            rawData: {
+              uid: 'uuid-1',
+              someField: 'someValue'
+            },
+            name: 'name-1',
+            description: 'description-1',
+            otherData: 'otherData'
+          },
+          {
+            id: 'entityid-2',
+            rawData: {
+              uid: 'uuid-2',
+              someField: 'someValue'
+            },
+            name: 'name-2',
+            description: 'description-2',
+            otherData: 'otherData'
+          }
+        ],
+        resultsCount: 2,
+        verticalKey: 'vertical-key-2'
+      }
+    ];
+
+    const directAnswerAsHTML = RichTextFormatter.format(coreGenerativeDirectAnswerResponse.directAnswer, 'gda-snippet');
+    const expectedGenerativeDirectAnswer = {
+      directAnswer: directAnswerAsHTML,
+      resultStatus: 'SUCCESS',
+      citations: ['uuid-1'],
+      searcher: Searcher.UNIVERSAL,
+      citationsData: [
+        {
+          id: 'entityid-1',
+          name: 'name-1',
+          description: 'description-1',
+          rawData: {
+            uid: 'uuid-1',
+            someField: 'someValue'
+          }
+        }
+      ],
+      verticalKey: ''
+    };
+
+    const actualGenerativeDirectAnswer = GenerativeDirectAnswer.fromCore(
+      coreGenerativeDirectAnswerResponse,
+      Searcher.UNIVERSAL,
+      verticalResults
+    );
+
+    expect(actualGenerativeDirectAnswer).toMatchObject(expectedGenerativeDirectAnswer);
+  });
 });