johan/FoundKey
1
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into refactor/page.textarea.vue

Browse source
This commit is contained in:
Norm 2022-07-24 21:25:22 +00:00
commit d96baf1672
2 changed files with 155 additions and 182 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/server/api/endpoints/app/create.ts
View file

@ -23,6 +23,7 @@ export const paramDef = {
description: { type: 'string' }, description: { type: 'string' },
permission: { type: 'array', uniqueItems: true, items: { permission: { type: 'array', uniqueItems: true, items: {
type: 'string', type: 'string',
// FIXME: add enum of possible permissions
} }, } },
callbackUrl: { type: 'string', nullable: true }, callbackUrl: { type: 'string', nullable: true },
}, },
@ -34,9 +35,6 @@ export default define(meta, paramDef, async (ps, user) => {
// Generate secret // Generate secret
const secret = secureRndstr(32, true); const secret = secureRndstr(32, true);
// for backward compatibility
const permission = unique(ps.permission.map(v => v.replace(/^(.+)(\/|-)(read|write)$/, '$3:$1')));
// Create account // Create account
const app = await Apps.insert({ const app = await Apps.insert({
id: genId(), id: genId(),
@ -44,7 +42,7 @@ export default define(meta, paramDef, async (ps, user) => {
userId: user ? user.id : null, userId: user ? user.id : null,
name: ps.name, name: ps.name,
description: ps.description, description: ps.description,
permission, permission: ps.permission,
callbackUrl: ps.callbackUrl, callbackUrl: ps.callbackUrl,
secret: secret, secret: secret,
}).then(x => Apps.findOneByOrFail(x.identifiers[0])); }).then(x => Apps.findOneByOrFail(x.identifiers[0]));

331
packages/client/src/components/queue-chart.vue
View file

@ -2,8 +2,8 @@
<canvas ref="chartEl"></canvas> <canvas ref="chartEl"></canvas>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent, onMounted, onUnmounted, ref } from 'vue'; import { onMounted, onUnmounted, ref } from 'vue';
import { import {
Chart, Chart,
ArcElement, ArcElement,
@ -42,191 +42,166 @@ Chart.register(
Filler, Filler,
); );
const alpha = (hex, a) => { const props = defineProps<{
const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)!; domain: string,
const r = parseInt(result[1], 16); connection: any,
const g = parseInt(result[2], 16); }>();
const b = parseInt(result[3], 16);
return `rgba(${r}, ${g}, ${b}, ${a})`;
};
export default defineComponent({ const chartEl = ref<HTMLCanvasElement>(null);
props: {
domain: { const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
type: String,
required: true, // フォントカラー
Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
onMounted(() => {
const chartInstance = new Chart(chartEl.value, {
type: 'line',
data: {
labels: [],
datasets: [{
label: 'Process',
pointRadius: 0,
tension: 0,
borderWidth: 2,
borderJoinStyle: 'round',
borderColor: '#00E396',
backgroundColor: '#00E3961A',
data: []
}, {
label: 'Active',
pointRadius: 0,
tension: 0,
borderWidth: 2,
borderJoinStyle: 'round',
borderColor: '#00BCD4',
backgroundColor: '#00BCD41A',
data: []
}, {
label: 'Waiting',
pointRadius: 0,
tension: 0,
borderWidth: 2,
borderJoinStyle: 'round',
borderColor: '#FFB300',
backgroundColor: '#FFB3001A',
yAxisID: 'y2',
data: []
}, {
label: 'Delayed',
pointRadius: 0,
tension: 0,
borderWidth: 2,
borderJoinStyle: 'round',
borderColor: '#E53935',
borderDash: [5, 5],
fill: false,
yAxisID: 'y2',
data: []
}],
}, },
connection: { options: {
required: true, aspectRatio: 2.5,
}, layout: {
}, padding: {
left: 16,
setup(props) { right: 16,
const chartEl = ref<HTMLCanvasElement>(null); top: 16,
bottom: 8,
const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
// フォントカラー
Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
onMounted(() => {
const chartInstance = new Chart(chartEl.value, {
type: 'line',
data: {
labels: [],
datasets: [{
label: 'Process',
pointRadius: 0,
tension: 0,
borderWidth: 2,
borderJoinStyle: 'round',
borderColor: '#00E396',
backgroundColor: alpha('#00E396', 0.1),
data: []
}, {
label: 'Active',
pointRadius: 0,
tension: 0,
borderWidth: 2,
borderJoinStyle: 'round',
borderColor: '#00BCD4',
backgroundColor: alpha('#00BCD4', 0.1),
data: []
}, {
label: 'Waiting',
pointRadius: 0,
tension: 0,
borderWidth: 2,
borderJoinStyle: 'round',
borderColor: '#FFB300',
backgroundColor: alpha('#FFB300', 0.1),
yAxisID: 'y2',
data: []
}, {
label: 'Delayed',
pointRadius: 0,
tension: 0,
borderWidth: 2,
borderJoinStyle: 'round',
borderColor: '#E53935',
borderDash: [5, 5],
fill: false,
yAxisID: 'y2',
data: []
}],
}, },
options: { },
aspectRatio: 2.5, scales: {
layout: { x: {
padding: { grid: {
left: 16, display: true,
right: 16, color: gridColor,
top: 16, borderColor: '#0000',
bottom: 8,
},
}, },
scales: { ticks: {
x: { display: false,
grid: { maxTicksLimit: 10
display: true,
color: gridColor,
borderColor: 'rgb(0, 0, 0, 0)',
},
ticks: {
display: false,
maxTicksLimit: 10
},
},
y: {
min: 0,
stack: 'queue',
stackWeight: 2,
grid: {
color: gridColor,
borderColor: 'rgb(0, 0, 0, 0)',
},
},
y2: {
min: 0,
offset: true,
stack: 'queue',
stackWeight: 1,
grid: {
color: gridColor,
borderColor: 'rgb(0, 0, 0, 0)',
},
},
},
interaction: {
intersect: false,
},
plugins: {
legend: {
position: 'bottom',
labels: {
boxWidth: 16,
},
},
tooltip: {
mode: 'index',
animation: {
duration: 0,
},
},
}, },
}, },
}); y: {
min: 0,
stack: 'queue',
stackWeight: 2,
grid: {
color: gridColor,
borderColor: '#0000',
},
},
y2: {
min: 0,
offset: true,
stack: 'queue',
stackWeight: 1,
grid: {
color: gridColor,
borderColor: '#0000',
},
},
},
interaction: {
intersect: false,
},
plugins: {
legend: {
position: 'bottom',
labels: {
boxWidth: 16,
},
},
tooltip: {
mode: 'index',
animation: {
duration: 0,
},
},
},
},
});
const onStats = (stats) => { const onStats = (stats) => {
chartInstance.data.labels.push(''); chartInstance.data.labels.push('');
chartInstance.data.datasets[0].data.push(stats[props.domain].activeSincePrevTick); chartInstance.data.datasets[0].data.push(stats[props.domain].activeSincePrevTick);
chartInstance.data.datasets[1].data.push(stats[props.domain].active); chartInstance.data.datasets[1].data.push(stats[props.domain].active);
chartInstance.data.datasets[2].data.push(stats[props.domain].waiting); chartInstance.data.datasets[2].data.push(stats[props.domain].waiting);
chartInstance.data.datasets[3].data.push(stats[props.domain].delayed); chartInstance.data.datasets[3].data.push(stats[props.domain].delayed);
if (chartInstance.data.datasets[0].data.length > 200) { if (chartInstance.data.datasets[0].data.length > 200) {
chartInstance.data.labels.shift(); chartInstance.data.labels.shift();
chartInstance.data.datasets[0].data.shift(); chartInstance.data.datasets[0].data.shift();
chartInstance.data.datasets[1].data.shift(); chartInstance.data.datasets[1].data.shift();
chartInstance.data.datasets[2].data.shift(); chartInstance.data.datasets[2].data.shift();
chartInstance.data.datasets[3].data.shift(); chartInstance.data.datasets[3].data.shift();
} }
chartInstance.update(); chartInstance.update();
}; };
const onStatsLog = (statsLog) => { const onStatsLog = (statsLog) => {
for (const stats of [...statsLog].reverse()) { for (const stats of [...statsLog].reverse()) {
chartInstance.data.labels.push(''); chartInstance.data.labels.push('');
chartInstance.data.datasets[0].data.push(stats[props.domain].activeSincePrevTick); chartInstance.data.datasets[0].data.push(stats[props.domain].activeSincePrevTick);
chartInstance.data.datasets[1].data.push(stats[props.domain].active); chartInstance.data.datasets[1].data.push(stats[props.domain].active);
chartInstance.data.datasets[2].data.push(stats[props.domain].waiting); chartInstance.data.datasets[2].data.push(stats[props.domain].waiting);
chartInstance.data.datasets[3].data.push(stats[props.domain].delayed); chartInstance.data.datasets[3].data.push(stats[props.domain].delayed);
if (chartInstance.data.datasets[0].data.length > 200) { if (chartInstance.data.datasets[0].data.length > 200) {
chartInstance.data.labels.shift(); chartInstance.data.labels.shift();
chartInstance.data.datasets[0].data.shift(); chartInstance.data.datasets[0].data.shift();
chartInstance.data.datasets[1].data.shift(); chartInstance.data.datasets[1].data.shift();
chartInstance.data.datasets[2].data.shift(); chartInstance.data.datasets[2].data.shift();
chartInstance.data.datasets[3].data.shift(); chartInstance.data.datasets[3].data.shift();
} }
} }
chartInstance.update(); chartInstance.update();
}; };
props.connection.on('stats', onStats); props.connection.on('stats', onStats);
props.connection.on('statsLog', onStatsLog); props.connection.on('statsLog', onStatsLog);
onUnmounted(() => { onUnmounted(() => {
props.connection.off('stats', onStats); props.connection.off('stats', onStats);
props.connection.off('statsLog', onStatsLog); props.connection.off('statsLog', onStatsLog);
}); });
});
return {
chartEl,
};
},
}); });
</script> </script>
<style lang="scss" scoped>
</style>