From f246699f38a28befbfccc11e9eade22cbaace4f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
<root@acid-chicken.com>
Date: Sat, 1 Apr 2023 14:04:48 +0900
Subject: [PATCH] refactor: restore `SatisfiesExpression`
---
packages/frontend/src/components/MkChart.vue | 4 ++--
packages/frontend/src/pages/admin/overview.active-users.vue | 4 ++--
packages/frontend/src/pages/admin/overview.ap-requests.vue | 4 ++--
packages/frontend/src/pages/user/activity.following.vue | 2 +-
packages/frontend/src/pages/user/activity.notes.vue | 2 +-
packages/frontend/src/pages/user/activity.pv.vue | 2 +-
packages/frontend/src/scripts/achievements.ts | 2 --
7 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/packages/frontend/src/components/MkChart.vue b/packages/frontend/src/components/MkChart.vue
index 06d5b9949a..3865b29194 100644
--- a/packages/frontend/src/components/MkChart.vue
+++ b/packages/frontend/src/components/MkChart.vue
@@ -15,7 +15,7 @@
As this is part of Chart.js's API it makes sense to disable the check here.
*/
import { onMounted, ref, shallowRef, watch, PropType } from 'vue';
-import { Chart } from 'chart.js';
+import { Chart, type ChartDataset } from 'chart.js';
import gradient from 'chartjs-plugin-gradient';
import * as os from '@/os';
import { defaultStore } from '@/store';
@@ -165,7 +165,7 @@ const render = () => {
fill: x.type === 'area',
clip: 8,
hidden: !!x.hidden,
- })),
+ } satisfies ChartDataset)),
},
options: {
aspectRatio: props.aspectRatio || 2.5,
diff --git a/packages/frontend/src/pages/admin/overview.active-users.vue b/packages/frontend/src/pages/admin/overview.active-users.vue
index fc10ad75f8..a76f2e073f 100644
--- a/packages/frontend/src/pages/admin/overview.active-users.vue
+++ b/packages/frontend/src/pages/admin/overview.active-users.vue
@@ -9,7 +9,7 @@
<script lang="ts" setup>
import { onMounted } from 'vue';
-import { Chart } from 'chart.js';
+import { Chart, type ChartDataset } from 'chart.js';
import gradient from 'chartjs-plugin-gradient';
import * as os from '@/os';
import { defaultStore } from '@/store';
@@ -83,7 +83,7 @@ async function renderChart() {
barPercentage: 0.7,
categoryPercentage: 0.5,
fill: true,
- }],
+ }] satisfies ChartDataset[],
},
options: {
aspectRatio: 2.5,
diff --git a/packages/frontend/src/pages/admin/overview.ap-requests.vue b/packages/frontend/src/pages/admin/overview.ap-requests.vue
index ad8e623415..867137f084 100644
--- a/packages/frontend/src/pages/admin/overview.ap-requests.vue
+++ b/packages/frontend/src/pages/admin/overview.ap-requests.vue
@@ -16,7 +16,7 @@
<script lang="ts" setup>
import { onMounted } from 'vue';
-import { Chart } from 'chart.js';
+import { Chart, type ChartDataset } from 'chart.js';
import gradient from 'chartjs-plugin-gradient';
import * as os from '@/os';
import { useChartTooltip } from '@/scripts/use-chart-tooltip';
@@ -190,7 +190,7 @@ onMounted(async () => {
categoryPercentage: 0.9,
fill: true,
clip: 8,
- }],
+ }] satisfies ChartDataset[],
},
options: {
aspectRatio: 5,
diff --git a/packages/frontend/src/pages/user/activity.following.vue b/packages/frontend/src/pages/user/activity.following.vue
index 25a1edaca9..54360024f3 100644
--- a/packages/frontend/src/pages/user/activity.following.vue
+++ b/packages/frontend/src/pages/user/activity.following.vue
@@ -77,7 +77,7 @@ async function renderChart() {
barPercentage: 0.7,
categoryPercentage: 0.7,
fill: true,
- }, extra);
+ } satisfies ChartDataset, extra);
}
chartInstance = new Chart(chartEl, {
diff --git a/packages/frontend/src/pages/user/activity.notes.vue b/packages/frontend/src/pages/user/activity.notes.vue
index 63e1c76e03..7dd02ad6d4 100644
--- a/packages/frontend/src/pages/user/activity.notes.vue
+++ b/packages/frontend/src/pages/user/activity.notes.vue
@@ -76,7 +76,7 @@ async function renderChart() {
borderRadius: 4,
barPercentage: 0.9,
fill: true,
- }, extra);
+ } satisfies ChartDataset, extra);
}
chartInstance = new Chart(chartEl, {
diff --git a/packages/frontend/src/pages/user/activity.pv.vue b/packages/frontend/src/pages/user/activity.pv.vue
index 1be495f410..6a7506e388 100644
--- a/packages/frontend/src/pages/user/activity.pv.vue
+++ b/packages/frontend/src/pages/user/activity.pv.vue
@@ -77,7 +77,7 @@ async function renderChart() {
barPercentage: 0.7,
categoryPercentage: 0.7,
fill: true,
- }, extra);
+ } satisfies ChartDataset, extra);
}
chartInstance = new Chart(chartEl, {
diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts
index c93e968594..c77f8e12d3 100644
--- a/packages/frontend/src/scripts/achievements.ts
+++ b/packages/frontend/src/scripts/achievements.ts
@@ -443,13 +443,11 @@ export const ACHIEVEMENT_BADGES = {
bg: 'linear-gradient(0deg, rgb(144, 224, 255), rgb(255, 168, 252))',
frame: 'bronze',
},
-/*
} as const satisfies Record<typeof ACHIEVEMENT_TYPES[number], {
img: string;
bg: string | null;
frame: 'bronze' | 'silver' | 'gold' | 'platinum';
}>;
- */ } as const;
export const claimedAchievements: typeof ACHIEVEMENT_TYPES[number][] = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : [];