Fixed some issues that will be detected by the newer linter

zonia3000 · zonia3000 · commit 8704e91fdf7c · 2024-01-29T09:56:52.000+01:00
diff --git a/src/lib/common/errors.js b/src/lib/common/errors.js
@@ -14,16 +14,14 @@ export async function responseError(response) {
  * Used for example to handle the displaying of the error alert when using the ConfirmActionButton.
  */
 export class AlertError extends Error {
-	/** @type {null | { loc: string[], msg: string } | string} */
-	simpleValidationMessage;
-
 	/**
 	 * @param {any} reason
 	 * @param {number|null} statusCode
 	 */
 	constructor(reason, statusCode = null) {
 		super();
 		this.reason = reason;
+		/** @type {null | { loc: string[], msg: string } | string} */
 		this.simpleValidationMessage = getSimpleValidationMessage(reason, statusCode);
 	}
 
diff --git a/src/lib/common/jschema_validation.js b/src/lib/common/jschema_validation.js
@@ -1,36 +1,48 @@
 import Ajv from 'ajv';
 
 export class SchemaValidator {
-	#validator;
-	#canValidate = false;
-
 	/**
 	 * @param {boolean} allErrors if true, check all rules collecting all errors. Default is to return after the first error.
 	 */
 	constructor(allErrors = false) {
 		this.ajv = new Ajv({ allErrors });
+		this.canValidate = false;
 	}
 
+	/**
+	 * @param {any} schema
+	 * @returns {boolean}
+	 */
 	loadSchema(schema) {
 		try {
-			this.#validator = this.ajv.compile(schema);
-			return (this.#canValidate = true);
+			this.validator = this.ajv.compile(schema);
+			return (this.canValidate = true);
 		} catch {
 			console.error('SchemaValidator:loadSchema: error compiling schema');
 			return false;
 		}
 	}
 
+	/**
+	 * @param {any} data
+	 * @returns {any}
+	 */
 	isValid(data) {
-		if (!this.#canValidate) return null;
-		return this.#validator(data);
+		if (!this.validator) {
+			return;
+		}
+		if (!this.canValidate) return null;
+		return this.validator(data);
 	}
 
 	/**
 	 * @returns {import('ajv').ErrorObject[] | null}
 	 */
 	getErrors() {
-		if (!this.#canValidate) return null;
-		return this.#validator.errors;
+		if (!this.validator) {
+			return null;
+		}
+		if (!this.canValidate) return null;
+		return this.validator.errors || null;
 	}
 }
diff --git a/src/lib/components/common/jschema/schema_management.js b/src/lib/components/common/jschema/schema_management.js
@@ -1,19 +1,16 @@
 export default class SchemaManager {
-	keySeparator = '###';
-	propertiesMap = new Map();
-	hasUnsavedChanges = false;
-	/** @type {(hasChanges: boolean) => void} */
-	onPropertyChanges = () => {};
-	/** @type {import('./jschema-types').JSONSchemaObjectProperty} */
-	schema;
-
 	/**
 	 * @param {import('./jschema-types').JSONSchema|undefined} schema
 	 * @param {object|undefined} schemaData
 	 */
 	constructor(schema, schemaData) {
 		this.schema = this.loadSchema(schema);
 		this.data = this.loadSchemaData(schemaData);
+		this.keySeparator = '###';
+		this.propertiesMap = new Map();
+		this.hasUnsavedChanges = false;
+		/** @type {(hasChanges: boolean) => void} */
+		this.onPropertyChanges = () => {};
 	}
 
 	/**
@@ -167,16 +164,6 @@ export default class SchemaManager {
 }
 
 export class SchemaProperty {
-	manager;
-	/** @type {import('./jschema-types').JSONSchemaObjectProperty} */
-	globalSchema;
-	keySeparator = '###';
-	nestedProperties = [];
-	hasCustomKeyValues = false;
-	/** @type {string[]|undefined} */
-	requiredProperties = undefined;
-	required = false;
-
 	/**
 	 * @param {import('./jschema-types').JSONSchemaProperty & { key: string }} propertySchema
 	 * @param {SchemaManager} manager
@@ -186,6 +173,12 @@ export class SchemaProperty {
 		this.manager = manager;
 		this.globalSchema = this.manager.schema;
 		this.referenceSchema = propertySchema;
+		this.keySeparator = '###';
+		this.nestedProperties = [];
+		this.hasCustomKeyValues = false;
+		/** @type {string[]|undefined} */
+		this.requiredProperties = undefined;
+		this.required = false;
 
 		// Default properties
 		this.type = propertySchema.type;
diff --git a/src/lib/components/jobs/JobInfoModal.svelte b/src/lib/components/jobs/JobInfoModal.svelte
@@ -4,11 +4,6 @@
 	import { page } from '$app/stores';
 	import Modal from '../common/Modal.svelte';
 
-	/** @type {{id: number, name: string}[]} */
-	export let datasets;
-	/** @type {{id: number, name: string}[]} */
-	export let workflows;
-
 	/** @type {number|undefined} */
 	let workflowJobId = undefined;
 	/** @type {import('$lib/types').ApplyWorkflow|undefined} */
@@ -17,9 +12,6 @@
 	let projectId = undefined;
 	/** @type {string|undefined} */
 	let projectName = undefined;
-	let jobWorkflowName = undefined;
-	let jobInputDatasetName = undefined;
-	let jobOutputDatasetName = undefined;
 	let jobStatus = undefined;
 
 	let errorAlert = undefined;
@@ -35,17 +27,6 @@
 		workflowJobId = job.id;
 		projectId = job.project_id;
 		projectName = projectNameToDisplay;
-		// Should update jobWorkflowName
-		jobWorkflowName = workflows.find((workflow) => workflow.id === jobToDisplay.workflow_id)?.name;
-		// Should update jobInputDatasetName
-		jobInputDatasetName = datasets.find(
-			(dataset) => dataset.id === jobToDisplay.input_dataset_id
-		)?.name;
-		// Should update jobOutputDatasetName
-		jobOutputDatasetName = datasets.find(
-			(dataset) => dataset.id === jobToDisplay.output_dataset_id
-		)?.name;
-		// Should update jobStatus
 		jobStatus = job.status;
 
 		modal.show();
diff --git a/src/lib/components/jobs/JobsList.svelte b/src/lib/components/jobs/JobsList.svelte
@@ -33,14 +33,12 @@
 	let inputDatasets = $page.data.inputDatasets || [];
 	/** @type {{ id: number, name: string }[]} */
 	let outputDatasets = $page.data.outputDatasets || [];
-	/** @type {{ id: number, name: string }[]} */
-	let datasets = inputDatasets.concat(outputDatasets);
 
 	/** @type {DataHandler} */
 	let tableHandler = new DataHandler(jobs);
 	tableHandler.sortDesc('id');
 
-	/** @type {import('svelte/types/runtime/store').Readable<import('$lib/types').ApplyWorkflow[]>} */
+	/** @type {import('svelte/store').Readable<import('$lib/types').ApplyWorkflow[]>} */
 	let rows = tableHandler.getRows();
 
 	// Filters
@@ -78,7 +76,6 @@
 			/** @type {{id: number, name: string}[]} */
 			(jobs.filter((j) => j.output_dataset_dump).map((j) => j.output_dataset_dump))
 		);
-		datasets = inputDatasets.concat(outputDatasets);
 		tableHandler.setRows(jobs);
 	}
 
@@ -402,7 +399,7 @@
 	</table>
 {/if}
 
-<JobInfoModal {workflows} {datasets} bind:this={jobInfoModal} />
+<JobInfoModal bind:this={jobInfoModal} />
 <JobLogsModal bind:this={jobLogsModal} />
 
 <style>
diff --git a/src/lib/stores/projectStores.js b/src/lib/stores/projectStores.js
@@ -3,7 +3,7 @@ import { writable } from 'svelte/store';
 // The following store should be used to propagate selected project to display
 // within a ProjectInfoModal. Every component that will update the project
 // inside the store, will also update the to-be-displayed project in a modal.
-/** @type {import('svelte/types/runtime/store').Writable<import('$lib/types').Project|undefined>}} */
+/** @type {import('svelte/store').Writable<import('$lib/types').Project|undefined>}} */
 export const projectInfoModal = writable(undefined);
 
 // Context project store
diff --git a/src/lib/stores/taskStores.js b/src/lib/stores/taskStores.js
@@ -1,7 +1,7 @@
 import { writable } from 'svelte/store';
 
-/** @type {import('svelte/types/runtime/store').Writable<import('$lib/types').Task|undefined>} */
+/** @type {import('svelte/store').Writable<import('$lib/types').Task|undefined>} */
 export const taskStore = writable(undefined);
-/** @type {import('svelte/types/runtime/store').Writable<import('$lib/types').Task|undefined>} */
+/** @type {import('svelte/store').Writable<import('$lib/types').Task|undefined>} */
 export const originalTaskStore = writable(undefined);
 export const modalTaskCollectionId = writable(undefined);
diff --git a/src/routes/projects/[projectId]/datasets/[datasetId]/+page.svelte b/src/routes/projects/[projectId]/datasets/[datasetId]/+page.svelte
@@ -165,7 +165,7 @@
 		<svelte:fragment slot="body">
 			<ul class="list-group">
 				{#if dataset.history && Object.keys(dataset.history).length > 0}
-					{#each Object.entries(dataset.history) as [key, value]}
+					{#each Object.entries(dataset.history) as [, value]}
 						<li class="list-group-item text-bg-light">
 							<span>
 								Task "{value.workflowtask.task.name}", status "{value.status}"
diff --git a/src/routes/projects/[projectId]/workflows/[workflowId]/+page.svelte b/src/routes/projects/[projectId]/workflows/[workflowId]/+page.svelte
@@ -26,7 +26,7 @@
 	// List of available tasks to be inserted into workflow
 	let availableTasks = [];
 
-	/** @type {import('svelte/types/runtime/store').Writable<import('$lib/types').WorkflowTask|undefined>} */
+	/** @type {import('svelte/store').Writable<import('$lib/types').WorkflowTask|undefined>} */
 	let workflowTaskContext = writable(undefined);
 	let workflowTabContextId = 0;
 	let workflowSuccessMessage = '';
@@ -636,19 +636,16 @@
 					{#if workflow.task_list.length == 0}
 						<p class="text-center mt-3">No workflow tasks yet, add one.</p>
 					{:else}
-						<ul class="list-group list-group-flush">
+						<div class="list-group list-group-flush">
 							{#each workflow.task_list as workflowTask}
-								<li
+								<button
 									style="cursor: pointer"
 									class="list-group-item list-group-item-action {$workflowTaskContext !==
 										undefined && $workflowTaskContext.id == workflowTask.id
 										? 'active'
 										: ''}"
 									data-fs-target={workflowTask.id}
 									on:click|preventDefault={setActiveWorkflowTaskContext}
-									on:keydown|preventDefault
-									on:keyup|preventDefault
-									on:keypress|preventDefault
 								>
 									{workflowTask.task.name} #{workflowTask.id}
 
@@ -657,9 +654,9 @@
 											<i class="bi bi-exclamation-triangle" />
 										</span>
 									{/if}
-								</li>
+								</button>
 							{/each}
-						</ul>
+						</div>
 					{/if}
 				</div>
 			</div>
diff --git a/src/routes/projects/[projectId]/workflows/experimental/[workflowId]/+page.svelte b/src/routes/projects/[projectId]/workflows/experimental/[workflowId]/+page.svelte
@@ -34,7 +34,7 @@
 	/** @type {import('$lib/components/common/StandardErrorAlert.svelte').default|undefined} */
 	let workflowErrorAlert = undefined;
 
-	/** @type {import('svelte/types/runtime/store').Writable<import('$lib/types').WorkflowTask|undefined>} */
+	/** @type {import('svelte/store').Writable<import('$lib/types').WorkflowTask|undefined>} */
 	let workflowTaskContext = writable(undefined);
 	let workflowTabContextId = 0;
 	let workflowSuccessMessage = '';
@@ -729,19 +729,16 @@
 					{#if workflow.task_list.length == 0}
 						<p class="text-center mt-3">No workflow tasks yet, add one.</p>
 					{:else}
-						<ul class="list-group list-group-flush">
+						<div class="list-group list-group-flush">
 							{#each workflow.task_list as workflowTask}
-								<li
+								<button
 									style="cursor: pointer"
 									class="list-group-item list-group-item-action {$workflowTaskContext !==
 										undefined && $workflowTaskContext.id == workflowTask.id
 										? 'active'
 										: ''}"
 									data-fs-target={workflowTask.id}
 									on:click|preventDefault={setActiveWorkflowTaskContext}
-									on:keydown|preventDefault
-									on:keyup|preventDefault
-									on:keypress|preventDefault
 								>
 									{workflowTask.task.name}
 
@@ -753,9 +750,9 @@
 											<i class="bi bi-exclamation-triangle" />
 										</span>
 									{/if}
-								</li>
+								</button>
 							{/each}
-						</ul>
+							</div>
 					{/if}
 				</div>
 			</div>
