Merge branch 'develop' into feature/answers-to-search

merge with develop .
yext · Jul 13, 2022 · 0f5bcc9 · 0f5bcc9
2 parents a70ab0d + d7f2df4
commit 0f5bcc9
Show file tree

Hide file tree

Showing 11 changed files with 595 additions and 433 deletions.
diff --git a/.github/workflows/run-linting.yml b/.github/workflows/run-linting.yml
@@ -0,0 +1,9 @@
+name: Run Linter
+
+on:
+  pull_request:
+    branches: [main, develop, release/*, hotfix/*]
+
+jobs:
+  linting:
+    uses: yext/slapshot-reusable-workflows/.github/workflows/run-linting.yml@v1
diff --git a/.github/workflows/sync_develop_and_main.yml b/.github/workflows/sync_develop_and_main.yml
@@ -0,0 +1,11 @@
+name: Create PR from main to develop
+
+on:
+  push:
+    branches: main
+
+jobs:
+  call_sync_develop_and_main:
+    uses: yext/slapshot-reusable-workflows/.github/workflows/sync_develop_and_main.yml@v1
+    secrets:
+      caller_github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/version_update.yml b/.github/workflows/version_update.yml
@@ -0,0 +1,11 @@
+name: Update package version for release & hotfix branches
+
+on:
+  push:
+    branches: [release/*, hotfix/*]
+
+jobs:
+  call_version_update:
+    uses: yext/slapshot-reusable-workflows/.github/workflows/version_update.yml@v1
+    secrets:
+      caller_github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/LICENSE b/LICENSE
@@ -6,7 +6,7 @@ which is made available under the ODC Attribution License (https://github.com/ma
 
 BSD 3-Clause License
 
-Copyright (c) 2021, Yext
+Copyright (c) 2022, Yext
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,11 +1,17 @@
 {
   "name": "@yext/search-headless",
   "version": "1.2.0",
-  "description": "",
+  "description": "A library for powering UI components for Yext Search integrations",
   "author": "slapshot@yext.com",
-  "license": "ISC",
+  "license": "BSD-3-Clause",
   "main": "./dist/commonjs/src/index.js",
   "module": "./dist/esm/src/index.js",
+  "keywords": [
+    "search",
+    "yext",
+    "redux",
+    "state management"
+  ], 
   "files": [
     "dist",
     "lib",
@@ -37,11 +43,11 @@
     "@types/node": "^16.11.12",
     "@typescript-eslint/eslint-plugin": "^5.16.0",
     "@typescript-eslint/parser": "^5.16.0",
-    "@yext/eslint-config-slapshot": "^0.2.0",
+    "@yext/eslint-config-slapshot": "^0.4.0",
     "@yext/eslint-plugin-export-star": "^1.0.0",
     "babel-jest": "^27.4.5",
     "eslint": "^8.11.0",
-    "eslint-config-react-app": "^7.0.0",
+    "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-tsdoc": "^0.2.14",
     "generate-license-file": "^1.3.0",
     "jest": "^28.1.0",

diff --git a/src/slices/filters.ts b/src/slices/filters.ts
@@ -59,7 +59,7 @@ const reducers = {
     if (!state.static) {
       state.static = [];
     }
-    const { selected, displayName:_, ...targetFilter } = payload;
+    const { selected, displayName: _, ...targetFilter } = payload;
     const matchingFilter = state.static.find(storedFilter => {
       return areFiltersEqual(storedFilter, targetFilter);
     });

diff --git a/src/utils/transform-filters.ts b/src/utils/transform-filters.ts
@@ -37,12 +37,12 @@ export function transformFiltersToCoreFormat(
     return null;
   }
   if (selectableFilters.length === 1) {
-    const { selected, displayName:_, ...filter } = selectableFilters[0];
+    const { selected, displayName: _, ...filter } = selectableFilters[0];
     return selected ? filter : null;
   }
   const selectedFilters = selectableFilters.filter(selectableFilter => selectableFilter.selected);
   const groupedFilters: Record<string, Filter[]> = selectedFilters.reduce((groups, element) => {
-    const { selected:_, displayName:__, ...filter } = element;
+    const { selected: _, displayName: __, ...filter } = element;
     groups[filter.fieldId]
       ? groups[filter.fieldId].push(filter)
       : groups[filter.fieldId] = [filter];

diff --git a/tests/integration/facets.ts b/tests/integration/facets.ts
@@ -294,7 +294,6 @@ it('can reset facets correctly', () => {
   );
 });
 
-
 function createInitialState(
   facetIsSelected: boolean
 ): [initialState: Partial<State>, facetOption: DisplayableFacetOption] {

diff --git a/tests/integration/verticalsearch.ts b/tests/integration/verticalsearch.ts
@@ -168,7 +168,6 @@ it('answers.setVerticalLimit sets the vertical limit when a number is passed to
   expect(answers.state.vertical.limit).toEqual(7);
 });
 
-
 it('handle a rejected promise from core', async () => {
   const mockSearch = createMockRejectedSearch();
   const mockCore = { verticalSearch: mockSearch };

diff --git a/tests/unit/search-headless.ts b/tests/unit/search-headless.ts
@@ -57,7 +57,7 @@ const mockedStateManager: jest.Mocked<StateManager> = {
   addListener: jest.fn()
 };
 
-const mockedSearch = jest.fn(() => { return { queryId: '123' };});
+const mockedSearch = jest.fn(() => { return { queryId: '123' }; });
 const mockedCore: any = {
   verticalAutocomplete: jest.fn(() => { return {}; }),
   universalAutocomplete: jest.fn(() => { return {}; }),
@@ -302,7 +302,6 @@ describe('filter functions work as expected', () => {
   });
 });
 
-
 describe('auto-complete works as expected', () => {
   beforeEach(() => {
     jest.clearAllMocks();