From 292bb01232d2406b53c3cefbcb0df93261d37720 Mon Sep 17 00:00:00 2001 From: acondal Date: Mon, 16 Oct 2023 10:37:01 +0200 Subject: [PATCH 01/20] feat: selected Filters in myHistory EMP-2293 --- package-lock.json | 55 ++++++++++--------- package.json | 14 ++--- .../my-history/custom-my-history.vue | 10 ++++ 3 files changed, 45 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index b2d8417d..f0a95b65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,13 +9,13 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@empathyco/x-adapter": "^8.0.0-alpha.33", - "@empathyco/x-adapter-platform": "^1.0.0-alpha.83", - "@empathyco/x-archetype-utils": "^1.0.0-alpha.3", - "@empathyco/x-components": "^3.0.0-alpha.414", - "@empathyco/x-deep-merge": "^1.3.0-alpha.29", - "@empathyco/x-types": "^10.0.0-alpha.72", - "@empathyco/x-utils": "^1.0.0-alpha.20", + "@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.0-alpha.422", + "@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", "tslib": "~2.4.1", "vue": "~2.7.14", "vue-class-component": "~7.2.6", @@ -2089,12 +2089,12 @@ } }, "node_modules/@empathyco/x-adapter-platform": { - "version": "1.0.0-alpha.85", - "resolved": "https://registry.npmjs.org/@empathyco/x-adapter-platform/-/x-adapter-platform-1.0.0-alpha.85.tgz", - "integrity": "sha512-RrXFWUgqSDwAzlvYLCHHPmKgKkQKNKwmptvoiHXd3CAX0Jab6JCTG+c9t2MmDYV9hCAxDrjbFEtRMwX1M2sM5w==", + "version": "1.0.0-alpha.88", + "resolved": "https://registry.npmjs.org/@empathyco/x-adapter-platform/-/x-adapter-platform-1.0.0-alpha.88.tgz", + "integrity": "sha512-efA/kQvy+k+zdczN0bwUbxzxNb1rl+0EU1Wshf74ihbpWIPiQT5cOTNCvj1ZuvK3UmG6uzVsioiCrlO7Yn/Aig==", "dependencies": { "@empathyco/x-adapter": "^8.0.0-alpha.34", - "@empathyco/x-types": "^10.0.0-alpha.73", + "@empathyco/x-types": "^10.0.0-alpha.75", "@empathyco/x-utils": "^1.0.0-alpha.23", "tslib": "~2.5.0" }, @@ -2125,11 +2125,11 @@ "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" }, "node_modules/@empathyco/x-archetype-utils": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@empathyco/x-archetype-utils/-/x-archetype-utils-1.0.0-alpha.3.tgz", - "integrity": "sha512-M3INzSFM0SKtwEk0P6gCRKuTQtg+KgPcLkqJAq9NWS0axiuwz7dBwWDCimITTN1550Fcofcz3SCURwthlYI33w==", + "version": "1.0.0-alpha.4", + "resolved": "https://registry.npmjs.org/@empathyco/x-archetype-utils/-/x-archetype-utils-1.0.0-alpha.4.tgz", + "integrity": "sha512-Hn7KcE9zWj6JSOex8WQqze0Q9L4+6X293I3EMOU6Xmng5LKoQY/UpgnF7Fp0nEJSp6SfJvZ9YehHHWhLrrFd3Q==", "dependencies": { - "@empathyco/x-deep-merge": "^2.0.0-alpha.2", + "@empathyco/x-deep-merge": "^2.0.0-alpha.3", "tslib": "~2.5.0", "vue-i18n": "~8.28.2" }, @@ -2142,11 +2142,11 @@ } }, "node_modules/@empathyco/x-archetype-utils/node_modules/@empathyco/x-deep-merge": { - "version": "2.0.0-alpha.2", - "resolved": "https://registry.npmjs.org/@empathyco/x-deep-merge/-/x-deep-merge-2.0.0-alpha.2.tgz", - "integrity": "sha512-C1/jZ/70oceI9Uxc9tGv692AKuzgl/BAFE1lYN5T1ubgduexI+Z8JgHbV6FTZQBKyGrap3E/o32/5i04naieAQ==", + "version": "2.0.0-alpha.3", + "resolved": "https://registry.npmjs.org/@empathyco/x-deep-merge/-/x-deep-merge-2.0.0-alpha.3.tgz", + "integrity": "sha512-qvHvEVt3FoZXdlfxvEQExxF/q6F+wgTKdd9TIOxWUjZUlajrLdLXXWPnmBp5iEnz4Xzz4yxeHKdPRV1kv9aU2g==", "dependencies": { - "@empathyco/x-utils": "^1.0.0-alpha.22", + "@empathyco/x-utils": "^1.0.0-alpha.23", "tslib": "~2.5.0" }, "engines": { @@ -2183,17 +2183,17 @@ "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" }, "node_modules/@empathyco/x-components": { - "version": "3.0.0-alpha.414", - "resolved": "https://registry.npmjs.org/@empathyco/x-components/-/x-components-3.0.0-alpha.414.tgz", - "integrity": "sha512-STKDMja1Xe6LoIjHZ5thYIZNGa8+c+sV2f8Met/TFf6MjVPe16vjlSOlU1KDRv5ZMhc/IQl6F2t4EvZ4C9yS0w==", + "version": "3.0.0-alpha.422", + "resolved": "https://registry.npmjs.org/@empathyco/x-components/-/x-components-3.0.0-alpha.422.tgz", + "integrity": "sha512-prYfv/TVvJUTnbxrsembCqyhdfuVrlpGoEW0speP/9G2Xm2DzE+E5NMvugYkzNaVU+hkZHx3S2eRK5Z1TH8yoA==", "dependencies": { "@empathyco/x-adapter": "^8.0.0-alpha.34", - "@empathyco/x-adapter-platform": "^1.0.0-alpha.85", + "@empathyco/x-adapter-platform": "^1.0.0-alpha.88", "@empathyco/x-bus": "^1.0.0-alpha.4", "@empathyco/x-deep-merge": "^2.0.0-alpha.3", "@empathyco/x-logger": "^1.2.0-alpha.11", "@empathyco/x-storage-service": "^2.0.0-alpha.15", - "@empathyco/x-types": "^10.0.0-alpha.73", + "@empathyco/x-types": "^10.0.0-alpha.75", "@empathyco/x-utils": "^1.0.0-alpha.23", "@vue/devtools-api": "~6.5.0", "@vueuse/core": "~10.1.0", @@ -2373,11 +2373,12 @@ } }, "node_modules/@empathyco/x-types": { - "version": "10.0.0-alpha.73", - "resolved": "https://registry.npmjs.org/@empathyco/x-types/-/x-types-10.0.0-alpha.73.tgz", - "integrity": "sha512-brIP6+ewUGG10gEGLVuokC7Q3A/pn8o+74gm7zbqrEA/+xAVEvCSAbBsJ3X6BobCYP7BMfMD1SVoQ9mkPeA2wg==", + "version": "10.0.0-alpha.75", + "resolved": "https://registry.npmjs.org/@empathyco/x-types/-/x-types-10.0.0-alpha.75.tgz", + "integrity": "sha512-JwTmYhIDu7wv82e7L5G2sbTloEd+KGXm2jNZlrwhg3NAS8XPRG7WAyGBXtWi106TAz7MW6p3hPclpwR4s9/cYg==", "dependencies": { "@empathyco/x-adapter": "^8.0.0-alpha.34", + "@empathyco/x-utils": "^1.0.0-alpha.23", "tslib": "~2.5.0" }, "engines": { diff --git a/package.json b/package.json index fe91bb7d..6b2f76fe 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,13 @@ "prepare": "husky install" }, "dependencies": { - "@empathyco/x-adapter": "^8.0.0-alpha.33", - "@empathyco/x-adapter-platform": "^1.0.0-alpha.83", - "@empathyco/x-archetype-utils": "^1.0.0-alpha.3", - "@empathyco/x-components": "^3.0.0-alpha.414", - "@empathyco/x-deep-merge": "^1.3.0-alpha.29", - "@empathyco/x-types": "^10.0.0-alpha.72", - "@empathyco/x-utils": "^1.0.0-alpha.20", + "@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.0-alpha.422", + "@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", "tslib": "~2.4.1", "vue": "~2.7.14", "vue-class-component": "~7.2.6", diff --git a/src/components/my-history/custom-my-history.vue b/src/components/my-history/custom-my-history.vue index ddb2c920..e642ca39 100644 --- a/src/components/my-history/custom-my-history.vue +++ b/src/components/my-history/custom-my-history.vue @@ -22,6 +22,16 @@

