0.10.2-17 Queue Update
This commit is contained in:
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "ripster-backend",
|
||||
"version": "0.10.2-16",
|
||||
"version": "0.10.2-17",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "ripster-backend",
|
||||
"version": "0.10.2-16",
|
||||
"version": "0.10.2-17",
|
||||
"dependencies": {
|
||||
"archiver": "^7.0.1",
|
||||
"cors": "^2.8.5",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ripster-backend",
|
||||
"version": "0.10.2-16",
|
||||
"version": "0.10.2-17",
|
||||
"private": true,
|
||||
"type": "commonjs",
|
||||
"scripts": {
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "ripster-frontend",
|
||||
"version": "0.10.2-16",
|
||||
"version": "0.10.2-17",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "ripster-frontend",
|
||||
"version": "0.10.2-16",
|
||||
"version": "0.10.2-17",
|
||||
"dependencies": {
|
||||
"primeicons": "^7.0.0",
|
||||
"primereact": "^10.9.2",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ripster-frontend",
|
||||
"version": "0.10.2-16",
|
||||
"version": "0.10.2-17",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -1794,6 +1794,11 @@ export default function DashboardPage({
|
||||
};
|
||||
|
||||
const openInsertQueueDialog = async (afterEntryId) => {
|
||||
const hasJob = (queueState?.runningJobs || []).some((i) => i.jobId != null)
|
||||
|| (queueState?.queuedJobs || []).some((i) => i.jobId != null);
|
||||
if (!hasJob) {
|
||||
return;
|
||||
}
|
||||
setInsertQueueDialog({ visible: true, afterEntryId: afterEntryId ?? null });
|
||||
try {
|
||||
const [scriptsRes, chainsRes] = await Promise.allSettled([api.getScripts(), api.getScriptChains()]);
|
||||
@@ -1971,6 +1976,8 @@ export default function DashboardPage({
|
||||
const queueRunningJobs = Array.isArray(queueState?.runningJobs) ? queueState.runningJobs : [];
|
||||
const queuedJobs = Array.isArray(queueState?.queuedJobs) ? queueState.queuedJobs : [];
|
||||
const canReorderQueue = queuedJobs.length > 1 && !queueReorderBusy;
|
||||
const queueHasJobEntry = queueRunningJobs.some((i) => i.jobId != null)
|
||||
|| queuedJobs.some((i) => i.jobId != null);
|
||||
const buildRunningQueueScriptKey = (jobId) => `running-${normalizeJobId(jobId) || '-'}`;
|
||||
const buildQueuedQueueScriptKey = (entryId) => `queued-${Number(entryId) || '-'}`;
|
||||
const toggleQueueScriptDetails = (key) => {
|
||||
@@ -2578,7 +2585,8 @@ export default function DashboardPage({
|
||||
<button
|
||||
type="button"
|
||||
className="queue-add-entry-btn"
|
||||
title="Skript, Kette oder Wartezeit zur Queue hinzufügen"
|
||||
title={queueHasJobEntry ? 'Skript, Kette oder Wartezeit zur Queue hinzufügen' : 'Nur möglich wenn mind. ein Job in der Queue ist'}
|
||||
disabled={!queueHasJobEntry}
|
||||
onClick={() => void openInsertQueueDialog(null)}
|
||||
>
|
||||
<i className="pi pi-plus" /> Hinzufügen
|
||||
@@ -2667,6 +2675,7 @@ export default function DashboardPage({
|
||||
</div>
|
||||
</div>
|
||||
{detailsExpanded ? <QueueJobScriptSummary item={item} /> : null}
|
||||
{queueHasJobEntry ? (
|
||||
<button
|
||||
type="button"
|
||||
className="queue-insert-btn"
|
||||
@@ -2675,6 +2684,7 @@ export default function DashboardPage({
|
||||
>
|
||||
<i className="pi pi-plus" />
|
||||
</button>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "ripster",
|
||||
"version": "0.10.2-16",
|
||||
"version": "0.10.2-17",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "ripster",
|
||||
"version": "0.10.2-16",
|
||||
"version": "0.10.2-17",
|
||||
"devDependencies": {
|
||||
"concurrently": "^9.1.2"
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "ripster",
|
||||
"private": true,
|
||||
"version": "0.10.2-16",
|
||||
"version": "0.10.2-17",
|
||||
"scripts": {
|
||||
"dev": "concurrently \"npm run dev --prefix backend\" \"npm run dev --prefix frontend\"",
|
||||
"dev:backend": "npm run dev --prefix backend",
|
||||
|
||||
Reference in New Issue
Block a user