Merge remote-tracking branch 'origin/main' into feature/EMP-2293-Add-…

…filters-in-my-history # Conflicts: # package-lock.json # package.json
empathyco · Nov 2, 2023 · 6dfe40f · 6dfe40f
2 parents 9627342 + 77b6f1e
commit 6dfe40f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "@empathyco/x-adapter": "^8.0.0-alpha.34",
     "@empathyco/x-adapter-platform": "^1.0.0-alpha.88",
     "@empathyco/x-archetype-utils": "^1.0.0-alpha.4",
-    "@empathyco/x-components": "^3.0.1-alpha.1",
+    "@empathyco/x-components": "^3.0.1-alpha.4",
     "@empathyco/x-deep-merge": "^1.3.0-alpha.34",
     "@empathyco/x-types": "^10.0.0-alpha.75",
     "@empathyco/x-utils": "^1.0.0-alpha.23",

diff --git a/src/adapter/adapter.ts b/src/adapter/adapter.ts
@@ -61,13 +61,6 @@ semanticQueriesRequestSchema.$override<
   }
 });
 
-// TODO: Remove when the endpoint is propery created in the platform adapter
-// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-const experienceControlsAdapter = adapter.experienceControls.extends({
-  endpoint: 'https://config-service.internal.test.empathy.co/public/configs'
-});
-platformAdapter.experienceControls = experienceControlsAdapter;
-
 // eslint-disable-next-line @typescript-eslint/no-unsafe-call
 experienceControlsResponseSchema.$override<
   PlatformExperienceControlsResponse,

diff --git a/src/components/predictive-layer/sliding-recommendations.vue b/src/components/predictive-layer/sliding-recommendations.vue
@@ -18,7 +18,7 @@
 
       <Recommendations class="x-flex x-flex-row x-gap-12 x-pl-16 desktop:x-pl-0">
         <template #default="{ recommendation }">
-          <DisplayClickProvider resultFeature="recommendations">
+          <DisplayClickProvider resultFeature="topclicked_recommendations">
             <Result
               :result="recommendation"
               data-test="recommendation-item"

diff --git a/src/components/results/custom-recommendations.vue b/src/components/results/custom-recommendations.vue
@@ -8,7 +8,7 @@
     </h1>
     <Recommendations v-if="!$x.totalResults">
       <template #layout="{ recommendations }">
-        <DisplayClickProvider resultFeature="recommendations">
+        <DisplayClickProvider resultFeature="topclicked_recommendations">
           <BaseGrid
             #default="{ item: result }"
             :animation="staggeredFadeAndSlide"

diff --git a/src/components/search/custom-semantic-queries.vue b/src/components/search/custom-semantic-queries.vue
@@ -23,7 +23,7 @@
               <ArrowRightIcon class="x-icon-lg" />
             </SemanticQuery>
           </template>
-          <DisplayClickProvider resultFeature="semantics">
+          <DisplayClickProvider resultFeature="semantic_recommendations">
             <div class="x-flex x-gap-16 x-pt-16 max-desktop:x-px-16">
               <Result
                 v-for="result in results.slice(0, resultsPerCarousel)"

diff --git a/src/components/search/results/custom-next-query-preview.vue b/src/components/search/results/custom-next-query-preview.vue
@@ -27,7 +27,9 @@
         itemClass="x-flex-shrink-0"
       >
         <template #result="{ item: result }">
-          <Result :result="result" class="x-w-[calc(38vw-16px)] desktop:x-max-w-[265px]" />
+          <DisplayClickProvider resultFeature="next_query_recommendations">
+            <Result :result="result" class="x-w-[calc(38vw-16px)] desktop:x-max-w-[265px]" />
+          </DisplayClickProvider>
         </template>
       </ItemsList>
     </CustomSlidingPanel>
@@ -42,6 +44,7 @@
   import { useDevice } from '../../../composables/use-device.composable';
   import Result from '../../results/result.vue';
   import CustomSlidingPanel from '../../custom-sliding-panel.vue';
+  import DisplayClickProvider from '../display-click-provider.vue';
 
   export default defineComponent({
     components: {
@@ -50,7 +53,8 @@
       Result,
       ArrowRightIcon,
       ItemsList,
-      NextQueryPreview
+      NextQueryPreview,
+      DisplayClickProvider
     },
     props: {
       nextQuery: { type: Object as PropType<NextQueryModel>, required: true }