{{ suggestion.query }}

+ +

{{ formatTime(suggestion.timestamp) }} diff --git a/src/components/predictive-layer/predictive-layer.vue b/src/components/predictive-layer/predictive-layer.vue index 8031bf8e..c367b2ed 100644 --- a/src/components/predictive-layer/predictive-layer.vue +++ b/src/components/predictive-layer/predictive-layer.vue @@ -56,7 +56,13 @@ > diff --git a/src/components/predictive-layer/predictive-layer.vue b/src/components/predictive-layer/predictive-layer.vue index c367b2ed..b36745e4 100644 --- a/src/components/predictive-layer/predictive-layer.vue +++ b/src/components/predictive-layer/predictive-layer.vue @@ -60,7 +60,7 @@

From 94aec1e82747043d8468e26789e73bb07f0daa02 Mon Sep 17 00:00:00 2001 From: Laura Martinez Garcia Date: Thu, 2 Nov 2023 16:17:03 +0100 Subject: [PATCH 20/20] feat(my-history): underline only the query --- src/components/predictive-layer/predictive-layer.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/predictive-layer/predictive-layer.vue b/src/components/predictive-layer/predictive-layer.vue index b36745e4..e1535ee8 100644 --- a/src/components/predictive-layer/predictive-layer.vue +++ b/src/components/predictive-layer/predictive-layer.vue @@ -50,14 +50,18 @@ >