From 4213b03be1b6e8fe863c3630db1ee22540acdf09 Mon Sep 17 00:00:00 2001
From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com>
Date: Mon, 17 Jun 2024 14:47:47 -0400
Subject: [PATCH 1/4] new linux dev branch to simplify conflicts
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index bfadc05e6..060fb800f 100644
--- a/package.json
+++ b/package.json
@@ -141,6 +141,7 @@
},
"license": "MIT",
"dependencies": {
+ "electron": "^26.2.2",
"@electron/remote": "^2.0.11",
"@fortawesome/fontawesome-free": "^5.15.3",
"@sweetalert2/theme-bulma": "^4.0.3",
@@ -172,7 +173,6 @@
"@storybook/web-components": "^7.6.10",
"@storybook/web-components-vite": "^7.6.10",
"chromatic": "^6.17.1",
- "electron": "^26.2.2",
"electron-builder": "^24.6.4",
"electron-packager": "^17.1.2",
"electron-updater": "^6.1.4",
From 31229e7040ad653361ed7d817160ff9c11c80534 Mon Sep 17 00:00:00 2001
From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com>
Date: Mon, 17 Jun 2024 14:48:34 -0400
Subject: [PATCH 2/4] Update package.json
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 060fb800f..9aabfb546 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "nwb-guide",
"productName": "NWB GUIDE",
- "version": "1.0.0",
+ "version": "linux | dev",
"description": "NWB GUIDE is a desktop app that provides a no-code user interface for converting neurophysiology data to NWB.",
"main": "./build/main/index.js",
"engine": {
From 71526873f8a0f6eeede86c08c87c5f5d07627dd7 Mon Sep 17 00:00:00 2001
From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com>
Date: Mon, 17 Jun 2024 14:49:04 -0400
Subject: [PATCH 3/4] Update deploy_tests_on_pull_request.yml
---
.github/workflows/deploy_tests_on_pull_request.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/deploy_tests_on_pull_request.yml b/.github/workflows/deploy_tests_on_pull_request.yml
index f006b1d2b..f2b4bd62c 100644
--- a/.github/workflows/deploy_tests_on_pull_request.yml
+++ b/.github/workflows/deploy_tests_on_pull_request.yml
@@ -1,7 +1,8 @@
name: Deploy
on:
- pull_request:
+ #pull_request:
+ workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
From 6c6915d0bc4aee154f6a1c75442eb39237e32c52 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
<66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 13 Aug 2024 23:42:28 +0000
Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---
src/electron/frontend/core/components/InstanceManager.js | 2 +-
src/electron/frontend/core/components/JSONSchemaForm.js | 2 +-
src/electron/frontend/core/components/JSONSchemaInput.js | 2 +-
src/electron/frontend/core/components/SimpleTable.js | 2 +-
.../frontend/core/components/pages/settings/SettingsPage.js | 2 +-
src/electron/frontend/core/components/sidebar.js | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/electron/frontend/core/components/InstanceManager.js b/src/electron/frontend/core/components/InstanceManager.js
index cfb4e1f86..0765aa9f9 100644
--- a/src/electron/frontend/core/components/InstanceManager.js
+++ b/src/electron/frontend/core/components/InstanceManager.js
@@ -400,7 +400,7 @@ export class InstanceManager extends LitElement {
const res = this.onAdded(path);
let resolvedPath = res?.key ? res.key.split("/") : path;
- let resolvedValue = res instanceof HTMLElement ? res : res?.value ?? null;
+ let resolvedValue = res instanceof HTMLElement ? res : (res?.value ?? null);
let key = resolvedPath.pop();
diff --git a/src/electron/frontend/core/components/JSONSchemaForm.js b/src/electron/frontend/core/components/JSONSchemaForm.js
index 3e3909820..b241473c8 100644
--- a/src/electron/frontend/core/components/JSONSchemaForm.js
+++ b/src/electron/frontend/core/components/JSONSchemaForm.js
@@ -698,7 +698,7 @@ export class JSONSchemaForm extends LitElement {
required: isRequired,
conditional: isConditional,
validateEmptyValue: this.validateEmptyValues,
- pattern: propertyType === "pattern" ? name : propertyType ?? undefined,
+ pattern: propertyType === "pattern" ? name : (propertyType ?? undefined),
renderTable: this.renderTable,
renderCustomHTML: this.renderCustomHTML,
showLabel: !("title" in info && !info.title),
diff --git a/src/electron/frontend/core/components/JSONSchemaInput.js b/src/electron/frontend/core/components/JSONSchemaInput.js
index 91ec60014..2cbda0094 100644
--- a/src/electron/frontend/core/components/JSONSchemaInput.js
+++ b/src/electron/frontend/core/components/JSONSchemaInput.js
@@ -1285,7 +1285,7 @@ export class JSONSchemaInput extends LitElement {
const type = isDateTime
? "datetime-local"
- : schema.format ?? (schema.type === "string" ? "text" : schema.type);
+ : (schema.format ?? (schema.type === "string" ? "text" : schema.type));
const value = isDateTime ? renderDateTime(this.value) : this.value;
diff --git a/src/electron/frontend/core/components/SimpleTable.js b/src/electron/frontend/core/components/SimpleTable.js
index 4ec4ef49b..681d03a29 100644
--- a/src/electron/frontend/core/components/SimpleTable.js
+++ b/src/electron/frontend/core/components/SimpleTable.js
@@ -322,7 +322,7 @@ export class SimpleTable extends LitElement {
set data(val) {
this.#data = val;
- this.keyColumn = Array.isArray(this.#data) ? undefined : this.#keyColumn ?? "Property Key";
+ this.keyColumn = Array.isArray(this.#data) ? undefined : (this.#keyColumn ?? "Property Key");
}
#selected = {};
diff --git a/src/electron/frontend/core/components/pages/settings/SettingsPage.js b/src/electron/frontend/core/components/pages/settings/SettingsPage.js
index 77746f42c..c89fb4475 100644
--- a/src/electron/frontend/core/components/pages/settings/SettingsPage.js
+++ b/src/electron/frontend/core/components/pages/settings/SettingsPage.js
@@ -68,7 +68,7 @@ function saveNewPipelineFromYaml(name, info, rootFolder) {
Subject: { subject_id },
};
- resolvedMetadata.__generated = structuredClone(info.interfaces ? info.metadata ?? {} : {});
+ resolvedMetadata.__generated = structuredClone(info.interfaces ? (info.metadata ?? {}) : {});
const resolvedInfo = {
source_data: resolvedInterfaces,
diff --git a/src/electron/frontend/core/components/sidebar.js b/src/electron/frontend/core/components/sidebar.js
index 062a796d4..c2af3b510 100644
--- a/src/electron/frontend/core/components/sidebar.js
+++ b/src/electron/frontend/core/components/sidebar.js
@@ -190,7 +190,7 @@ export class Sidebar extends LitElement {
}
const parent = info.group
- ? groups[info.group] ?? (groups[info.group] = document.createElement("div"))
+ ? (groups[info.group] ?? (groups[info.group] = document.createElement("div")))
: ul;
parent.append(li);
});