Merge pull request #153 from frappe/develop

chore: merge 'develop' into 'main'
frappe · Aug 9, 2023 · 3262f30 · 3262f30
2 parents bb40050 + c84dc6f
commit 3262f30
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/frappe-ui b/frappe-ui
diff --git a/frontend/src/components/ShareDialog.vue b/frontend/src/components/ShareDialog.vue
@@ -49,7 +49,7 @@
 							placeholder="Add a team to share with"
 							:options="unauthorizedTeams"
 							:autofocus="false"
-							@change="handleAccessGrant"
+							@update:modelValue="handleAccessGrant"
 						/>
 						<div class="space-y-3">
 							<div class="font-medium text-gray-600">Teams with access</div>

diff --git a/frontend/src/dashboard/DashboardQueryOption.vue b/frontend/src/dashboard/DashboardQueryOption.vue
@@ -52,7 +52,7 @@ async function selectQuery() {
 				placeholder="Select a query"
 				:allowCreate="true"
 				:options="queryOptions"
-				@change="queryName = $event"
+				@update:modelValue="queryName = $event"
 				@createOption="createQuery"
 			/>
 			<div

diff --git a/frontend/src/query/Column/SimpleColumnPicker.vue b/frontend/src/query/Column/SimpleColumnPicker.vue
@@ -6,7 +6,7 @@
 				v-model="simpleColumn.aggType"
 				:options="aggregations"
 				placeholder="Select aggregation type"
-				@change="onTypeSelect"
+				@update:modelValue="onTypeSelect"
 			/>
 		</div>
 		<div v-if="columnNeeded" class="space-y-1 text-sm text-gray-600">
@@ -16,7 +16,7 @@
 				:options="filteredColumns"
 				placeholder="Select a column..."
 				:emptyText="requiresNumberColumn ? 'No number columns' : 'No columns'"
-				@change="onColumnSelect"
+				@update:modelValue="onColumnSelect"
 			/>
 		</div>
 		<div class="space-y-1 text-sm text-gray-600">
@@ -35,7 +35,7 @@
 				v-model="simpleColumn.dateFormat"
 				:options="dateFormats.map((f) => ({ ...f, description: f.value }))"
 				placeholder="Select a date format..."
-				@change="selectDateFormat"
+				@update:modelValue="selectDateFormat"
 			/>
 		</div>
 		<div class="space-y-1 text-sm text-gray-600">

diff --git a/frontend/src/query/Table/TablePanel.vue b/frontend/src/query/Table/TablePanel.vue
@@ -15,7 +15,7 @@
 						v-model="newTable"
 						:options="query.tables.newTableOptions"
 						placeholder="Select a table..."
-						@change="addNewTable"
+						@update:modelValue="addNewTable"
 					/>
 				</div>
 				<Button icon="x" @click="addingTable = false"></Button>

diff --git a/frontend/src/widgets/Bar/BarOptions.vue b/frontend/src/widgets/Bar/BarOptions.vue
@@ -54,7 +54,7 @@ const valueOptions = computed(() => {
 			<ListPicker
 				:value="options.yAxis"
 				:options="valueOptions"
-				@change="options.yAxis = $event.map((item) => item.value)"
+				@update:modelValue="options.yAxis = $event.map((item) => item.value)"
 			/>
 		</div>
 

diff --git a/frontend/src/widgets/Progress/Progress.vue b/frontend/src/widgets/Progress/Progress.vue
@@ -40,12 +40,14 @@ const progressPercent = computed(() => {
 	>
 		<div class="h-fit w-full max-w-[22rem]">
 			<div>
-				<div class="text-gray-600">{{ props.options.title }}</div>
-				<div class="text-[34px] leading-tight">
+				<div class="w-full overflow-hidden text-ellipsis whitespace-nowrap leading-6">
+					{{ props.options.title }}
+				</div>
+				<div class="text-[28px] font-medium leading-8">
 					{{ props.options.prefix }}{{ formatValue(progress) }}{{ props.options.suffix }}
 				</div>
 			</div>
-			<div class="mb-1">
+			<div class="my-1">
 				<div class="flex justify-between text-xs tracking-wide text-gray-600">
 					<div>{{ progressPercent }}%</div>
 					<div>