usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert: restore `SatisfiesExpression` 

This reverts commit f246699f38.
This commit is contained in:
Acid Chicken (硫酸鶏) 2023-04-01 17:58:44 +09:00
parent 4521e61ae2
commit e7a15b5604
No known key found for this signature in database
GPG Key ID: 3E87B98A3F6BAB99
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/frontend/src/components/MkChart.vue
View File

@ -15,7 +15,7 @@
As this is part of Chart.js's API it makes sense to disable the check here. 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 { onMounted, ref, shallowRef, watch, PropType } from 'vue';
import { Chart, type ChartDataset } from 'chart.js'; import { Chart } from 'chart.js';
import gradient from 'chartjs-plugin-gradient'; import gradient from 'chartjs-plugin-gradient';
import * as os from '@/os'; import * as os from '@/os';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';
@ -165,7 +165,7 @@ const render = () => {
fill: x.type === 'area', fill: x.type === 'area',
clip: 8, clip: 8,
hidden: !!x.hidden, hidden: !!x.hidden,
} satisfies ChartDataset)), })),
}, },
options: { options: {
aspectRatio: props.aspectRatio || 2.5, aspectRatio: props.aspectRatio || 2.5,

4
packages/frontend/src/pages/admin/overview.active-users.vue
View File

@ -9,7 +9,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted } from 'vue'; import { onMounted } from 'vue';
import { Chart, type ChartDataset } from 'chart.js'; import { Chart } from 'chart.js';
import gradient from 'chartjs-plugin-gradient'; import gradient from 'chartjs-plugin-gradient';
import * as os from '@/os'; import * as os from '@/os';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';
@ -83,7 +83,7 @@ async function renderChart() {
barPercentage: 0.7, barPercentage: 0.7,
categoryPercentage: 0.5, categoryPercentage: 0.5,
fill: true, fill: true,
}] satisfies ChartDataset[], }],
}, },
options: { options: {
aspectRatio: 2.5, aspectRatio: 2.5,

4
packages/frontend/src/pages/admin/overview.ap-requests.vue
View File

@ -16,7 +16,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted } from 'vue'; import { onMounted } from 'vue';
import { Chart, type ChartDataset } from 'chart.js'; import { Chart } from 'chart.js';
import gradient from 'chartjs-plugin-gradient'; import gradient from 'chartjs-plugin-gradient';
import * as os from '@/os'; import * as os from '@/os';
import { useChartTooltip } from '@/scripts/use-chart-tooltip'; import { useChartTooltip } from '@/scripts/use-chart-tooltip';
@ -190,7 +190,7 @@ onMounted(async () => {
categoryPercentage: 0.9, categoryPercentage: 0.9,
fill: true, fill: true,
clip: 8, clip: 8,
}] satisfies ChartDataset[], }],
}, },
options: { options: {
aspectRatio: 5, aspectRatio: 5,

2
packages/frontend/src/pages/user/activity.following.vue
View File

@ -77,7 +77,7 @@ async function renderChart() {
barPercentage: 0.7, barPercentage: 0.7,
categoryPercentage: 0.7, categoryPercentage: 0.7,
fill: true, fill: true,
} satisfies ChartDataset, extra); }, extra);
} }
chartInstance = new Chart(chartEl, { chartInstance = new Chart(chartEl, {

2
packages/frontend/src/pages/user/activity.notes.vue
View File

@ -76,7 +76,7 @@ async function renderChart() {
borderRadius: 4, borderRadius: 4,
barPercentage: 0.9, barPercentage: 0.9,
fill: true, fill: true,
} satisfies ChartDataset, extra); }, extra);
} }
chartInstance = new Chart(chartEl, { chartInstance = new Chart(chartEl, {

2
packages/frontend/src/pages/user/activity.pv.vue
View File

@ -77,7 +77,7 @@ async function renderChart() {
barPercentage: 0.7, barPercentage: 0.7,
categoryPercentage: 0.7, categoryPercentage: 0.7,
fill: true, fill: true,
} satisfies ChartDataset, extra); }, extra);
} }
chartInstance = new Chart(chartEl, { chartInstance = new Chart(chartEl, {

2
packages/frontend/src/scripts/achievements.ts
View File

@ -443,11 +443,13 @@ export const ACHIEVEMENT_BADGES = {
bg: 'linear-gradient(0deg, rgb(144, 224, 255), rgb(255, 168, 252))', bg: 'linear-gradient(0deg, rgb(144, 224, 255), rgb(255, 168, 252))',
frame: 'bronze', frame: 'bronze',
}, },
/*
} as const satisfies Record<typeof ACHIEVEMENT_TYPES[number], { } as const satisfies Record<typeof ACHIEVEMENT_TYPES[number], {
img: string; img: string;
bg: string | null; bg: string | null;
frame: 'bronze' | 'silver' | 'gold' | 'platinum'; frame: 'bronze' | 'silver' | 'gold' | 'platinum';
}>; }>;
*/ } as const;
export const claimedAchievements: typeof ACHIEVEMENT_TYPES[number][] = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : []; export const claimedAchievements: typeof ACHIEVEMENT_TYPES[number][] = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : [];