From fae1a32d8dab7e257e6f27d2982379a0522ff4eb Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Thu, 26 Sep 2024 19:34:43 -0400 Subject: [PATCH 1/8] Saving progress 1 --- src/components/renderer/form-record-list.vue | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/components/renderer/form-record-list.vue b/src/components/renderer/form-record-list.vue index 0d0f83f4b..3cad2f504 100644 --- a/src/components/renderer/form-record-list.vue +++ b/src/components/renderer/form-record-list.vue @@ -46,7 +46,7 @@ + @change="onMultipleSelectionChange()"/> diff --git a/src/components/renderer/form-record-list.vue b/src/components/renderer/form-record-list.vue index dfc5b02bc..a5af67299 100644 --- a/src/components/renderer/form-record-list.vue +++ b/src/components/renderer/form-record-list.vue @@ -261,14 +261,7 @@ export default { currentRowIndex: null, collectionData: {}, selectedRow: null, - selectedRows: [], - output: { - fields: { - carBrand: "", - year: null - } - }, - onlyObject: {} + selectedRows: [] }; }, computed: { @@ -305,10 +298,14 @@ export default { console.log("refs vuetable not exists"); }, tableData() { - const value = Object.keys(this.collectionData).length !== 0 ? this.collectionData : (this.value || []); + const value = Array.isArray(this.collectionData) && this.collectionData.length + ? this.collectionData + : (Array.isArray(this.value) ? this.value : []); + const from = this.paginatorPage - 1; // eslint-disable-next-line vue/no-side-effects-in-computed-properties this.lastPage = Math.ceil(value.length / this.perPage); + const data = { total: value.length, per_page: this.perPage, @@ -321,10 +318,8 @@ export default { data: value, lastSortConfig: false }; - console.log("this.value: ", this.value); - console.log("this.collectionData: ", this.collectionData); - console.log("tableData: ", data); return data; + }, // The fields used for our vue table tableFields() { @@ -395,7 +390,6 @@ export default { onRadioChange(selectedItem) { if(this.source?.singleField) { const valueOfColumn = selectedItem[this.source.singleField]; - console.log("valueOfColumn: ", valueOfColumn); this.componentOutput(valueOfColumn); } else { this.componentOutput(selectedItem); From b313a663f53b565f4e78a9dd445da4b7c7bfe6ca Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Mon, 30 Sep 2024 17:37:32 -0400 Subject: [PATCH 4/8] fixing pagination.spec.js --- src/components/inspector/page-select.vue | 1 + tests/e2e/specs/Pagination.spec.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/inspector/page-select.vue b/src/components/inspector/page-select.vue index c761e3a5d..7f2b7d10e 100644 --- a/src/components/inspector/page-select.vue +++ b/src/components/inspector/page-select.vue @@ -9,6 +9,7 @@ :show-labels="false" :options="options.map(option => option.value)" :custom-label="getLabelFromValue" + data-cy="inspector-eventData" > diff --git a/src/components/renderer/form-record-list.vue b/src/components/renderer/form-record-list.vue index a5af67299..e7670bd5f 100644 --- a/src/components/renderer/form-record-list.vue +++ b/src/components/renderer/form-record-list.vue @@ -39,14 +39,15 @@