Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into test/performance-tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
CachedaCodes committed Nov 13, 2023
2 parents c07d193 + 3edebea commit 3c0751a
Show file tree
Hide file tree
Showing 8 changed files with 126 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/actions/deploy/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
using: 'composite'
steps:
- name: Configure AWS credentials from Websites account
uses: aws-actions/configure-aws-credentials@v3
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ inputs.aws_role }}
aws-region: eu-west-1
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Install dependencies, build and test project
runs:
using: 'composite'
steps:
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
- name: Installing dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: '18'
- name: Install deps, build and test project
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: '18'
- name: Install deps, build and test project
Expand All @@ -30,7 +30,7 @@ jobs:
cloudfront_distribution_id: ${{ secrets.CLOUDFRONT_ID_TEST }}
cloudfront_invalidation_paths: '/preview/${{ github.event.number }}/*'
- name: Adding comment to PR with preview link and validation results
uses: actions/github-script@v5
uses: actions/github-script@v6
with:
github-token: ${{ secrets.SUPPORT_TOKEN }}
script: |
Expand Down
124 changes: 107 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.4",
"@empathyco/x-components": "^3.1.0-alpha.0",
"@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",
Expand All @@ -50,9 +50,9 @@
"@empathyco/x-tailwindcss": "^1.0.0-alpha.31",
"@empathyco/x-translations": "^1.1.0-alpha.33",
"@rollup/plugin-commonjs": "~21.0.1",
"@rollup/plugin-json": "~4.1.0",
"@rollup/plugin-json": "~6.0.0",
"@rollup/plugin-node-resolve": "~13.1.3",
"@rollup/plugin-replace": "~3.0.1",
"@rollup/plugin-replace": "~5.0.0",
"@types/autoprefixer": "~9.6.1",
"@types/cypress-cucumber-preprocessor": "~4.0.1",
"@types/jest": "~27.0.3",
Expand Down
13 changes: 10 additions & 3 deletions src/components/history-query-filters.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div v-if="filtersList && filtersList.length" class="x-text1-sm x-flex x-gap-8 x-text-lead-50">
<div v-if="filtersWithLabel.length" class="x-text1-sm x-flex x-gap-8 x-text-lead-50">
<div class="x-truncate">
<span v-for="filter in filtersList" :key="filter.id" class="x-pr-8">
<span v-for="filter in filtersWithLabel" :key="filter.id" class="x-pr-8">
{{ filter.label }}
</span>
</div>
Expand All @@ -10,7 +10,7 @@
</template>

<script lang="ts">
import { HistoryQuery } from '@empathyco/x-types';
import { Filter, HistoryQuery } from '@empathyco/x-types';
import { defineComponent, PropType } from 'vue';
export default defineComponent({
Expand All @@ -25,6 +25,13 @@
required: false,
default: false
}
},
setup(props) {
return {
filtersWithLabel: props.filtersList?.filter(
filter => (filter as Filter & { label?: string }).label
)
};
}
});
</script>
2 changes: 1 addition & 1 deletion src/components/predictive-layer/full-width-predictive.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:animation="empathizeAnimation"
class="x-layout-item x-absolute x-z-[1] x-w-full x-bg-neutral-0 x-py-4"
>
<MaxDesktopWidthItem v-if="showEmpathize">
<MaxDesktopWidthItem>
<DesktopSearchboxAlign>
<div class="x-layout-item">
<div v-if="showEmpathize || showIdentifierResults" class="x-h-full x-py-12 x-pl-[17px]">
Expand Down

0 comments on commit 3c0751a

Please sign in to comment.