From 6476dafb6a670727a461b721c3e51e15ead71ad1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 18:54:37 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../frontend/core/components/DateTimeSelector.js | 1 - .../frontend/core/components/JSONSchemaForm.js | 2 +- src/electron/frontend/core/components/Search.js | 2 +- src/electron/frontend/core/components/pages/Page.js | 2 +- .../core/components/pages/guided-mode/setup/Preform.js | 10 +++------- src/pyflask/manageNeuroconv/manage_neuroconv.py | 1 - src/pyflask/namespaces/time.py | 4 +++- src/schemas/timezone.schema.ts | 2 +- 8 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/electron/frontend/core/components/DateTimeSelector.js b/src/electron/frontend/core/components/DateTimeSelector.js index 3d6c01062..a8ba90cf8 100644 --- a/src/electron/frontend/core/components/DateTimeSelector.js +++ b/src/electron/frontend/core/components/DateTimeSelector.js @@ -30,7 +30,6 @@ export const renderDateTime = (value) => { export const resolveDateTime = renderDateTime; - export class DateTimeSelector extends LitElement { static get styles() { return css` diff --git a/src/electron/frontend/core/components/JSONSchemaForm.js b/src/electron/frontend/core/components/JSONSchemaForm.js index 56dd4b723..9c9572d3f 100644 --- a/src/electron/frontend/core/components/JSONSchemaForm.js +++ b/src/electron/frontend/core/components/JSONSchemaForm.js @@ -247,7 +247,7 @@ export class JSONSchemaForm extends LitElement { dialogType: { type: String, reflect: false }, dialogOptions: { type: Object, reflect: false }, globals: { type: Object, reflect: false }, - validateEmptyValues: { type: Boolean, reflect: true } + validateEmptyValues: { type: Boolean, reflect: true }, }; } diff --git a/src/electron/frontend/core/components/Search.js b/src/electron/frontend/core/components/Search.js index 29c3433e2..dcd264761 100644 --- a/src/electron/frontend/core/components/Search.js +++ b/src/electron/frontend/core/components/Search.js @@ -33,7 +33,7 @@ export class Search extends LitElement { } #close = () => { - console.log('CLOSING', this.getSelectedOption()) + console.log("CLOSING", this.getSelectedOption()); if (this.listMode === "input" && this.getAttribute("interacted") === "true") { this.setAttribute("interacted", false); this.#onSelect(this.getSelectedOption()); diff --git a/src/electron/frontend/core/components/pages/Page.js b/src/electron/frontend/core/components/pages/Page.js index 26a2e5f1d..e340ad6ef 100644 --- a/src/electron/frontend/core/components/pages/Page.js +++ b/src/electron/frontend/core/components/pages/Page.js @@ -188,7 +188,7 @@ export class Page extends LitElement { ...conversionOptions, // Any additional conversion options override the defaults interfaces: globalState.interfaces, alignment, - timezone: this.workflow.timezone.value + timezone: this.workflow.timezone.value, }; fileConfiguration.push(payload); diff --git a/src/electron/frontend/core/components/pages/guided-mode/setup/Preform.js b/src/electron/frontend/core/components/pages/guided-mode/setup/Preform.js index 88a410ab6..7ba682da8 100644 --- a/src/electron/frontend/core/components/pages/guided-mode/setup/Preform.js +++ b/src/electron/frontend/core/components/pages/guided-mode/setup/Preform.js @@ -75,7 +75,6 @@ const questions = { // ------------------------------------------------------------------------------------------- const getSchema = (questions) => { - // Inject latest timezone schema each render questions.timezone = { ...questions.timezone, ...timezoneSchema }; @@ -123,11 +122,9 @@ const getSchema = (questions) => { return { schema: structuredClone(projectWorkflowSchema), defaults, - dependents - } - - -} + dependents, + }; +}; // ---------------------------------------------------------------------- // ------------------------ Preform Class ------------------------------- @@ -158,7 +155,6 @@ export class GuidedPreform extends Page { }; updateForm = () => { - const { schema, dependents, defaults } = getSchema(questions); const projectState = this.info.globalState.project ?? {}; if (!projectState.workflow) projectState.workflow = {}; diff --git a/src/pyflask/manageNeuroconv/manage_neuroconv.py b/src/pyflask/manageNeuroconv/manage_neuroconv.py index c971700db..e8589a4b8 100644 --- a/src/pyflask/manageNeuroconv/manage_neuroconv.py +++ b/src/pyflask/manageNeuroconv/manage_neuroconv.py @@ -870,7 +870,6 @@ def convert_to_nwb( timezone = info.get("timezone") - try: # add a subdirectory to a filepath if stub_test is true diff --git a/src/pyflask/namespaces/time.py b/src/pyflask/namespaces/time.py index 58ba51362..6602667b7 100644 --- a/src/pyflask/namespaces/time.py +++ b/src/pyflask/namespaces/time.py @@ -15,8 +15,9 @@ class GetTimezones(flask_restx.Resource): ) def get(self) -> Union[Dict[str, int], None]: from zoneinfo import available_timezones + return list(available_timezones()) - + @time_namespace.route("/timezone") class GetTimezones(flask_restx.Resource): @@ -26,4 +27,5 @@ class GetTimezones(flask_restx.Resource): ) def get(self) -> Union[Dict[str, int], None]: from tzlocal import get_localzone + return str(get_localzone()) diff --git a/src/schemas/timezone.schema.ts b/src/schemas/timezone.schema.ts index 704f37f03..2bb05541b 100644 --- a/src/schemas/timezone.schema.ts +++ b/src/schemas/timezone.schema.ts @@ -100,7 +100,7 @@ ready.timezones.then((timezones) => { timezoneSchema.search = true const filteredTimezones = timezoneSchema.enum = timezones.filter(tz => { - return tz.split('/').length > 1 + return tz.split('/').length > 1 && !tz.toLowerCase().includes('etc/') });