Merge pull request #245 from frappe/develop

chore: merge `develop` into `main`
frappe · Apr 29, 2024 · d796a81 · d796a81
2 parents aa3c613 + 4bbf3ad
commit d796a81
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/frontend/src/query/ChartSection.vue b/frontend/src/query/ChartSection.vue
@@ -81,7 +81,7 @@ function downloadChartImage() {
 					:is="chart.component"
 					:options="chart.options"
 					:data="chart.data"
-					:key="JSON.stringify(query.chart.doc)"
+					:key="JSON.stringify(query.chart.doc) + JSON.stringify(query.chart.data)"
 				/>
 			</div>
 		</template>

diff --git a/frontend/src/query/visual/ColumnSection.vue b/frontend/src/query/visual/ColumnSection.vue
@@ -12,7 +12,10 @@ const query = inject('query')
 const assistedQuery = inject('assistedQuery')
 !assistedQuery.columnOptions.length && assistedQuery.fetchColumnOptions()
 
-const columns = computed(() => assistedQuery.columns)
+const columns = computed({
+	get: () => assistedQuery.columns,
+	set: (value) => (assistedQuery.columns = value),
+})
 const columnRefs = ref(null)
 const activeColumnIdx = ref(null)
 const showExpressionEditor = computed(() => {
@@ -100,10 +103,9 @@ function onColumnSort(e) {
 		</SectionHeader>
 		<DraggableList
 			v-if="columns.length"
-			:items="columns"
+			v-model:items="columns"
 			group="columns"
 			item-key="label"
-			@sort="onColumnSort"
 			:showEmptyState="true"
 			:showHandle="false"
 		>

diff --git a/frontend/src/widgets/PivotTable/PivotTable.vue b/frontend/src/widgets/PivotTable/PivotTable.vue
@@ -3,7 +3,7 @@ import ChartTitle from '@/components/Charts/ChartTitle.vue'
 import TanstackTable from '@/components/Table/TanstackTable.vue'
 import { watchDebounced } from '@vueuse/core'
 import { call } from 'frappe-ui'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { convertToNestedObject, convertToTanstackColumns } from './utils'
 
 const props = defineProps({
@@ -12,6 +12,8 @@ const props = defineProps({
 })
 
 const _data = computed(() => props.data)
+watch(_data, reloadPivotData, { deep: true })
+
 const indexColumns = computed(() => props.options.rows?.map((column) => column.value) || [])
 const pivotColumns = computed(() => props.options.columns?.map((column) => column.value) || [])
 const valueColumns = computed(() => props.options.values?.map((column) => column.value) || [])