From e635d138c5135e07ec0720b6325278d942a1a46b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Bal=C3=A7a?= Date: Fri, 16 Sep 2022 10:37:35 +0100 Subject: [PATCH 1/3] Fix widget-builder --- frontend/src/modules/report/components/report-form.vue | 6 +++--- .../components/cube/_query_builder/TimeDimensionSelect.vue | 2 +- .../modules/widget/components/cube/widget-cube-builder.vue | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/modules/report/components/report-form.vue b/frontend/src/modules/report/components/report-form.vue index 0882ee04c9..7d04958d15 100644 --- a/frontend/src/modules/report/components/report-form.vue +++ b/frontend/src/modules/report/components/report-form.vue @@ -14,7 +14,7 @@
@@ -23,7 +23,7 @@ @@ -32,7 +32,7 @@ diff --git a/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue index 6a9a80129e..c2642067c8 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue @@ -29,7 +29,7 @@ import { i18n } from '@/i18n' export default { name: 'TimeDimensionSelect', props: { - measure: { + measures: { type: Array, default: () => [] }, diff --git a/frontend/src/modules/widget/components/cube/widget-cube-builder.vue b/frontend/src/modules/widget/components/cube/widget-cube-builder.vue index 7574f48510..6f1485d259 100644 --- a/frontend/src/modules/widget/components/cube/widget-cube-builder.vue +++ b/frontend/src/modules/widget/components/cube/widget-cube-builder.vue @@ -202,7 +202,6 @@ Save Widget From 84220e3bae8ced815a9626c5c6cdc5ba6e1421cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Bal=C3=A7a?= Date: Fri, 16 Sep 2022 14:37:20 +0100 Subject: [PATCH 2/3] Fix order.vue --- frontend/package-lock.json | 35 ++++++----- frontend/package.json | 2 +- .../cube/_query_builder/DateRangeSelect.vue | 4 +- .../cube/_query_builder/DimensionSelect.vue | 17 ++++-- .../cube/_query_builder/FilterComponent.vue | 4 +- .../cube/_query_builder/GranularitySelect.vue | 4 +- .../components/cube/_query_builder/Limit.vue | 13 +++-- .../cube/_query_builder/MeasureSelect.vue | 4 +- .../components/cube/_query_builder/Order.vue | 58 +++++++++---------- .../_query_builder/TimeDimensionSelect.vue | 4 +- .../components/cube/widget-cube-builder.vue | 18 +++--- 11 files changed, 89 insertions(+), 74 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d8e5b99d24..24e8d07fba 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "0.6.0", + "version": "0.5.0", "lockfileVersion": 2, "requires": true, "packages": { @@ -38,7 +38,7 @@ "vue-grid-layout": "3.0.0-beta1", "vue-json-pretty": "^2.2.2", "vue-router": "^4.0.12", - "vuedraggable": "^2.24.3", + "vuedraggable": "^4.1.0", "vuex": "^4.0.2", "xlsx": "^0.17.2", "yup": "^0.32.11" @@ -13530,9 +13530,9 @@ } }, "node_modules/sortablejs": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz", - "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==" + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" }, "node_modules/source-map": { "version": "0.6.1", @@ -14868,11 +14868,14 @@ "dev": true }, "node_modules/vuedraggable": { - "version": "2.24.3", - "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz", - "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", "dependencies": { - "sortablejs": "1.10.2" + "sortablejs": "1.14.0" + }, + "peerDependencies": { + "vue": "^3.0.1" } }, "node_modules/vuex": { @@ -26000,9 +26003,9 @@ } }, "sortablejs": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz", - "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==" + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" }, "source-map": { "version": "0.6.1", @@ -26992,11 +26995,11 @@ "dev": true }, "vuedraggable": { - "version": "2.24.3", - "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz", - "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", "requires": { - "sortablejs": "1.10.2" + "sortablejs": "1.14.0" } }, "vuex": { diff --git a/frontend/package.json b/frontend/package.json index 00b85ed0fe..d3a0073d72 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -43,7 +43,7 @@ "vue-grid-layout": "3.0.0-beta1", "vue-json-pretty": "^2.2.2", "vue-router": "^4.0.12", - "vuedraggable": "^2.24.3", + "vuedraggable": "^4.1.0", "vuex": "^4.0.2", "xlsx": "^0.17.2", "yup": "^0.32.11" diff --git a/frontend/src/modules/widget/components/cube/_query_builder/DateRangeSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/DateRangeSelect.vue index ee787fcf48..eafaff7e3a 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/DateRangeSelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/DateRangeSelect.vue @@ -4,7 +4,7 @@ >Date Range o.value === timeDimensions[0].dateRange @@ -17,7 +17,7 @@ diff --git a/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue index 24d859157b..d51b27ad10 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue @@ -11,18 +11,15 @@ @@ -106,6 +103,16 @@ export default { measure.name ].includes(t.name) }) + }, + value: { + get() { + return this.translatedOptions(this.dimensions).map( + (i) => i.label + ) + }, + set(value) { + return this.setDimensions([value]) + } } } } diff --git a/frontend/src/modules/widget/components/cube/_query_builder/FilterComponent.vue b/frontend/src/modules/widget/components/cube/_query_builder/FilterComponent.vue index fd6b18c0a0..3448805356 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/FilterComponent.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/FilterComponent.vue @@ -55,7 +55,7 @@ @@ -70,7 +70,7 @@ {{ actionItem.text }} diff --git a/frontend/src/modules/widget/components/cube/_query_builder/GranularitySelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/GranularitySelect.vue index 81c5792dd2..498001dc35 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/GranularitySelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/GranularitySelect.vue @@ -8,7 +8,7 @@ item-value="name" clearable filterable - :value=" + :model-value=" timeDimensions[0] && timeDimensions[0].granularity " @change="(g) => handleChange(g)" @@ -16,7 +16,7 @@ {{ item.name }} diff --git a/frontend/src/modules/widget/components/cube/_query_builder/Limit.vue b/frontend/src/modules/widget/components/cube/_query_builder/Limit.vue index 1fe1bbea9f..40de38ee73 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/Limit.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/Limit.vue @@ -2,7 +2,7 @@
i.label) " @change="(m) => setMeasures([m])" @@ -13,7 +13,7 @@ v-for="item in translatedOptions(availableMeasures)" :key="item.value" :label="item.label" - :value="item.value" + :model-value="item.value" >
diff --git a/frontend/src/modules/widget/components/cube/_query_builder/Order.vue b/frontend/src/modules/widget/components/cube/_query_builder/Order.vue index 91c04475d8..40eeecdd7f 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/Order.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/Order.vue @@ -6,34 +6,32 @@ class="list-group" @end="handleDragEnd" > -
-
- - {{ member.title }} -
- - Asc - Desc +
+
+ + {{ element.title }} +
+ - None - -
+ Asc + Desc + None + +
+
@@ -81,13 +79,13 @@ export default { diff --git a/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue index c2642067c8..80cff8d4bf 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue @@ -4,7 +4,7 @@ >Time Dimensions diff --git a/frontend/src/modules/widget/components/cube/widget-cube-builder.vue b/frontend/src/modules/widget/components/cube/widget-cube-builder.vue index 6f1485d259..4302504b17 100644 --- a/frontend/src/modules/widget/components/cube/widget-cube-builder.vue +++ b/frontend/src/modules/widget/components/cube/widget-cube-builder.vue @@ -89,7 +89,7 @@ >Chart Type - + Additional Settings +
Date: Fri, 16 Sep 2022 14:51:46 +0100 Subject: [PATCH 3/3] Fix el-select of widget builder --- .../python/serverless/serverless.yml | 150 +++++++++++++----- frontend/src/i18n/en.js | 10 +- .../cube/_query_builder/DateRangeSelect.vue | 2 +- .../cube/_query_builder/DimensionSelect.vue | 4 +- .../cube/_query_builder/FilterComponent.vue | 4 +- .../cube/_query_builder/GranularitySelect.vue | 2 +- .../components/cube/_query_builder/Limit.vue | 3 +- .../cube/_query_builder/MeasureSelect.vue | 2 +- .../_query_builder/TimeDimensionSelect.vue | 2 +- 9 files changed, 126 insertions(+), 53 deletions(-) diff --git a/backend/src/serverless/microservices/python/serverless/serverless.yml b/backend/src/serverless/microservices/python/serverless/serverless.yml index ea4f2dc60c..229fbb2018 100644 --- a/backend/src/serverless/microservices/python/serverless/serverless.yml +++ b/backend/src/serverless/microservices/python/serverless/serverless.yml @@ -17,14 +17,20 @@ provider: Resource: - '*' region: ${env:AWS_REGION} - ecr: - # In this section you can define images that will be built locally and uploaded to ECR - images: - pythonMicroservices: - path: ../ custom: currentStage: ${opt:stage, self:provider.stage} # 'staging' is default unless overriden by --stage flag + scripts: + hooks: + # The psycopg2-3.8 folder contains the psycopg2 package compiled for the lambda environment. + # If it is installed using pip it only works when a linux machine has done the install. + # We change the name to psycopg2 so lambda will use the folder as the psycopg2 package. + # We need to rename because if it lives named as psycopg2 it overwrites the psycopg2 installation + # that one might have in local, and thus functions cannot be invoked locally since the package + # might not be compatible with our system. + 'package:initialize': cp -r psycopg2-3.8 psycopg2 + 'deploy:finalize': rm -rf psycopg2 + localstack: host: ${env:LOCALSTACK_HOSTNAME} stages: @@ -48,18 +54,8 @@ constructs: batchSize: 1 # Lambda will receive 1 message at a time worker: timeout: 900 - image: ${env:AWS_ACCOUNT_ID}.dkr.ecr.${env:AWS_REGION}.amazonaws.com/python-microservices-lambda:${env:CROWD_VERSION} + handler: handler_scheduled.worker environment: - DD_ENV: ${env:NODE_ENV} - DD_LAMBDA_HANDLER: serverless.handler_scheduled.worker - DD_LOGS_ENABLED: true - DD_CAPTURE_LAMBDA_PAYLOAD: true - DD_SITE: datadoghq.eu - DD_API_KEY_SECRET_ARN: ${env:DATADOG_API_KEY_SECRET_ARN} - DD_TRACE_ENABLED: true - DD_TAGS: 'context:pythonMicroservices' - DD_SERVICE: 'pythonMicroservices' - DD_LOGS_INJECTION: true NODE_ENV: ${env:NODE_ENV} LOCALSTACK_HOSTNAME: ${env:LOCALSTACK_HOSTNAME} LOCALSTACK_PORT: ${env:LOCALSTACK_PORT} @@ -72,7 +68,7 @@ constructs: functions: coordinator: - image: ${env:AWS_ACCOUNT_ID}.dkr.ecr.${env:AWS_REGION}.amazonaws.com/python-microservices-lambda:${env:CROWD_VERSION} + handler: handler_scheduled.coordinator events: - schedule: rate: rate(2 hours) @@ -83,19 +79,6 @@ functions: input: service: check_merge environment: - DD_ENV: ${env:NODE_ENV} - DD_LAMBDA_HANDLER: serverless.handler_scheduled.coordinator - DD_LOGS_ENABLED: true - DD_CAPTURE_LAMBDA_PAYLOAD: true - DD_SITE: datadoghq.eu - DD_API_KEY_SECRET_ARN: ${env:DATADOG_API_KEY_SECRET_ARN} - DD_TRACE_ENABLED: true - DD_TAGS: 'context:pythonMicroservices' - DD_SERVICE: 'pythonMicroservices' - DD_LOGS_INJECTION: true - DD_FLUSH_TO_LOG: true - DD_LOG_LEVEL: 'debug' - DD_ENHANCED_METRICS: true NODE_ENV: ${env:NODE_ENV} EDITION: ${env:EDITION} SEGMENT_WRITE_KEY: ${env:SEGMENT_WRITE_KEY} @@ -111,18 +94,8 @@ functions: PYTHON_MICROSERVICES_SQS_URL: ${env:PYTHON_MICROSERVICES_SQS_URL} testSqs: - image: ${env:AWS_ACCOUNT_ID}.dkr.ecr.${env:AWS_REGION}.amazonaws.com/python-microservices-lambda:${env:CROWD_VERSION} + handler: handler_scheduled.worker environment: - DD_ENV: ${env:NODE_ENV} - DD_LAMBDA_HANDLER: serverless.handler_scheduled.worker - DD_LOGS_ENABLED: true - DD_CAPTURE_LAMBDA_PAYLOAD: true - DD_SITE: datadoghq.eu - DD_API_KEY_SECRET_ARN: ${env:DATADOG_API_KEY_SECRET_ARN} - DD_TRACE_ENABLED: true - DD_TAGS: 'context:pythonMicroservices' - DD_SERVICE: 'pythonMicroservices' - DD_LOGS_INJECTION: true NODE_ENV: ${env:NODE_ENV} EDITION: ${env:EDITION} SEGMENT_WRITE_KEY: ${env:SEGMENT_WRITE_KEY} @@ -133,11 +106,106 @@ functions: DB_OPERATIONS_SQS_URL: ${env:DB_OPERATIONS_SQS_URL} PYTHON_MICROSERVICES_SQS_URL: ${env:PYTHON_MICROSERVICES_SQS_URL} + gitHubOnboardingCoordinator: + handler: handler_github.onboarding_coordinator + environment: + NODE_ENV: ${env:NODE_ENV} + EDITION: ${env:EDITION} + SEGMENT_WRITE_KEY: ${env:SEGMENT_WRITE_KEY} + LOCALSTACK_HOSTNAME: ${env:LOCALSTACK_HOSTNAME} + LOCALSTACK_PORT: ${env:LOCALSTACK_PORT} + DATABASE_USERNAME: ${env:DATABASE_USERNAME} + DATABASE_PASSWORD: ${env:DATABASE_PASSWORD} + DATABASE_DATABASE: ${env:DATABASE_DATABASE} + DATABASE_HOST_READ: ${env:DATABASE_HOST_WRITE} + DB_OPERATIONS_SQS_URL: ${env:DB_OPERATIONS_SQS_URL} + AWS_ACCESS_KEY_ID_CROWD: ${env:AWS_ACCESS_KEY_ID, false} + AWS_SECRET_ACCESS_KEY_CROWD: ${env:AWS_SECRET_ACCESS_KEY, false} + ONBOARDING_STATE_MACHINE_ARN: ${self:resources.Outputs.OnboardingStateMachine.Value} + + gitHubOnboardingWorker: + handler: handler_github.onboarding_worker + environment: + NODE_ENV: ${env:NODE_ENV} + EDITION: ${env:EDITION} + SEGMENT_WRITE_KEY: ${env:SEGMENT_WRITE_KEY} + LOCALSTACK_HOSTNAME: ${env:LOCALSTACK_HOSTNAME} + LOCALSTACK_PORT: ${env:LOCALSTACK_PORT} + DATABASE_USERNAME: ${env:DATABASE_USERNAME} + DATABASE_PASSWORD: ${env:DATABASE_PASSWORD} + DATABASE_DATABASE: ${env:DATABASE_DATABASE} + DATABASE_HOST_READ: ${env:DATABASE_HOST_WRITE} + DB_OPERATIONS_SQS_URL: ${env:DB_OPERATIONS_SQS_URL} + AWS_ACCESS_KEY_ID_CROWD: ${env:AWS_ACCESS_KEY_ID, false} + AWS_SECRET_ACCESS_KEY_CROWD: ${env:AWS_SECRET_ACCESS_KEY, false} + + gitHubOnboardingStatus: + handler: handler_github.onboarding_status + environment: + NODE_ENV: ${env:NODE_ENV} + EDITION: ${env:EDITION} + SEGMENT_WRITE_KEY: ${env:SEGMENT_WRITE_KEY} + LOCALSTACK_HOSTNAME: ${env:LOCALSTACK_HOSTNAME} + LOCALSTACK_PORT: ${env:LOCALSTACK_PORT} + AWS_ACCOUNT_ID: ${env:AWS_ACCOUNT_ID} + CROWD_AWS_REGION: ${env:AWS_REGION} + DATABASE_USERNAME: ${env:DATABASE_USERNAME} + DATABASE_PASSWORD: ${env:DATABASE_PASSWORD} + DATABASE_DATABASE: ${env:DATABASE_DATABASE} + DATABASE_HOST_READ: ${env:DATABASE_HOST_WRITE} + DB_OPERATIONS_SQS_URL: ${env:DB_OPERATIONS_SQS_URL} + AWS_ACCESS_KEY_ID_CROWD: ${env:AWS_ACCESS_KEY_ID, false} + AWS_SECRET_ACCESS_KEY_CROWD: ${env:AWS_SECRET_ACCESS_KEY, false} + +stepFunctions: + stateMachines: + # Onboarding state machine + onboardingStateMachine: + name: OnboardingStateMachine${self:custom.currentStage} + definition: + Comment: 'State machine that coordinates GitHub onboarding' + StartAt: WaitState + States: + WaitState: + Type: Wait + SecondsPath: '$.wait' + Next: MapState + MapState: + Type: Map + Iterator: + StartAt: WorkerState + States: + WorkerState: + Type: Task + Resource: + Fn::GetAtt: [gitHubOnboardingWorker, Arn] + End: true + ItemsPath: '$.events' + Next: StatusState + StatusState: + Type: Task + Resource: + Fn::GetAtt: [gitHubOnboardingStatus, Arn] + End: true + +resources: + Outputs: + OnboardingStateMachine: + Description: The ARN of the onboarding state machine + Value: + Ref: OnboardingStateMachine${self:custom.currentStage} + package: + include: + - '../crowd-backend/**' + - '../crowd-github/**' + - '../crowd-members-score/**' + - '../crowd-check-merge-members/**' patterns: - '!venv*/**' plugins: - serverless-lift - serverless-step-functions + - serverless-plugin-scripts - serverless-localstack diff --git a/frontend/src/i18n/en.js b/frontend/src/i18n/en.js index 7f0cfe7219..7f2b0ac2d5 100644 --- a/frontend/src/i18n/en.js +++ b/frontend/src/i18n/en.js @@ -436,7 +436,12 @@ const en = { score: '[Members] Engagement Level', location: '[Members] Location', organisation: '[Members] Organisation', - joinedAt: '[Members] Joined Date' + joinedAt: '[Members] Joined Date', + averageTimeToFirstInteraction: + '[Members] Avg. Time To First Interaction' + }, + MemberTags: { + count: '[Members] # of Tags' }, Conversations: { count: '[Conversations] Count', @@ -447,7 +452,8 @@ const en = { published: '[Conversations] Published' }, Tags: { - name: '[Tags] Name' + name: '[Tags] Name', + count: '[Tags] Count' } } }, diff --git a/frontend/src/modules/widget/components/cube/_query_builder/DateRangeSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/DateRangeSelect.vue index eafaff7e3a..226d301aa1 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/DateRangeSelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/DateRangeSelect.vue @@ -17,7 +17,7 @@ diff --git a/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue index d51b27ad10..583d71b054 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/DimensionSelect.vue @@ -9,9 +9,9 @@ >Dimensions (optional) diff --git a/frontend/src/modules/widget/components/cube/_query_builder/FilterComponent.vue b/frontend/src/modules/widget/components/cube/_query_builder/FilterComponent.vue index 3448805356..fd6b18c0a0 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/FilterComponent.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/FilterComponent.vue @@ -55,7 +55,7 @@ @@ -70,7 +70,7 @@ {{ actionItem.text }} diff --git a/frontend/src/modules/widget/components/cube/_query_builder/GranularitySelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/GranularitySelect.vue index 498001dc35..fbe721dc66 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/GranularitySelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/GranularitySelect.vue @@ -16,7 +16,7 @@ {{ item.name }} diff --git a/frontend/src/modules/widget/components/cube/_query_builder/Limit.vue b/frontend/src/modules/widget/components/cube/_query_builder/Limit.vue index 40de38ee73..7f25f74625 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/Limit.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/Limit.vue @@ -2,10 +2,9 @@
diff --git a/frontend/src/modules/widget/components/cube/_query_builder/MeasureSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/MeasureSelect.vue index 4ba21ee6c9..32ac3cc536 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/MeasureSelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/MeasureSelect.vue @@ -13,7 +13,7 @@ v-for="item in translatedOptions(availableMeasures)" :key="item.value" :label="item.label" - :model-value="item.value" + :value="item.value" >
diff --git a/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue b/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue index 80cff8d4bf..049b22676f 100644 --- a/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue +++ b/frontend/src/modules/widget/components/cube/_query_builder/TimeDimensionSelect.vue @@ -17,7 +17,7 @@ computedTimeDimensions )" :key="item.value" - :model-value="item.value" + :value="item.value" :label="item.label" >