From 6a8b0dc3d5479e460508e2f30904515854ca254a Mon Sep 17 00:00:00 2001 From: Garrett Date: Thu, 28 Sep 2023 14:08:51 -0700 Subject: [PATCH 1/9] Add CaimanSegmentationInterface --- guideGlobalMetadata.json | 3 +- .../generated/BiocamRecordingInterface.json | 2 +- .../BlackrockRecordingInterface.json | 2 +- .../generated/BlackrockSortingInterface.json | 2 +- ...BrukerTiffSinglePlaneImagingInterface.json | 2 +- .../CaimanSegmentationInterface.json | 29 +++ .../CellExplorerSortingInterface.json | 2 +- .../generated/IntanRecordingInterface.json | 2 +- .../generated/KiloSortSortingInterface.json | 2 +- .../generated/NeuroScopeLFPInterface.json | 2 +- .../NeuroScopeRecordingInterface.json | 2 +- .../generated/NeuroScopeSortingInterface.json | 2 +- .../OpenEphysRecordingInterface.json | 2 +- .../json/generated/PhySortingInterface.json | 2 +- .../generated/Spike2RecordingInterface.json | 2 +- .../json/generated/SpikeGLXNIDQInterface.json | 2 +- .../generated/SpikeGLXRecordingInterface.json | 2 +- .../pages/guided-mode/SourceData.stories.js | 198 +++++++++--------- 18 files changed, 141 insertions(+), 119 deletions(-) create mode 100644 schemas/json/generated/CaimanSegmentationInterface.json diff --git a/guideGlobalMetadata.json b/guideGlobalMetadata.json index 1b4fabc8d..a1a3f531b 100644 --- a/guideGlobalMetadata.json +++ b/guideGlobalMetadata.json @@ -14,6 +14,7 @@ "CellExplorerSortingInterface", "KiloSortSortingInterface", "Spike2RecordingInterface", - "BrukerTiffSinglePlaneImagingInterface" + "BrukerTiffSinglePlaneImagingInterface", + "CaimanSegmentationInterface" ] } diff --git a/schemas/json/generated/BiocamRecordingInterface.json b/schemas/json/generated/BiocamRecordingInterface.json index 8d51c7b06..3265fe263 100644 --- a/schemas/json/generated/BiocamRecordingInterface.json +++ b/schemas/json/generated/BiocamRecordingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/BlackrockRecordingInterface.json b/schemas/json/generated/BlackrockRecordingInterface.json index 25190ebf2..32de2a224 100644 --- a/schemas/json/generated/BlackrockRecordingInterface.json +++ b/schemas/json/generated/BlackrockRecordingInterface.json @@ -35,4 +35,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/BlackrockSortingInterface.json b/schemas/json/generated/BlackrockSortingInterface.json index 02661e794..1b0b34068 100644 --- a/schemas/json/generated/BlackrockSortingInterface.json +++ b/schemas/json/generated/BlackrockSortingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json b/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json index 844834ff9..50cea61c2 100644 --- a/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json +++ b/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/CaimanSegmentationInterface.json b/schemas/json/generated/CaimanSegmentationInterface.json new file mode 100644 index 000000000..84d9efb5e --- /dev/null +++ b/schemas/json/generated/CaimanSegmentationInterface.json @@ -0,0 +1,29 @@ +{ + "required": [], + "properties": { + "CaimanSegmentationInterface": { + "required": [ + "file_path" + ], + "properties": { + "file_path": { + "format": "file", + "type": "string" + }, + "verbose": { + "type": "boolean", + "default": true + } + }, + "type": "object", + "additionalProperties": false + } + }, + "type": "object", + "additionalProperties": false, + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "source.schema.json", + "title": "Source data schema", + "description": "Schema for the source data, files and directories", + "version": "0.1.0" +} \ No newline at end of file diff --git a/schemas/json/generated/CellExplorerSortingInterface.json b/schemas/json/generated/CellExplorerSortingInterface.json index c51a65d4e..e2cc689b1 100644 --- a/schemas/json/generated/CellExplorerSortingInterface.json +++ b/schemas/json/generated/CellExplorerSortingInterface.json @@ -26,4 +26,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/IntanRecordingInterface.json b/schemas/json/generated/IntanRecordingInterface.json index 07904ada2..b75b39eda 100644 --- a/schemas/json/generated/IntanRecordingInterface.json +++ b/schemas/json/generated/IntanRecordingInterface.json @@ -34,4 +34,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/KiloSortSortingInterface.json b/schemas/json/generated/KiloSortSortingInterface.json index a31d22b75..5ef66d490 100644 --- a/schemas/json/generated/KiloSortSortingInterface.json +++ b/schemas/json/generated/KiloSortSortingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/NeuroScopeLFPInterface.json b/schemas/json/generated/NeuroScopeLFPInterface.json index d42a885ab..3c6224cf0 100644 --- a/schemas/json/generated/NeuroScopeLFPInterface.json +++ b/schemas/json/generated/NeuroScopeLFPInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/NeuroScopeRecordingInterface.json b/schemas/json/generated/NeuroScopeRecordingInterface.json index 3e95a33d0..2077b287a 100644 --- a/schemas/json/generated/NeuroScopeRecordingInterface.json +++ b/schemas/json/generated/NeuroScopeRecordingInterface.json @@ -37,4 +37,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/NeuroScopeSortingInterface.json b/schemas/json/generated/NeuroScopeSortingInterface.json index 680fcbce9..fe3d76fe6 100644 --- a/schemas/json/generated/NeuroScopeSortingInterface.json +++ b/schemas/json/generated/NeuroScopeSortingInterface.json @@ -37,4 +37,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/OpenEphysRecordingInterface.json b/schemas/json/generated/OpenEphysRecordingInterface.json index f6193ea0c..f3affa4d3 100644 --- a/schemas/json/generated/OpenEphysRecordingInterface.json +++ b/schemas/json/generated/OpenEphysRecordingInterface.json @@ -33,4 +33,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/PhySortingInterface.json b/schemas/json/generated/PhySortingInterface.json index edcc2183d..182494ca2 100644 --- a/schemas/json/generated/PhySortingInterface.json +++ b/schemas/json/generated/PhySortingInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/Spike2RecordingInterface.json b/schemas/json/generated/Spike2RecordingInterface.json index 81c785ad8..3b143bf75 100644 --- a/schemas/json/generated/Spike2RecordingInterface.json +++ b/schemas/json/generated/Spike2RecordingInterface.json @@ -31,4 +31,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/SpikeGLXNIDQInterface.json b/schemas/json/generated/SpikeGLXNIDQInterface.json index 14ad82eb8..8a38f1387 100644 --- a/schemas/json/generated/SpikeGLXNIDQInterface.json +++ b/schemas/json/generated/SpikeGLXNIDQInterface.json @@ -35,4 +35,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/SpikeGLXRecordingInterface.json b/schemas/json/generated/SpikeGLXRecordingInterface.json index 4b2034df8..603158605 100644 --- a/schemas/json/generated/SpikeGLXRecordingInterface.json +++ b/schemas/json/generated/SpikeGLXRecordingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js b/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js index 59b3acc74..9b60bcfeb 100644 --- a/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js +++ b/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js @@ -1,159 +1,151 @@ import { globalState, PageTemplate } from "./storyStates"; -import SpikeGLXRecordingInterfaceSchema from "../../../../../../schemas/json/generated/SpikeGLXRecordingInterface.json"; -import SpikeGLXNIDQInterfaceSchema from "../../../../../../schemas/json/generated/SpikeGLXNIDQInterface.json"; -import PhySortingInterfaceSchema from "../../../../../../schemas/json/generated/PhySortingInterface.json"; -import NeuroScopeRecordingInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeRecordingInterface.json"; -import NeuroScopeLFPInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeLFPInterface.json"; -import NeuroScopeSortingInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeSortingInterface.json"; -import BiocamRecordingInterfaceSchema from "../../../../../../schemas/json/generated/BiocamRecordingInterface.json"; -import IntanRecordingInterfaceSchema from "../../../../../../schemas/json/generated/IntanRecordingInterface.json"; -import OpenEphysRecordingInterfaceSchema from "../../../../../../schemas/json/generated/OpenEphysRecordingInterface.json"; -import BlackrockRecordingInterfaceSchema from "../../../../../../schemas/json/generated/BlackrockRecordingInterface.json"; -import BlackrockSortingInterfaceSchema from "../../../../../../schemas/json/generated/BlackrockSortingInterface.json"; -import CellExplorerSortingInterfaceSchema from "../../../../../../schemas/json/generated/CellExplorerSortingInterface.json"; -import KiloSortSortingInterfaceSchema from "../../../../../../schemas/json/generated/KiloSortSortingInterface.json"; -import Spike2RecordingInterfaceSchema from "../../../../../../schemas/json/generated/Spike2RecordingInterface.json"; -import BrukerTiffSinglePlaneImagingInterfaceSchema from "../../../../../../schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json"; +import SpikeGLXRecordingInterfaceSchema from '../../../../../../schemas/json/generated/SpikeGLXRecordingInterface.json' +import SpikeGLXNIDQInterfaceSchema from '../../../../../../schemas/json/generated/SpikeGLXNIDQInterface.json' +import PhySortingInterfaceSchema from '../../../../../../schemas/json/generated/PhySortingInterface.json' +import NeuroScopeRecordingInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeRecordingInterface.json' +import NeuroScopeLFPInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeLFPInterface.json' +import NeuroScopeSortingInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeSortingInterface.json' +import BiocamRecordingInterfaceSchema from '../../../../../../schemas/json/generated/BiocamRecordingInterface.json' +import IntanRecordingInterfaceSchema from '../../../../../../schemas/json/generated/IntanRecordingInterface.json' +import OpenEphysRecordingInterfaceSchema from '../../../../../../schemas/json/generated/OpenEphysRecordingInterface.json' +import BlackrockRecordingInterfaceSchema from '../../../../../../schemas/json/generated/BlackrockRecordingInterface.json' +import BlackrockSortingInterfaceSchema from '../../../../../../schemas/json/generated/BlackrockSortingInterface.json' +import CellExplorerSortingInterfaceSchema from '../../../../../../schemas/json/generated/CellExplorerSortingInterface.json' +import KiloSortSortingInterfaceSchema from '../../../../../../schemas/json/generated/KiloSortSortingInterface.json' +import Spike2RecordingInterfaceSchema from '../../../../../../schemas/json/generated/Spike2RecordingInterface.json' +import BrukerTiffSinglePlaneImagingInterfaceSchema from '../../../../../../schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json' +import CaimanSegmentationInterfaceSchema from '../../../../../../schemas/json/generated/CaimanSegmentationInterface.json' export default { title: "Pages/Guided Mode/Source Data", parameters: { chromatic: { disableSnapshot: false }, - }, + } }; -const activePage = "conversion/sourcedata"; - -const globalStateCopy = JSON.parse(JSON.stringify(globalState)); -globalStateCopy.schema.source_data.properties.SpikeGLXRecordingInterface = - SpikeGLXRecordingInterfaceSchema.properties.SpikeGLXRecordingInterface; -globalStateCopy.schema.source_data.properties.SpikeGLXNIDQInterface = - SpikeGLXNIDQInterfaceSchema.properties.SpikeGLXNIDQInterface; -globalStateCopy.schema.source_data.properties.PhySortingInterface = - PhySortingInterfaceSchema.properties.PhySortingInterface; -globalStateCopy.schema.source_data.properties.NeuroScopeRecordingInterface = - NeuroScopeRecordingInterfaceSchema.properties.NeuroScopeRecordingInterface; -globalStateCopy.schema.source_data.properties.NeuroScopeLFPInterface = - NeuroScopeLFPInterfaceSchema.properties.NeuroScopeLFPInterface; -globalStateCopy.schema.source_data.properties.NeuroScopeSortingInterface = - NeuroScopeSortingInterfaceSchema.properties.NeuroScopeSortingInterface; -globalStateCopy.schema.source_data.properties.BiocamRecordingInterface = - BiocamRecordingInterfaceSchema.properties.BiocamRecordingInterface; -globalStateCopy.schema.source_data.properties.IntanRecordingInterface = - IntanRecordingInterfaceSchema.properties.IntanRecordingInterface; -globalStateCopy.schema.source_data.properties.OpenEphysRecordingInterface = - OpenEphysRecordingInterfaceSchema.properties.OpenEphysRecordingInterface; -globalStateCopy.schema.source_data.properties.BlackrockRecordingInterface = - BlackrockRecordingInterfaceSchema.properties.BlackrockRecordingInterface; -globalStateCopy.schema.source_data.properties.BlackrockSortingInterface = - BlackrockSortingInterfaceSchema.properties.BlackrockSortingInterface; -globalStateCopy.schema.source_data.properties.CellExplorerSortingInterface = - CellExplorerSortingInterfaceSchema.properties.CellExplorerSortingInterface; -globalStateCopy.schema.source_data.properties.KiloSortSortingInterface = - KiloSortSortingInterfaceSchema.properties.KiloSortSortingInterface; -globalStateCopy.schema.source_data.properties.Spike2RecordingInterface = - Spike2RecordingInterfaceSchema.properties.Spike2RecordingInterface; -globalStateCopy.schema.source_data.properties.BrukerTiffSinglePlaneImagingInterface = - BrukerTiffSinglePlaneImagingInterfaceSchema.properties.BrukerTiffSinglePlaneImagingInterface; - -const results = globalStateCopy.results; -for (let sub in results) { - for (let ses in results[sub]) - results[sub][ses].source_data = { SpikeGLXNIDQInterface: { file_path: "/dummy/file/path" } }; +const activePage = "conversion/sourcedata" + + +const globalStateCopy = JSON.parse(JSON.stringify(globalState)) +globalStateCopy.schema.source_data.properties.SpikeGLXRecordingInterface = SpikeGLXRecordingInterfaceSchema.properties.SpikeGLXRecordingInterface +globalStateCopy.schema.source_data.properties.SpikeGLXNIDQInterface = SpikeGLXNIDQInterfaceSchema.properties.SpikeGLXNIDQInterface +globalStateCopy.schema.source_data.properties.PhySortingInterface = PhySortingInterfaceSchema.properties.PhySortingInterface +globalStateCopy.schema.source_data.properties.NeuroScopeRecordingInterface = NeuroScopeRecordingInterfaceSchema.properties.NeuroScopeRecordingInterface +globalStateCopy.schema.source_data.properties.NeuroScopeLFPInterface = NeuroScopeLFPInterfaceSchema.properties.NeuroScopeLFPInterface +globalStateCopy.schema.source_data.properties.NeuroScopeSortingInterface = NeuroScopeSortingInterfaceSchema.properties.NeuroScopeSortingInterface +globalStateCopy.schema.source_data.properties.BiocamRecordingInterface = BiocamRecordingInterfaceSchema.properties.BiocamRecordingInterface +globalStateCopy.schema.source_data.properties.IntanRecordingInterface = IntanRecordingInterfaceSchema.properties.IntanRecordingInterface +globalStateCopy.schema.source_data.properties.OpenEphysRecordingInterface = OpenEphysRecordingInterfaceSchema.properties.OpenEphysRecordingInterface +globalStateCopy.schema.source_data.properties.BlackrockRecordingInterface = BlackrockRecordingInterfaceSchema.properties.BlackrockRecordingInterface +globalStateCopy.schema.source_data.properties.BlackrockSortingInterface = BlackrockSortingInterfaceSchema.properties.BlackrockSortingInterface +globalStateCopy.schema.source_data.properties.CellExplorerSortingInterface = CellExplorerSortingInterfaceSchema.properties.CellExplorerSortingInterface +globalStateCopy.schema.source_data.properties.KiloSortSortingInterface = KiloSortSortingInterfaceSchema.properties.KiloSortSortingInterface +globalStateCopy.schema.source_data.properties.Spike2RecordingInterface = Spike2RecordingInterfaceSchema.properties.Spike2RecordingInterface +globalStateCopy.schema.source_data.properties.BrukerTiffSinglePlaneImagingInterface = BrukerTiffSinglePlaneImagingInterfaceSchema.properties.BrukerTiffSinglePlaneImagingInterface +globalStateCopy.schema.source_data.properties.CaimanSegmentationInterface = CaimanSegmentationInterfaceSchema.properties.CaimanSegmentationInterface + +const results = globalStateCopy.results +for (let sub in results){ + for (let ses in results[sub]) results[sub][ses].source_data = {SpikeGLXNIDQInterface: {file_path: '/dummy/file/path'}} } + export const All = PageTemplate.bind({}); All.args = { activePage, globalState: globalStateCopy }; export const SpikeGLXRecordingInterface = PageTemplate.bind({}); -const SpikeGLXRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -SpikeGLXRecordingInterfaceGlobalCopy.interfaces.interface = SpikeGLXRecordingInterface; -SpikeGLXRecordingInterfaceGlobalCopy.schema.source_data = SpikeGLXRecordingInterfaceSchema; +const SpikeGLXRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +SpikeGLXRecordingInterfaceGlobalCopy.interfaces.interface = SpikeGLXRecordingInterface +SpikeGLXRecordingInterfaceGlobalCopy.schema.source_data = SpikeGLXRecordingInterfaceSchema SpikeGLXRecordingInterface.args = { activePage, globalState: SpikeGLXRecordingInterfaceGlobalCopy }; export const SpikeGLXNIDQInterface = PageTemplate.bind({}); -const SpikeGLXNIDQInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -SpikeGLXNIDQInterfaceGlobalCopy.interfaces.interface = SpikeGLXNIDQInterface; -SpikeGLXNIDQInterfaceGlobalCopy.schema.source_data = SpikeGLXNIDQInterfaceSchema; +const SpikeGLXNIDQInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +SpikeGLXNIDQInterfaceGlobalCopy.interfaces.interface = SpikeGLXNIDQInterface +SpikeGLXNIDQInterfaceGlobalCopy.schema.source_data = SpikeGLXNIDQInterfaceSchema SpikeGLXNIDQInterface.args = { activePage, globalState: SpikeGLXNIDQInterfaceGlobalCopy }; export const PhySortingInterface = PageTemplate.bind({}); -const PhySortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -PhySortingInterfaceGlobalCopy.interfaces.interface = PhySortingInterface; -PhySortingInterfaceGlobalCopy.schema.source_data = PhySortingInterfaceSchema; +const PhySortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +PhySortingInterfaceGlobalCopy.interfaces.interface = PhySortingInterface +PhySortingInterfaceGlobalCopy.schema.source_data = PhySortingInterfaceSchema PhySortingInterface.args = { activePage, globalState: PhySortingInterfaceGlobalCopy }; export const NeuroScopeRecordingInterface = PageTemplate.bind({}); -const NeuroScopeRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -NeuroScopeRecordingInterfaceGlobalCopy.interfaces.interface = NeuroScopeRecordingInterface; -NeuroScopeRecordingInterfaceGlobalCopy.schema.source_data = NeuroScopeRecordingInterfaceSchema; +const NeuroScopeRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +NeuroScopeRecordingInterfaceGlobalCopy.interfaces.interface = NeuroScopeRecordingInterface +NeuroScopeRecordingInterfaceGlobalCopy.schema.source_data = NeuroScopeRecordingInterfaceSchema NeuroScopeRecordingInterface.args = { activePage, globalState: NeuroScopeRecordingInterfaceGlobalCopy }; export const NeuroScopeLFPInterface = PageTemplate.bind({}); -const NeuroScopeLFPInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -NeuroScopeLFPInterfaceGlobalCopy.interfaces.interface = NeuroScopeLFPInterface; -NeuroScopeLFPInterfaceGlobalCopy.schema.source_data = NeuroScopeLFPInterfaceSchema; +const NeuroScopeLFPInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +NeuroScopeLFPInterfaceGlobalCopy.interfaces.interface = NeuroScopeLFPInterface +NeuroScopeLFPInterfaceGlobalCopy.schema.source_data = NeuroScopeLFPInterfaceSchema NeuroScopeLFPInterface.args = { activePage, globalState: NeuroScopeLFPInterfaceGlobalCopy }; export const NeuroScopeSortingInterface = PageTemplate.bind({}); -const NeuroScopeSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -NeuroScopeSortingInterfaceGlobalCopy.interfaces.interface = NeuroScopeSortingInterface; -NeuroScopeSortingInterfaceGlobalCopy.schema.source_data = NeuroScopeSortingInterfaceSchema; +const NeuroScopeSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +NeuroScopeSortingInterfaceGlobalCopy.interfaces.interface = NeuroScopeSortingInterface +NeuroScopeSortingInterfaceGlobalCopy.schema.source_data = NeuroScopeSortingInterfaceSchema NeuroScopeSortingInterface.args = { activePage, globalState: NeuroScopeSortingInterfaceGlobalCopy }; export const BiocamRecordingInterface = PageTemplate.bind({}); -const BiocamRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -BiocamRecordingInterfaceGlobalCopy.interfaces.interface = BiocamRecordingInterface; -BiocamRecordingInterfaceGlobalCopy.schema.source_data = BiocamRecordingInterfaceSchema; +const BiocamRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +BiocamRecordingInterfaceGlobalCopy.interfaces.interface = BiocamRecordingInterface +BiocamRecordingInterfaceGlobalCopy.schema.source_data = BiocamRecordingInterfaceSchema BiocamRecordingInterface.args = { activePage, globalState: BiocamRecordingInterfaceGlobalCopy }; export const IntanRecordingInterface = PageTemplate.bind({}); -const IntanRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -IntanRecordingInterfaceGlobalCopy.interfaces.interface = IntanRecordingInterface; -IntanRecordingInterfaceGlobalCopy.schema.source_data = IntanRecordingInterfaceSchema; +const IntanRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +IntanRecordingInterfaceGlobalCopy.interfaces.interface = IntanRecordingInterface +IntanRecordingInterfaceGlobalCopy.schema.source_data = IntanRecordingInterfaceSchema IntanRecordingInterface.args = { activePage, globalState: IntanRecordingInterfaceGlobalCopy }; export const OpenEphysRecordingInterface = PageTemplate.bind({}); -const OpenEphysRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -OpenEphysRecordingInterfaceGlobalCopy.interfaces.interface = OpenEphysRecordingInterface; -OpenEphysRecordingInterfaceGlobalCopy.schema.source_data = OpenEphysRecordingInterfaceSchema; +const OpenEphysRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +OpenEphysRecordingInterfaceGlobalCopy.interfaces.interface = OpenEphysRecordingInterface +OpenEphysRecordingInterfaceGlobalCopy.schema.source_data = OpenEphysRecordingInterfaceSchema OpenEphysRecordingInterface.args = { activePage, globalState: OpenEphysRecordingInterfaceGlobalCopy }; export const BlackrockRecordingInterface = PageTemplate.bind({}); -const BlackrockRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -BlackrockRecordingInterfaceGlobalCopy.interfaces.interface = BlackrockRecordingInterface; -BlackrockRecordingInterfaceGlobalCopy.schema.source_data = BlackrockRecordingInterfaceSchema; +const BlackrockRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +BlackrockRecordingInterfaceGlobalCopy.interfaces.interface = BlackrockRecordingInterface +BlackrockRecordingInterfaceGlobalCopy.schema.source_data = BlackrockRecordingInterfaceSchema BlackrockRecordingInterface.args = { activePage, globalState: BlackrockRecordingInterfaceGlobalCopy }; export const BlackrockSortingInterface = PageTemplate.bind({}); -const BlackrockSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -BlackrockSortingInterfaceGlobalCopy.interfaces.interface = BlackrockSortingInterface; -BlackrockSortingInterfaceGlobalCopy.schema.source_data = BlackrockSortingInterfaceSchema; +const BlackrockSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +BlackrockSortingInterfaceGlobalCopy.interfaces.interface = BlackrockSortingInterface +BlackrockSortingInterfaceGlobalCopy.schema.source_data = BlackrockSortingInterfaceSchema BlackrockSortingInterface.args = { activePage, globalState: BlackrockSortingInterfaceGlobalCopy }; export const CellExplorerSortingInterface = PageTemplate.bind({}); -const CellExplorerSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -CellExplorerSortingInterfaceGlobalCopy.interfaces.interface = CellExplorerSortingInterface; -CellExplorerSortingInterfaceGlobalCopy.schema.source_data = CellExplorerSortingInterfaceSchema; +const CellExplorerSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +CellExplorerSortingInterfaceGlobalCopy.interfaces.interface = CellExplorerSortingInterface +CellExplorerSortingInterfaceGlobalCopy.schema.source_data = CellExplorerSortingInterfaceSchema CellExplorerSortingInterface.args = { activePage, globalState: CellExplorerSortingInterfaceGlobalCopy }; export const KiloSortSortingInterface = PageTemplate.bind({}); -const KiloSortSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -KiloSortSortingInterfaceGlobalCopy.interfaces.interface = KiloSortSortingInterface; -KiloSortSortingInterfaceGlobalCopy.schema.source_data = KiloSortSortingInterfaceSchema; +const KiloSortSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +KiloSortSortingInterfaceGlobalCopy.interfaces.interface = KiloSortSortingInterface +KiloSortSortingInterfaceGlobalCopy.schema.source_data = KiloSortSortingInterfaceSchema KiloSortSortingInterface.args = { activePage, globalState: KiloSortSortingInterfaceGlobalCopy }; export const Spike2RecordingInterface = PageTemplate.bind({}); -const Spike2RecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -Spike2RecordingInterfaceGlobalCopy.interfaces.interface = Spike2RecordingInterface; -Spike2RecordingInterfaceGlobalCopy.schema.source_data = Spike2RecordingInterfaceSchema; +const Spike2RecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +Spike2RecordingInterfaceGlobalCopy.interfaces.interface = Spike2RecordingInterface +Spike2RecordingInterfaceGlobalCopy.schema.source_data = Spike2RecordingInterfaceSchema Spike2RecordingInterface.args = { activePage, globalState: Spike2RecordingInterfaceGlobalCopy }; export const BrukerTiffSinglePlaneImagingInterface = PageTemplate.bind({}); -const BrukerTiffSinglePlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); -BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffSinglePlaneImagingInterface; -BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffSinglePlaneImagingInterfaceSchema; -BrukerTiffSinglePlaneImagingInterface.args = { - activePage, - globalState: BrukerTiffSinglePlaneImagingInterfaceGlobalCopy, -}; +const BrukerTiffSinglePlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffSinglePlaneImagingInterface +BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffSinglePlaneImagingInterfaceSchema +BrukerTiffSinglePlaneImagingInterface.args = { activePage, globalState: BrukerTiffSinglePlaneImagingInterfaceGlobalCopy }; + +export const CaimanSegmentationInterface = PageTemplate.bind({}); +const CaimanSegmentationInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) +CaimanSegmentationInterfaceGlobalCopy.interfaces.interface = CaimanSegmentationInterface +CaimanSegmentationInterfaceGlobalCopy.schema.source_data = CaimanSegmentationInterfaceSchema +CaimanSegmentationInterface.args = { activePage, globalState: CaimanSegmentationInterfaceGlobalCopy }; + From b4bf06a14ad5a3c7eded76fbcf312c3381d7cc33 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 21:11:20 +0000 Subject: [PATCH 2/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../generated/BiocamRecordingInterface.json | 2 +- .../BlackrockRecordingInterface.json | 2 +- .../generated/BlackrockSortingInterface.json | 2 +- ...BrukerTiffSinglePlaneImagingInterface.json | 2 +- .../CaimanSegmentationInterface.json | 2 +- .../CellExplorerSortingInterface.json | 2 +- .../generated/IntanRecordingInterface.json | 2 +- .../generated/KiloSortSortingInterface.json | 2 +- .../generated/NeuroScopeLFPInterface.json | 2 +- .../NeuroScopeRecordingInterface.json | 2 +- .../generated/NeuroScopeSortingInterface.json | 2 +- .../OpenEphysRecordingInterface.json | 2 +- .../json/generated/PhySortingInterface.json | 2 +- .../generated/Spike2RecordingInterface.json | 2 +- .../json/generated/SpikeGLXNIDQInterface.json | 2 +- .../generated/SpikeGLXRecordingInterface.json | 2 +- src/main/main.ts | 2 +- .../pages/guided-mode/SourceData.stories.js | 201 ++++++++++-------- 18 files changed, 126 insertions(+), 109 deletions(-) diff --git a/schemas/json/generated/BiocamRecordingInterface.json b/schemas/json/generated/BiocamRecordingInterface.json index 3265fe263..8d51c7b06 100644 --- a/schemas/json/generated/BiocamRecordingInterface.json +++ b/schemas/json/generated/BiocamRecordingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/BlackrockRecordingInterface.json b/schemas/json/generated/BlackrockRecordingInterface.json index 32de2a224..25190ebf2 100644 --- a/schemas/json/generated/BlackrockRecordingInterface.json +++ b/schemas/json/generated/BlackrockRecordingInterface.json @@ -35,4 +35,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/BlackrockSortingInterface.json b/schemas/json/generated/BlackrockSortingInterface.json index 1b0b34068..02661e794 100644 --- a/schemas/json/generated/BlackrockSortingInterface.json +++ b/schemas/json/generated/BlackrockSortingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json b/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json index 50cea61c2..844834ff9 100644 --- a/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json +++ b/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/CaimanSegmentationInterface.json b/schemas/json/generated/CaimanSegmentationInterface.json index 84d9efb5e..db580d9a5 100644 --- a/schemas/json/generated/CaimanSegmentationInterface.json +++ b/schemas/json/generated/CaimanSegmentationInterface.json @@ -26,4 +26,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/CellExplorerSortingInterface.json b/schemas/json/generated/CellExplorerSortingInterface.json index e2cc689b1..c51a65d4e 100644 --- a/schemas/json/generated/CellExplorerSortingInterface.json +++ b/schemas/json/generated/CellExplorerSortingInterface.json @@ -26,4 +26,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/IntanRecordingInterface.json b/schemas/json/generated/IntanRecordingInterface.json index b75b39eda..07904ada2 100644 --- a/schemas/json/generated/IntanRecordingInterface.json +++ b/schemas/json/generated/IntanRecordingInterface.json @@ -34,4 +34,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/KiloSortSortingInterface.json b/schemas/json/generated/KiloSortSortingInterface.json index 5ef66d490..a31d22b75 100644 --- a/schemas/json/generated/KiloSortSortingInterface.json +++ b/schemas/json/generated/KiloSortSortingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/NeuroScopeLFPInterface.json b/schemas/json/generated/NeuroScopeLFPInterface.json index 3c6224cf0..d42a885ab 100644 --- a/schemas/json/generated/NeuroScopeLFPInterface.json +++ b/schemas/json/generated/NeuroScopeLFPInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/NeuroScopeRecordingInterface.json b/schemas/json/generated/NeuroScopeRecordingInterface.json index 2077b287a..3e95a33d0 100644 --- a/schemas/json/generated/NeuroScopeRecordingInterface.json +++ b/schemas/json/generated/NeuroScopeRecordingInterface.json @@ -37,4 +37,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/NeuroScopeSortingInterface.json b/schemas/json/generated/NeuroScopeSortingInterface.json index fe3d76fe6..680fcbce9 100644 --- a/schemas/json/generated/NeuroScopeSortingInterface.json +++ b/schemas/json/generated/NeuroScopeSortingInterface.json @@ -37,4 +37,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/OpenEphysRecordingInterface.json b/schemas/json/generated/OpenEphysRecordingInterface.json index f3affa4d3..f6193ea0c 100644 --- a/schemas/json/generated/OpenEphysRecordingInterface.json +++ b/schemas/json/generated/OpenEphysRecordingInterface.json @@ -33,4 +33,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/PhySortingInterface.json b/schemas/json/generated/PhySortingInterface.json index 182494ca2..edcc2183d 100644 --- a/schemas/json/generated/PhySortingInterface.json +++ b/schemas/json/generated/PhySortingInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/Spike2RecordingInterface.json b/schemas/json/generated/Spike2RecordingInterface.json index 3b143bf75..81c785ad8 100644 --- a/schemas/json/generated/Spike2RecordingInterface.json +++ b/schemas/json/generated/Spike2RecordingInterface.json @@ -31,4 +31,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/SpikeGLXNIDQInterface.json b/schemas/json/generated/SpikeGLXNIDQInterface.json index 8a38f1387..14ad82eb8 100644 --- a/schemas/json/generated/SpikeGLXNIDQInterface.json +++ b/schemas/json/generated/SpikeGLXNIDQInterface.json @@ -35,4 +35,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/SpikeGLXRecordingInterface.json b/schemas/json/generated/SpikeGLXRecordingInterface.json index 603158605..4b2034df8 100644 --- a/schemas/json/generated/SpikeGLXRecordingInterface.json +++ b/schemas/json/generated/SpikeGLXRecordingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/src/main/main.ts b/src/main/main.ts index 0f78f25c1..f15f363fb 100755 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -184,7 +184,7 @@ const exitPyProc = async () => { const killAllPreviousProcesses = async () => { const fetch = globalThis.fetch - + if (fetch){ console.log("Killing all previous processes"); diff --git a/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js b/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js index 9b60bcfeb..aa4bf4f66 100644 --- a/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js +++ b/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js @@ -1,151 +1,168 @@ import { globalState, PageTemplate } from "./storyStates"; -import SpikeGLXRecordingInterfaceSchema from '../../../../../../schemas/json/generated/SpikeGLXRecordingInterface.json' -import SpikeGLXNIDQInterfaceSchema from '../../../../../../schemas/json/generated/SpikeGLXNIDQInterface.json' -import PhySortingInterfaceSchema from '../../../../../../schemas/json/generated/PhySortingInterface.json' -import NeuroScopeRecordingInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeRecordingInterface.json' -import NeuroScopeLFPInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeLFPInterface.json' -import NeuroScopeSortingInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeSortingInterface.json' -import BiocamRecordingInterfaceSchema from '../../../../../../schemas/json/generated/BiocamRecordingInterface.json' -import IntanRecordingInterfaceSchema from '../../../../../../schemas/json/generated/IntanRecordingInterface.json' -import OpenEphysRecordingInterfaceSchema from '../../../../../../schemas/json/generated/OpenEphysRecordingInterface.json' -import BlackrockRecordingInterfaceSchema from '../../../../../../schemas/json/generated/BlackrockRecordingInterface.json' -import BlackrockSortingInterfaceSchema from '../../../../../../schemas/json/generated/BlackrockSortingInterface.json' -import CellExplorerSortingInterfaceSchema from '../../../../../../schemas/json/generated/CellExplorerSortingInterface.json' -import KiloSortSortingInterfaceSchema from '../../../../../../schemas/json/generated/KiloSortSortingInterface.json' -import Spike2RecordingInterfaceSchema from '../../../../../../schemas/json/generated/Spike2RecordingInterface.json' -import BrukerTiffSinglePlaneImagingInterfaceSchema from '../../../../../../schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json' -import CaimanSegmentationInterfaceSchema from '../../../../../../schemas/json/generated/CaimanSegmentationInterface.json' +import SpikeGLXRecordingInterfaceSchema from "../../../../../../schemas/json/generated/SpikeGLXRecordingInterface.json"; +import SpikeGLXNIDQInterfaceSchema from "../../../../../../schemas/json/generated/SpikeGLXNIDQInterface.json"; +import PhySortingInterfaceSchema from "../../../../../../schemas/json/generated/PhySortingInterface.json"; +import NeuroScopeRecordingInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeRecordingInterface.json"; +import NeuroScopeLFPInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeLFPInterface.json"; +import NeuroScopeSortingInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeSortingInterface.json"; +import BiocamRecordingInterfaceSchema from "../../../../../../schemas/json/generated/BiocamRecordingInterface.json"; +import IntanRecordingInterfaceSchema from "../../../../../../schemas/json/generated/IntanRecordingInterface.json"; +import OpenEphysRecordingInterfaceSchema from "../../../../../../schemas/json/generated/OpenEphysRecordingInterface.json"; +import BlackrockRecordingInterfaceSchema from "../../../../../../schemas/json/generated/BlackrockRecordingInterface.json"; +import BlackrockSortingInterfaceSchema from "../../../../../../schemas/json/generated/BlackrockSortingInterface.json"; +import CellExplorerSortingInterfaceSchema from "../../../../../../schemas/json/generated/CellExplorerSortingInterface.json"; +import KiloSortSortingInterfaceSchema from "../../../../../../schemas/json/generated/KiloSortSortingInterface.json"; +import Spike2RecordingInterfaceSchema from "../../../../../../schemas/json/generated/Spike2RecordingInterface.json"; +import BrukerTiffSinglePlaneImagingInterfaceSchema from "../../../../../../schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json"; +import CaimanSegmentationInterfaceSchema from "../../../../../../schemas/json/generated/CaimanSegmentationInterface.json"; export default { title: "Pages/Guided Mode/Source Data", parameters: { chromatic: { disableSnapshot: false }, - } + }, }; -const activePage = "conversion/sourcedata" - - -const globalStateCopy = JSON.parse(JSON.stringify(globalState)) -globalStateCopy.schema.source_data.properties.SpikeGLXRecordingInterface = SpikeGLXRecordingInterfaceSchema.properties.SpikeGLXRecordingInterface -globalStateCopy.schema.source_data.properties.SpikeGLXNIDQInterface = SpikeGLXNIDQInterfaceSchema.properties.SpikeGLXNIDQInterface -globalStateCopy.schema.source_data.properties.PhySortingInterface = PhySortingInterfaceSchema.properties.PhySortingInterface -globalStateCopy.schema.source_data.properties.NeuroScopeRecordingInterface = NeuroScopeRecordingInterfaceSchema.properties.NeuroScopeRecordingInterface -globalStateCopy.schema.source_data.properties.NeuroScopeLFPInterface = NeuroScopeLFPInterfaceSchema.properties.NeuroScopeLFPInterface -globalStateCopy.schema.source_data.properties.NeuroScopeSortingInterface = NeuroScopeSortingInterfaceSchema.properties.NeuroScopeSortingInterface -globalStateCopy.schema.source_data.properties.BiocamRecordingInterface = BiocamRecordingInterfaceSchema.properties.BiocamRecordingInterface -globalStateCopy.schema.source_data.properties.IntanRecordingInterface = IntanRecordingInterfaceSchema.properties.IntanRecordingInterface -globalStateCopy.schema.source_data.properties.OpenEphysRecordingInterface = OpenEphysRecordingInterfaceSchema.properties.OpenEphysRecordingInterface -globalStateCopy.schema.source_data.properties.BlackrockRecordingInterface = BlackrockRecordingInterfaceSchema.properties.BlackrockRecordingInterface -globalStateCopy.schema.source_data.properties.BlackrockSortingInterface = BlackrockSortingInterfaceSchema.properties.BlackrockSortingInterface -globalStateCopy.schema.source_data.properties.CellExplorerSortingInterface = CellExplorerSortingInterfaceSchema.properties.CellExplorerSortingInterface -globalStateCopy.schema.source_data.properties.KiloSortSortingInterface = KiloSortSortingInterfaceSchema.properties.KiloSortSortingInterface -globalStateCopy.schema.source_data.properties.Spike2RecordingInterface = Spike2RecordingInterfaceSchema.properties.Spike2RecordingInterface -globalStateCopy.schema.source_data.properties.BrukerTiffSinglePlaneImagingInterface = BrukerTiffSinglePlaneImagingInterfaceSchema.properties.BrukerTiffSinglePlaneImagingInterface -globalStateCopy.schema.source_data.properties.CaimanSegmentationInterface = CaimanSegmentationInterfaceSchema.properties.CaimanSegmentationInterface - -const results = globalStateCopy.results -for (let sub in results){ - for (let ses in results[sub]) results[sub][ses].source_data = {SpikeGLXNIDQInterface: {file_path: '/dummy/file/path'}} +const activePage = "conversion/sourcedata"; + +const globalStateCopy = JSON.parse(JSON.stringify(globalState)); +globalStateCopy.schema.source_data.properties.SpikeGLXRecordingInterface = + SpikeGLXRecordingInterfaceSchema.properties.SpikeGLXRecordingInterface; +globalStateCopy.schema.source_data.properties.SpikeGLXNIDQInterface = + SpikeGLXNIDQInterfaceSchema.properties.SpikeGLXNIDQInterface; +globalStateCopy.schema.source_data.properties.PhySortingInterface = + PhySortingInterfaceSchema.properties.PhySortingInterface; +globalStateCopy.schema.source_data.properties.NeuroScopeRecordingInterface = + NeuroScopeRecordingInterfaceSchema.properties.NeuroScopeRecordingInterface; +globalStateCopy.schema.source_data.properties.NeuroScopeLFPInterface = + NeuroScopeLFPInterfaceSchema.properties.NeuroScopeLFPInterface; +globalStateCopy.schema.source_data.properties.NeuroScopeSortingInterface = + NeuroScopeSortingInterfaceSchema.properties.NeuroScopeSortingInterface; +globalStateCopy.schema.source_data.properties.BiocamRecordingInterface = + BiocamRecordingInterfaceSchema.properties.BiocamRecordingInterface; +globalStateCopy.schema.source_data.properties.IntanRecordingInterface = + IntanRecordingInterfaceSchema.properties.IntanRecordingInterface; +globalStateCopy.schema.source_data.properties.OpenEphysRecordingInterface = + OpenEphysRecordingInterfaceSchema.properties.OpenEphysRecordingInterface; +globalStateCopy.schema.source_data.properties.BlackrockRecordingInterface = + BlackrockRecordingInterfaceSchema.properties.BlackrockRecordingInterface; +globalStateCopy.schema.source_data.properties.BlackrockSortingInterface = + BlackrockSortingInterfaceSchema.properties.BlackrockSortingInterface; +globalStateCopy.schema.source_data.properties.CellExplorerSortingInterface = + CellExplorerSortingInterfaceSchema.properties.CellExplorerSortingInterface; +globalStateCopy.schema.source_data.properties.KiloSortSortingInterface = + KiloSortSortingInterfaceSchema.properties.KiloSortSortingInterface; +globalStateCopy.schema.source_data.properties.Spike2RecordingInterface = + Spike2RecordingInterfaceSchema.properties.Spike2RecordingInterface; +globalStateCopy.schema.source_data.properties.BrukerTiffSinglePlaneImagingInterface = + BrukerTiffSinglePlaneImagingInterfaceSchema.properties.BrukerTiffSinglePlaneImagingInterface; +globalStateCopy.schema.source_data.properties.CaimanSegmentationInterface = + CaimanSegmentationInterfaceSchema.properties.CaimanSegmentationInterface; + +const results = globalStateCopy.results; +for (let sub in results) { + for (let ses in results[sub]) + results[sub][ses].source_data = { SpikeGLXNIDQInterface: { file_path: "/dummy/file/path" } }; } - export const All = PageTemplate.bind({}); All.args = { activePage, globalState: globalStateCopy }; export const SpikeGLXRecordingInterface = PageTemplate.bind({}); -const SpikeGLXRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -SpikeGLXRecordingInterfaceGlobalCopy.interfaces.interface = SpikeGLXRecordingInterface -SpikeGLXRecordingInterfaceGlobalCopy.schema.source_data = SpikeGLXRecordingInterfaceSchema +const SpikeGLXRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +SpikeGLXRecordingInterfaceGlobalCopy.interfaces.interface = SpikeGLXRecordingInterface; +SpikeGLXRecordingInterfaceGlobalCopy.schema.source_data = SpikeGLXRecordingInterfaceSchema; SpikeGLXRecordingInterface.args = { activePage, globalState: SpikeGLXRecordingInterfaceGlobalCopy }; export const SpikeGLXNIDQInterface = PageTemplate.bind({}); -const SpikeGLXNIDQInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -SpikeGLXNIDQInterfaceGlobalCopy.interfaces.interface = SpikeGLXNIDQInterface -SpikeGLXNIDQInterfaceGlobalCopy.schema.source_data = SpikeGLXNIDQInterfaceSchema +const SpikeGLXNIDQInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +SpikeGLXNIDQInterfaceGlobalCopy.interfaces.interface = SpikeGLXNIDQInterface; +SpikeGLXNIDQInterfaceGlobalCopy.schema.source_data = SpikeGLXNIDQInterfaceSchema; SpikeGLXNIDQInterface.args = { activePage, globalState: SpikeGLXNIDQInterfaceGlobalCopy }; export const PhySortingInterface = PageTemplate.bind({}); -const PhySortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -PhySortingInterfaceGlobalCopy.interfaces.interface = PhySortingInterface -PhySortingInterfaceGlobalCopy.schema.source_data = PhySortingInterfaceSchema +const PhySortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +PhySortingInterfaceGlobalCopy.interfaces.interface = PhySortingInterface; +PhySortingInterfaceGlobalCopy.schema.source_data = PhySortingInterfaceSchema; PhySortingInterface.args = { activePage, globalState: PhySortingInterfaceGlobalCopy }; export const NeuroScopeRecordingInterface = PageTemplate.bind({}); -const NeuroScopeRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -NeuroScopeRecordingInterfaceGlobalCopy.interfaces.interface = NeuroScopeRecordingInterface -NeuroScopeRecordingInterfaceGlobalCopy.schema.source_data = NeuroScopeRecordingInterfaceSchema +const NeuroScopeRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +NeuroScopeRecordingInterfaceGlobalCopy.interfaces.interface = NeuroScopeRecordingInterface; +NeuroScopeRecordingInterfaceGlobalCopy.schema.source_data = NeuroScopeRecordingInterfaceSchema; NeuroScopeRecordingInterface.args = { activePage, globalState: NeuroScopeRecordingInterfaceGlobalCopy }; export const NeuroScopeLFPInterface = PageTemplate.bind({}); -const NeuroScopeLFPInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -NeuroScopeLFPInterfaceGlobalCopy.interfaces.interface = NeuroScopeLFPInterface -NeuroScopeLFPInterfaceGlobalCopy.schema.source_data = NeuroScopeLFPInterfaceSchema +const NeuroScopeLFPInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +NeuroScopeLFPInterfaceGlobalCopy.interfaces.interface = NeuroScopeLFPInterface; +NeuroScopeLFPInterfaceGlobalCopy.schema.source_data = NeuroScopeLFPInterfaceSchema; NeuroScopeLFPInterface.args = { activePage, globalState: NeuroScopeLFPInterfaceGlobalCopy }; export const NeuroScopeSortingInterface = PageTemplate.bind({}); -const NeuroScopeSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -NeuroScopeSortingInterfaceGlobalCopy.interfaces.interface = NeuroScopeSortingInterface -NeuroScopeSortingInterfaceGlobalCopy.schema.source_data = NeuroScopeSortingInterfaceSchema +const NeuroScopeSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +NeuroScopeSortingInterfaceGlobalCopy.interfaces.interface = NeuroScopeSortingInterface; +NeuroScopeSortingInterfaceGlobalCopy.schema.source_data = NeuroScopeSortingInterfaceSchema; NeuroScopeSortingInterface.args = { activePage, globalState: NeuroScopeSortingInterfaceGlobalCopy }; export const BiocamRecordingInterface = PageTemplate.bind({}); -const BiocamRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BiocamRecordingInterfaceGlobalCopy.interfaces.interface = BiocamRecordingInterface -BiocamRecordingInterfaceGlobalCopy.schema.source_data = BiocamRecordingInterfaceSchema +const BiocamRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BiocamRecordingInterfaceGlobalCopy.interfaces.interface = BiocamRecordingInterface; +BiocamRecordingInterfaceGlobalCopy.schema.source_data = BiocamRecordingInterfaceSchema; BiocamRecordingInterface.args = { activePage, globalState: BiocamRecordingInterfaceGlobalCopy }; export const IntanRecordingInterface = PageTemplate.bind({}); -const IntanRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -IntanRecordingInterfaceGlobalCopy.interfaces.interface = IntanRecordingInterface -IntanRecordingInterfaceGlobalCopy.schema.source_data = IntanRecordingInterfaceSchema +const IntanRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +IntanRecordingInterfaceGlobalCopy.interfaces.interface = IntanRecordingInterface; +IntanRecordingInterfaceGlobalCopy.schema.source_data = IntanRecordingInterfaceSchema; IntanRecordingInterface.args = { activePage, globalState: IntanRecordingInterfaceGlobalCopy }; export const OpenEphysRecordingInterface = PageTemplate.bind({}); -const OpenEphysRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -OpenEphysRecordingInterfaceGlobalCopy.interfaces.interface = OpenEphysRecordingInterface -OpenEphysRecordingInterfaceGlobalCopy.schema.source_data = OpenEphysRecordingInterfaceSchema +const OpenEphysRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +OpenEphysRecordingInterfaceGlobalCopy.interfaces.interface = OpenEphysRecordingInterface; +OpenEphysRecordingInterfaceGlobalCopy.schema.source_data = OpenEphysRecordingInterfaceSchema; OpenEphysRecordingInterface.args = { activePage, globalState: OpenEphysRecordingInterfaceGlobalCopy }; export const BlackrockRecordingInterface = PageTemplate.bind({}); -const BlackrockRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BlackrockRecordingInterfaceGlobalCopy.interfaces.interface = BlackrockRecordingInterface -BlackrockRecordingInterfaceGlobalCopy.schema.source_data = BlackrockRecordingInterfaceSchema +const BlackrockRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BlackrockRecordingInterfaceGlobalCopy.interfaces.interface = BlackrockRecordingInterface; +BlackrockRecordingInterfaceGlobalCopy.schema.source_data = BlackrockRecordingInterfaceSchema; BlackrockRecordingInterface.args = { activePage, globalState: BlackrockRecordingInterfaceGlobalCopy }; export const BlackrockSortingInterface = PageTemplate.bind({}); -const BlackrockSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BlackrockSortingInterfaceGlobalCopy.interfaces.interface = BlackrockSortingInterface -BlackrockSortingInterfaceGlobalCopy.schema.source_data = BlackrockSortingInterfaceSchema +const BlackrockSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BlackrockSortingInterfaceGlobalCopy.interfaces.interface = BlackrockSortingInterface; +BlackrockSortingInterfaceGlobalCopy.schema.source_data = BlackrockSortingInterfaceSchema; BlackrockSortingInterface.args = { activePage, globalState: BlackrockSortingInterfaceGlobalCopy }; export const CellExplorerSortingInterface = PageTemplate.bind({}); -const CellExplorerSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -CellExplorerSortingInterfaceGlobalCopy.interfaces.interface = CellExplorerSortingInterface -CellExplorerSortingInterfaceGlobalCopy.schema.source_data = CellExplorerSortingInterfaceSchema +const CellExplorerSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +CellExplorerSortingInterfaceGlobalCopy.interfaces.interface = CellExplorerSortingInterface; +CellExplorerSortingInterfaceGlobalCopy.schema.source_data = CellExplorerSortingInterfaceSchema; CellExplorerSortingInterface.args = { activePage, globalState: CellExplorerSortingInterfaceGlobalCopy }; export const KiloSortSortingInterface = PageTemplate.bind({}); -const KiloSortSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -KiloSortSortingInterfaceGlobalCopy.interfaces.interface = KiloSortSortingInterface -KiloSortSortingInterfaceGlobalCopy.schema.source_data = KiloSortSortingInterfaceSchema +const KiloSortSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +KiloSortSortingInterfaceGlobalCopy.interfaces.interface = KiloSortSortingInterface; +KiloSortSortingInterfaceGlobalCopy.schema.source_data = KiloSortSortingInterfaceSchema; KiloSortSortingInterface.args = { activePage, globalState: KiloSortSortingInterfaceGlobalCopy }; export const Spike2RecordingInterface = PageTemplate.bind({}); -const Spike2RecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -Spike2RecordingInterfaceGlobalCopy.interfaces.interface = Spike2RecordingInterface -Spike2RecordingInterfaceGlobalCopy.schema.source_data = Spike2RecordingInterfaceSchema +const Spike2RecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +Spike2RecordingInterfaceGlobalCopy.interfaces.interface = Spike2RecordingInterface; +Spike2RecordingInterfaceGlobalCopy.schema.source_data = Spike2RecordingInterfaceSchema; Spike2RecordingInterface.args = { activePage, globalState: Spike2RecordingInterfaceGlobalCopy }; export const BrukerTiffSinglePlaneImagingInterface = PageTemplate.bind({}); -const BrukerTiffSinglePlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffSinglePlaneImagingInterface -BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffSinglePlaneImagingInterfaceSchema -BrukerTiffSinglePlaneImagingInterface.args = { activePage, globalState: BrukerTiffSinglePlaneImagingInterfaceGlobalCopy }; +const BrukerTiffSinglePlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffSinglePlaneImagingInterface; +BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffSinglePlaneImagingInterfaceSchema; +BrukerTiffSinglePlaneImagingInterface.args = { + activePage, + globalState: BrukerTiffSinglePlaneImagingInterfaceGlobalCopy, +}; export const CaimanSegmentationInterface = PageTemplate.bind({}); -const CaimanSegmentationInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -CaimanSegmentationInterfaceGlobalCopy.interfaces.interface = CaimanSegmentationInterface -CaimanSegmentationInterfaceGlobalCopy.schema.source_data = CaimanSegmentationInterfaceSchema +const CaimanSegmentationInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +CaimanSegmentationInterfaceGlobalCopy.interfaces.interface = CaimanSegmentationInterface; +CaimanSegmentationInterfaceGlobalCopy.schema.source_data = CaimanSegmentationInterfaceSchema; CaimanSegmentationInterface.args = { activePage, globalState: CaimanSegmentationInterfaceGlobalCopy }; - From fd966bad76124f19bfb81fb116da6b10b5e0eb65 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 29 Sep 2023 10:49:32 -0700 Subject: [PATCH 3/9] Update autogenerated resources --- schemas/json/generated/BiocamRecordingInterface.json | 2 +- schemas/json/generated/BlackrockRecordingInterface.json | 2 +- schemas/json/generated/BlackrockSortingInterface.json | 2 +- .../json/generated/BrukerTiffMultiPlaneImagingInterface.json | 2 +- .../json/generated/BrukerTiffSinglePlaneImagingInterface.json | 2 +- schemas/json/generated/CaimanSegmentationInterface.json | 2 +- schemas/json/generated/CellExplorerSortingInterface.json | 2 +- schemas/json/generated/IntanRecordingInterface.json | 2 +- schemas/json/generated/KiloSortSortingInterface.json | 2 +- schemas/json/generated/MicroManagerTiffImagingInterface.json | 2 +- schemas/json/generated/MiniscopeImagingInterface.json | 2 +- schemas/json/generated/NeuroScopeLFPInterface.json | 2 +- schemas/json/generated/NeuroScopeRecordingInterface.json | 2 +- schemas/json/generated/NeuroScopeSortingInterface.json | 2 +- schemas/json/generated/OpenEphysRecordingInterface.json | 2 +- schemas/json/generated/PhySortingInterface.json | 2 +- schemas/json/generated/SbxImagingInterface.json | 2 +- schemas/json/generated/ScanImageImagingInterface.json | 2 +- schemas/json/generated/Spike2RecordingInterface.json | 2 +- schemas/json/generated/SpikeGLXNIDQInterface.json | 2 +- schemas/json/generated/SpikeGLXRecordingInterface.json | 2 +- schemas/json/generated/TiffImagingInterface.json | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/schemas/json/generated/BiocamRecordingInterface.json b/schemas/json/generated/BiocamRecordingInterface.json index 8d51c7b06..3265fe263 100644 --- a/schemas/json/generated/BiocamRecordingInterface.json +++ b/schemas/json/generated/BiocamRecordingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/BlackrockRecordingInterface.json b/schemas/json/generated/BlackrockRecordingInterface.json index 25190ebf2..32de2a224 100644 --- a/schemas/json/generated/BlackrockRecordingInterface.json +++ b/schemas/json/generated/BlackrockRecordingInterface.json @@ -35,4 +35,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/BlackrockSortingInterface.json b/schemas/json/generated/BlackrockSortingInterface.json index 02661e794..1b0b34068 100644 --- a/schemas/json/generated/BlackrockSortingInterface.json +++ b/schemas/json/generated/BlackrockSortingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json b/schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json index a4383d177..7ebe1b31e 100644 --- a/schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json +++ b/schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json b/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json index 844834ff9..50cea61c2 100644 --- a/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json +++ b/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/CaimanSegmentationInterface.json b/schemas/json/generated/CaimanSegmentationInterface.json index db580d9a5..84d9efb5e 100644 --- a/schemas/json/generated/CaimanSegmentationInterface.json +++ b/schemas/json/generated/CaimanSegmentationInterface.json @@ -26,4 +26,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/CellExplorerSortingInterface.json b/schemas/json/generated/CellExplorerSortingInterface.json index c51a65d4e..e2cc689b1 100644 --- a/schemas/json/generated/CellExplorerSortingInterface.json +++ b/schemas/json/generated/CellExplorerSortingInterface.json @@ -26,4 +26,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/IntanRecordingInterface.json b/schemas/json/generated/IntanRecordingInterface.json index 07904ada2..b75b39eda 100644 --- a/schemas/json/generated/IntanRecordingInterface.json +++ b/schemas/json/generated/IntanRecordingInterface.json @@ -34,4 +34,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/KiloSortSortingInterface.json b/schemas/json/generated/KiloSortSortingInterface.json index a31d22b75..5ef66d490 100644 --- a/schemas/json/generated/KiloSortSortingInterface.json +++ b/schemas/json/generated/KiloSortSortingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/MicroManagerTiffImagingInterface.json b/schemas/json/generated/MicroManagerTiffImagingInterface.json index fb0cd8876..218c8c281 100644 --- a/schemas/json/generated/MicroManagerTiffImagingInterface.json +++ b/schemas/json/generated/MicroManagerTiffImagingInterface.json @@ -27,4 +27,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/MiniscopeImagingInterface.json b/schemas/json/generated/MiniscopeImagingInterface.json index 33171beb5..d73ea0721 100644 --- a/schemas/json/generated/MiniscopeImagingInterface.json +++ b/schemas/json/generated/MiniscopeImagingInterface.json @@ -22,4 +22,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/NeuroScopeLFPInterface.json b/schemas/json/generated/NeuroScopeLFPInterface.json index d42a885ab..3c6224cf0 100644 --- a/schemas/json/generated/NeuroScopeLFPInterface.json +++ b/schemas/json/generated/NeuroScopeLFPInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/NeuroScopeRecordingInterface.json b/schemas/json/generated/NeuroScopeRecordingInterface.json index 3e95a33d0..2077b287a 100644 --- a/schemas/json/generated/NeuroScopeRecordingInterface.json +++ b/schemas/json/generated/NeuroScopeRecordingInterface.json @@ -37,4 +37,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/NeuroScopeSortingInterface.json b/schemas/json/generated/NeuroScopeSortingInterface.json index 680fcbce9..fe3d76fe6 100644 --- a/schemas/json/generated/NeuroScopeSortingInterface.json +++ b/schemas/json/generated/NeuroScopeSortingInterface.json @@ -37,4 +37,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/OpenEphysRecordingInterface.json b/schemas/json/generated/OpenEphysRecordingInterface.json index f6193ea0c..f3affa4d3 100644 --- a/schemas/json/generated/OpenEphysRecordingInterface.json +++ b/schemas/json/generated/OpenEphysRecordingInterface.json @@ -33,4 +33,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/PhySortingInterface.json b/schemas/json/generated/PhySortingInterface.json index edcc2183d..182494ca2 100644 --- a/schemas/json/generated/PhySortingInterface.json +++ b/schemas/json/generated/PhySortingInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/SbxImagingInterface.json b/schemas/json/generated/SbxImagingInterface.json index d02d2c0e7..8b97044b0 100644 --- a/schemas/json/generated/SbxImagingInterface.json +++ b/schemas/json/generated/SbxImagingInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/ScanImageImagingInterface.json b/schemas/json/generated/ScanImageImagingInterface.json index 71b3cb59a..26925e9f5 100644 --- a/schemas/json/generated/ScanImageImagingInterface.json +++ b/schemas/json/generated/ScanImageImagingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/Spike2RecordingInterface.json b/schemas/json/generated/Spike2RecordingInterface.json index 81c785ad8..3b143bf75 100644 --- a/schemas/json/generated/Spike2RecordingInterface.json +++ b/schemas/json/generated/Spike2RecordingInterface.json @@ -31,4 +31,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/SpikeGLXNIDQInterface.json b/schemas/json/generated/SpikeGLXNIDQInterface.json index 14ad82eb8..8a38f1387 100644 --- a/schemas/json/generated/SpikeGLXNIDQInterface.json +++ b/schemas/json/generated/SpikeGLXNIDQInterface.json @@ -35,4 +35,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/SpikeGLXRecordingInterface.json b/schemas/json/generated/SpikeGLXRecordingInterface.json index 4b2034df8..603158605 100644 --- a/schemas/json/generated/SpikeGLXRecordingInterface.json +++ b/schemas/json/generated/SpikeGLXRecordingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file diff --git a/schemas/json/generated/TiffImagingInterface.json b/schemas/json/generated/TiffImagingInterface.json index 036de528a..0cce7efa6 100644 --- a/schemas/json/generated/TiffImagingInterface.json +++ b/schemas/json/generated/TiffImagingInterface.json @@ -31,4 +31,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} +} \ No newline at end of file From 14e3754eaa85571e1107996576717c5ed1e30f6e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 17:51:05 +0000 Subject: [PATCH 4/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../generated/BiocamRecordingInterface.json | 2 +- .../BlackrockRecordingInterface.json | 2 +- .../generated/BlackrockSortingInterface.json | 2 +- .../BrukerTiffMultiPlaneImagingInterface.json | 2 +- ...BrukerTiffSinglePlaneImagingInterface.json | 2 +- .../CaimanSegmentationInterface.json | 2 +- .../CellExplorerSortingInterface.json | 2 +- .../generated/IntanRecordingInterface.json | 2 +- .../generated/KiloSortSortingInterface.json | 2 +- .../MicroManagerTiffImagingInterface.json | 2 +- .../generated/MiniscopeImagingInterface.json | 2 +- .../generated/NeuroScopeLFPInterface.json | 2 +- .../NeuroScopeRecordingInterface.json | 2 +- .../generated/NeuroScopeSortingInterface.json | 2 +- .../OpenEphysRecordingInterface.json | 2 +- .../json/generated/PhySortingInterface.json | 2 +- .../json/generated/SbxImagingInterface.json | 2 +- .../generated/ScanImageImagingInterface.json | 2 +- .../generated/Spike2RecordingInterface.json | 2 +- .../json/generated/SpikeGLXNIDQInterface.json | 2 +- .../generated/SpikeGLXRecordingInterface.json | 2 +- .../json/generated/TiffImagingInterface.json | 2 +- .../pages/guided-mode/SourceData.stories.js | 267 ++++++++++-------- 23 files changed, 167 insertions(+), 144 deletions(-) diff --git a/schemas/json/generated/BiocamRecordingInterface.json b/schemas/json/generated/BiocamRecordingInterface.json index 3265fe263..8d51c7b06 100644 --- a/schemas/json/generated/BiocamRecordingInterface.json +++ b/schemas/json/generated/BiocamRecordingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/BlackrockRecordingInterface.json b/schemas/json/generated/BlackrockRecordingInterface.json index 32de2a224..25190ebf2 100644 --- a/schemas/json/generated/BlackrockRecordingInterface.json +++ b/schemas/json/generated/BlackrockRecordingInterface.json @@ -35,4 +35,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/BlackrockSortingInterface.json b/schemas/json/generated/BlackrockSortingInterface.json index 1b0b34068..02661e794 100644 --- a/schemas/json/generated/BlackrockSortingInterface.json +++ b/schemas/json/generated/BlackrockSortingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json b/schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json index 7ebe1b31e..a4383d177 100644 --- a/schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json +++ b/schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json b/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json index 50cea61c2..844834ff9 100644 --- a/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json +++ b/schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/CaimanSegmentationInterface.json b/schemas/json/generated/CaimanSegmentationInterface.json index 84d9efb5e..db580d9a5 100644 --- a/schemas/json/generated/CaimanSegmentationInterface.json +++ b/schemas/json/generated/CaimanSegmentationInterface.json @@ -26,4 +26,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/CellExplorerSortingInterface.json b/schemas/json/generated/CellExplorerSortingInterface.json index e2cc689b1..c51a65d4e 100644 --- a/schemas/json/generated/CellExplorerSortingInterface.json +++ b/schemas/json/generated/CellExplorerSortingInterface.json @@ -26,4 +26,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/IntanRecordingInterface.json b/schemas/json/generated/IntanRecordingInterface.json index b75b39eda..07904ada2 100644 --- a/schemas/json/generated/IntanRecordingInterface.json +++ b/schemas/json/generated/IntanRecordingInterface.json @@ -34,4 +34,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/KiloSortSortingInterface.json b/schemas/json/generated/KiloSortSortingInterface.json index 5ef66d490..a31d22b75 100644 --- a/schemas/json/generated/KiloSortSortingInterface.json +++ b/schemas/json/generated/KiloSortSortingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/MicroManagerTiffImagingInterface.json b/schemas/json/generated/MicroManagerTiffImagingInterface.json index 218c8c281..fb0cd8876 100644 --- a/schemas/json/generated/MicroManagerTiffImagingInterface.json +++ b/schemas/json/generated/MicroManagerTiffImagingInterface.json @@ -27,4 +27,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/MiniscopeImagingInterface.json b/schemas/json/generated/MiniscopeImagingInterface.json index d73ea0721..33171beb5 100644 --- a/schemas/json/generated/MiniscopeImagingInterface.json +++ b/schemas/json/generated/MiniscopeImagingInterface.json @@ -22,4 +22,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/NeuroScopeLFPInterface.json b/schemas/json/generated/NeuroScopeLFPInterface.json index 3c6224cf0..d42a885ab 100644 --- a/schemas/json/generated/NeuroScopeLFPInterface.json +++ b/schemas/json/generated/NeuroScopeLFPInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/NeuroScopeRecordingInterface.json b/schemas/json/generated/NeuroScopeRecordingInterface.json index 2077b287a..3e95a33d0 100644 --- a/schemas/json/generated/NeuroScopeRecordingInterface.json +++ b/schemas/json/generated/NeuroScopeRecordingInterface.json @@ -37,4 +37,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/NeuroScopeSortingInterface.json b/schemas/json/generated/NeuroScopeSortingInterface.json index fe3d76fe6..680fcbce9 100644 --- a/schemas/json/generated/NeuroScopeSortingInterface.json +++ b/schemas/json/generated/NeuroScopeSortingInterface.json @@ -37,4 +37,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/OpenEphysRecordingInterface.json b/schemas/json/generated/OpenEphysRecordingInterface.json index f3affa4d3..f6193ea0c 100644 --- a/schemas/json/generated/OpenEphysRecordingInterface.json +++ b/schemas/json/generated/OpenEphysRecordingInterface.json @@ -33,4 +33,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/PhySortingInterface.json b/schemas/json/generated/PhySortingInterface.json index 182494ca2..edcc2183d 100644 --- a/schemas/json/generated/PhySortingInterface.json +++ b/schemas/json/generated/PhySortingInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/SbxImagingInterface.json b/schemas/json/generated/SbxImagingInterface.json index 8b97044b0..d02d2c0e7 100644 --- a/schemas/json/generated/SbxImagingInterface.json +++ b/schemas/json/generated/SbxImagingInterface.json @@ -29,4 +29,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/ScanImageImagingInterface.json b/schemas/json/generated/ScanImageImagingInterface.json index 26925e9f5..71b3cb59a 100644 --- a/schemas/json/generated/ScanImageImagingInterface.json +++ b/schemas/json/generated/ScanImageImagingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/Spike2RecordingInterface.json b/schemas/json/generated/Spike2RecordingInterface.json index 3b143bf75..81c785ad8 100644 --- a/schemas/json/generated/Spike2RecordingInterface.json +++ b/schemas/json/generated/Spike2RecordingInterface.json @@ -31,4 +31,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/SpikeGLXNIDQInterface.json b/schemas/json/generated/SpikeGLXNIDQInterface.json index 8a38f1387..14ad82eb8 100644 --- a/schemas/json/generated/SpikeGLXNIDQInterface.json +++ b/schemas/json/generated/SpikeGLXNIDQInterface.json @@ -35,4 +35,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/SpikeGLXRecordingInterface.json b/schemas/json/generated/SpikeGLXRecordingInterface.json index 603158605..4b2034df8 100644 --- a/schemas/json/generated/SpikeGLXRecordingInterface.json +++ b/schemas/json/generated/SpikeGLXRecordingInterface.json @@ -30,4 +30,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/schemas/json/generated/TiffImagingInterface.json b/schemas/json/generated/TiffImagingInterface.json index 0cce7efa6..036de528a 100644 --- a/schemas/json/generated/TiffImagingInterface.json +++ b/schemas/json/generated/TiffImagingInterface.json @@ -31,4 +31,4 @@ "title": "Source data schema", "description": "Schema for the source data, files and directories", "version": "0.1.0" -} \ No newline at end of file +} diff --git a/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js b/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js index da53d68af..28f8869a2 100644 --- a/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js +++ b/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js @@ -1,199 +1,222 @@ import { globalState, PageTemplate } from "./storyStates"; -import SpikeGLXRecordingInterfaceSchema from '../../../../../../schemas/json/generated/SpikeGLXRecordingInterface.json' -import SpikeGLXNIDQInterfaceSchema from '../../../../../../schemas/json/generated/SpikeGLXNIDQInterface.json' -import PhySortingInterfaceSchema from '../../../../../../schemas/json/generated/PhySortingInterface.json' -import NeuroScopeRecordingInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeRecordingInterface.json' -import NeuroScopeLFPInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeLFPInterface.json' -import NeuroScopeSortingInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeSortingInterface.json' -import BiocamRecordingInterfaceSchema from '../../../../../../schemas/json/generated/BiocamRecordingInterface.json' -import IntanRecordingInterfaceSchema from '../../../../../../schemas/json/generated/IntanRecordingInterface.json' -import OpenEphysRecordingInterfaceSchema from '../../../../../../schemas/json/generated/OpenEphysRecordingInterface.json' -import BlackrockRecordingInterfaceSchema from '../../../../../../schemas/json/generated/BlackrockRecordingInterface.json' -import BlackrockSortingInterfaceSchema from '../../../../../../schemas/json/generated/BlackrockSortingInterface.json' -import CellExplorerSortingInterfaceSchema from '../../../../../../schemas/json/generated/CellExplorerSortingInterface.json' -import KiloSortSortingInterfaceSchema from '../../../../../../schemas/json/generated/KiloSortSortingInterface.json' -import Spike2RecordingInterfaceSchema from '../../../../../../schemas/json/generated/Spike2RecordingInterface.json' -import BrukerTiffSinglePlaneImagingInterfaceSchema from '../../../../../../schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json' -import BrukerTiffMultiPlaneImagingInterfaceSchema from '../../../../../../schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json' -import MicroManagerTiffImagingInterfaceSchema from '../../../../../../schemas/json/generated/MicroManagerTiffImagingInterface.json' -import ScanImageImagingInterfaceSchema from '../../../../../../schemas/json/generated/ScanImageImagingInterface.json' -import TiffImagingInterfaceSchema from '../../../../../../schemas/json/generated/TiffImagingInterface.json' -import MiniscopeImagingInterfaceSchema from '../../../../../../schemas/json/generated/MiniscopeImagingInterface.json' -import SbxImagingInterfaceSchema from '../../../../../../schemas/json/generated/SbxImagingInterface.json' -import CaimanSegmentationInterfaceSchema from '../../../../../../schemas/json/generated/CaimanSegmentationInterface.json' +import SpikeGLXRecordingInterfaceSchema from "../../../../../../schemas/json/generated/SpikeGLXRecordingInterface.json"; +import SpikeGLXNIDQInterfaceSchema from "../../../../../../schemas/json/generated/SpikeGLXNIDQInterface.json"; +import PhySortingInterfaceSchema from "../../../../../../schemas/json/generated/PhySortingInterface.json"; +import NeuroScopeRecordingInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeRecordingInterface.json"; +import NeuroScopeLFPInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeLFPInterface.json"; +import NeuroScopeSortingInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeSortingInterface.json"; +import BiocamRecordingInterfaceSchema from "../../../../../../schemas/json/generated/BiocamRecordingInterface.json"; +import IntanRecordingInterfaceSchema from "../../../../../../schemas/json/generated/IntanRecordingInterface.json"; +import OpenEphysRecordingInterfaceSchema from "../../../../../../schemas/json/generated/OpenEphysRecordingInterface.json"; +import BlackrockRecordingInterfaceSchema from "../../../../../../schemas/json/generated/BlackrockRecordingInterface.json"; +import BlackrockSortingInterfaceSchema from "../../../../../../schemas/json/generated/BlackrockSortingInterface.json"; +import CellExplorerSortingInterfaceSchema from "../../../../../../schemas/json/generated/CellExplorerSortingInterface.json"; +import KiloSortSortingInterfaceSchema from "../../../../../../schemas/json/generated/KiloSortSortingInterface.json"; +import Spike2RecordingInterfaceSchema from "../../../../../../schemas/json/generated/Spike2RecordingInterface.json"; +import BrukerTiffSinglePlaneImagingInterfaceSchema from "../../../../../../schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json"; +import BrukerTiffMultiPlaneImagingInterfaceSchema from "../../../../../../schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json"; +import MicroManagerTiffImagingInterfaceSchema from "../../../../../../schemas/json/generated/MicroManagerTiffImagingInterface.json"; +import ScanImageImagingInterfaceSchema from "../../../../../../schemas/json/generated/ScanImageImagingInterface.json"; +import TiffImagingInterfaceSchema from "../../../../../../schemas/json/generated/TiffImagingInterface.json"; +import MiniscopeImagingInterfaceSchema from "../../../../../../schemas/json/generated/MiniscopeImagingInterface.json"; +import SbxImagingInterfaceSchema from "../../../../../../schemas/json/generated/SbxImagingInterface.json"; +import CaimanSegmentationInterfaceSchema from "../../../../../../schemas/json/generated/CaimanSegmentationInterface.json"; export default { title: "Pages/Guided Mode/Source Data", parameters: { chromatic: { disableSnapshot: false }, - } + }, }; -const activePage = "conversion/sourcedata" - - -const globalStateCopy = JSON.parse(JSON.stringify(globalState)) -globalStateCopy.schema.source_data.properties.SpikeGLXRecordingInterface = SpikeGLXRecordingInterfaceSchema.properties.SpikeGLXRecordingInterface -globalStateCopy.schema.source_data.properties.SpikeGLXNIDQInterface = SpikeGLXNIDQInterfaceSchema.properties.SpikeGLXNIDQInterface -globalStateCopy.schema.source_data.properties.PhySortingInterface = PhySortingInterfaceSchema.properties.PhySortingInterface -globalStateCopy.schema.source_data.properties.NeuroScopeRecordingInterface = NeuroScopeRecordingInterfaceSchema.properties.NeuroScopeRecordingInterface -globalStateCopy.schema.source_data.properties.NeuroScopeLFPInterface = NeuroScopeLFPInterfaceSchema.properties.NeuroScopeLFPInterface -globalStateCopy.schema.source_data.properties.NeuroScopeSortingInterface = NeuroScopeSortingInterfaceSchema.properties.NeuroScopeSortingInterface -globalStateCopy.schema.source_data.properties.BiocamRecordingInterface = BiocamRecordingInterfaceSchema.properties.BiocamRecordingInterface -globalStateCopy.schema.source_data.properties.IntanRecordingInterface = IntanRecordingInterfaceSchema.properties.IntanRecordingInterface -globalStateCopy.schema.source_data.properties.OpenEphysRecordingInterface = OpenEphysRecordingInterfaceSchema.properties.OpenEphysRecordingInterface -globalStateCopy.schema.source_data.properties.BlackrockRecordingInterface = BlackrockRecordingInterfaceSchema.properties.BlackrockRecordingInterface -globalStateCopy.schema.source_data.properties.BlackrockSortingInterface = BlackrockSortingInterfaceSchema.properties.BlackrockSortingInterface -globalStateCopy.schema.source_data.properties.CellExplorerSortingInterface = CellExplorerSortingInterfaceSchema.properties.CellExplorerSortingInterface -globalStateCopy.schema.source_data.properties.KiloSortSortingInterface = KiloSortSortingInterfaceSchema.properties.KiloSortSortingInterface -globalStateCopy.schema.source_data.properties.Spike2RecordingInterface = Spike2RecordingInterfaceSchema.properties.Spike2RecordingInterface -globalStateCopy.schema.source_data.properties.BrukerTiffSinglePlaneImagingInterface = BrukerTiffSinglePlaneImagingInterfaceSchema.properties.BrukerTiffSinglePlaneImagingInterface -globalStateCopy.schema.source_data.properties.BrukerTiffMultiPlaneImagingInterface = BrukerTiffMultiPlaneImagingInterfaceSchema.properties.BrukerTiffMultiPlaneImagingInterface -globalStateCopy.schema.source_data.properties.MicroManagerTiffImagingInterface = MicroManagerTiffImagingInterfaceSchema.properties.MicroManagerTiffImagingInterface -globalStateCopy.schema.source_data.properties.ScanImageImagingInterface = ScanImageImagingInterfaceSchema.properties.ScanImageImagingInterface -globalStateCopy.schema.source_data.properties.TiffImagingInterface = TiffImagingInterfaceSchema.properties.TiffImagingInterface -globalStateCopy.schema.source_data.properties.MiniscopeImagingInterface = MiniscopeImagingInterfaceSchema.properties.MiniscopeImagingInterface -globalStateCopy.schema.source_data.properties.SbxImagingInterface = SbxImagingInterfaceSchema.properties.SbxImagingInterface -globalStateCopy.schema.source_data.properties.CaimanSegmentationInterface = CaimanSegmentationInterfaceSchema.properties.CaimanSegmentationInterface - -const results = globalStateCopy.results -for (let sub in results){ - for (let ses in results[sub]) results[sub][ses].source_data = {SpikeGLXNIDQInterface: {file_path: '/dummy/file/path'}} +const activePage = "conversion/sourcedata"; + +const globalStateCopy = JSON.parse(JSON.stringify(globalState)); +globalStateCopy.schema.source_data.properties.SpikeGLXRecordingInterface = + SpikeGLXRecordingInterfaceSchema.properties.SpikeGLXRecordingInterface; +globalStateCopy.schema.source_data.properties.SpikeGLXNIDQInterface = + SpikeGLXNIDQInterfaceSchema.properties.SpikeGLXNIDQInterface; +globalStateCopy.schema.source_data.properties.PhySortingInterface = + PhySortingInterfaceSchema.properties.PhySortingInterface; +globalStateCopy.schema.source_data.properties.NeuroScopeRecordingInterface = + NeuroScopeRecordingInterfaceSchema.properties.NeuroScopeRecordingInterface; +globalStateCopy.schema.source_data.properties.NeuroScopeLFPInterface = + NeuroScopeLFPInterfaceSchema.properties.NeuroScopeLFPInterface; +globalStateCopy.schema.source_data.properties.NeuroScopeSortingInterface = + NeuroScopeSortingInterfaceSchema.properties.NeuroScopeSortingInterface; +globalStateCopy.schema.source_data.properties.BiocamRecordingInterface = + BiocamRecordingInterfaceSchema.properties.BiocamRecordingInterface; +globalStateCopy.schema.source_data.properties.IntanRecordingInterface = + IntanRecordingInterfaceSchema.properties.IntanRecordingInterface; +globalStateCopy.schema.source_data.properties.OpenEphysRecordingInterface = + OpenEphysRecordingInterfaceSchema.properties.OpenEphysRecordingInterface; +globalStateCopy.schema.source_data.properties.BlackrockRecordingInterface = + BlackrockRecordingInterfaceSchema.properties.BlackrockRecordingInterface; +globalStateCopy.schema.source_data.properties.BlackrockSortingInterface = + BlackrockSortingInterfaceSchema.properties.BlackrockSortingInterface; +globalStateCopy.schema.source_data.properties.CellExplorerSortingInterface = + CellExplorerSortingInterfaceSchema.properties.CellExplorerSortingInterface; +globalStateCopy.schema.source_data.properties.KiloSortSortingInterface = + KiloSortSortingInterfaceSchema.properties.KiloSortSortingInterface; +globalStateCopy.schema.source_data.properties.Spike2RecordingInterface = + Spike2RecordingInterfaceSchema.properties.Spike2RecordingInterface; +globalStateCopy.schema.source_data.properties.BrukerTiffSinglePlaneImagingInterface = + BrukerTiffSinglePlaneImagingInterfaceSchema.properties.BrukerTiffSinglePlaneImagingInterface; +globalStateCopy.schema.source_data.properties.BrukerTiffMultiPlaneImagingInterface = + BrukerTiffMultiPlaneImagingInterfaceSchema.properties.BrukerTiffMultiPlaneImagingInterface; +globalStateCopy.schema.source_data.properties.MicroManagerTiffImagingInterface = + MicroManagerTiffImagingInterfaceSchema.properties.MicroManagerTiffImagingInterface; +globalStateCopy.schema.source_data.properties.ScanImageImagingInterface = + ScanImageImagingInterfaceSchema.properties.ScanImageImagingInterface; +globalStateCopy.schema.source_data.properties.TiffImagingInterface = + TiffImagingInterfaceSchema.properties.TiffImagingInterface; +globalStateCopy.schema.source_data.properties.MiniscopeImagingInterface = + MiniscopeImagingInterfaceSchema.properties.MiniscopeImagingInterface; +globalStateCopy.schema.source_data.properties.SbxImagingInterface = + SbxImagingInterfaceSchema.properties.SbxImagingInterface; +globalStateCopy.schema.source_data.properties.CaimanSegmentationInterface = + CaimanSegmentationInterfaceSchema.properties.CaimanSegmentationInterface; + +const results = globalStateCopy.results; +for (let sub in results) { + for (let ses in results[sub]) + results[sub][ses].source_data = { SpikeGLXNIDQInterface: { file_path: "/dummy/file/path" } }; } - export const All = PageTemplate.bind({}); All.args = { activePage, globalState: globalStateCopy }; export const SpikeGLXRecordingInterface = PageTemplate.bind({}); -const SpikeGLXRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -SpikeGLXRecordingInterfaceGlobalCopy.interfaces.interface = SpikeGLXRecordingInterface -SpikeGLXRecordingInterfaceGlobalCopy.schema.source_data = SpikeGLXRecordingInterfaceSchema +const SpikeGLXRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +SpikeGLXRecordingInterfaceGlobalCopy.interfaces.interface = SpikeGLXRecordingInterface; +SpikeGLXRecordingInterfaceGlobalCopy.schema.source_data = SpikeGLXRecordingInterfaceSchema; SpikeGLXRecordingInterface.args = { activePage, globalState: SpikeGLXRecordingInterfaceGlobalCopy }; export const SpikeGLXNIDQInterface = PageTemplate.bind({}); -const SpikeGLXNIDQInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -SpikeGLXNIDQInterfaceGlobalCopy.interfaces.interface = SpikeGLXNIDQInterface -SpikeGLXNIDQInterfaceGlobalCopy.schema.source_data = SpikeGLXNIDQInterfaceSchema +const SpikeGLXNIDQInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +SpikeGLXNIDQInterfaceGlobalCopy.interfaces.interface = SpikeGLXNIDQInterface; +SpikeGLXNIDQInterfaceGlobalCopy.schema.source_data = SpikeGLXNIDQInterfaceSchema; SpikeGLXNIDQInterface.args = { activePage, globalState: SpikeGLXNIDQInterfaceGlobalCopy }; export const PhySortingInterface = PageTemplate.bind({}); -const PhySortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -PhySortingInterfaceGlobalCopy.interfaces.interface = PhySortingInterface -PhySortingInterfaceGlobalCopy.schema.source_data = PhySortingInterfaceSchema +const PhySortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +PhySortingInterfaceGlobalCopy.interfaces.interface = PhySortingInterface; +PhySortingInterfaceGlobalCopy.schema.source_data = PhySortingInterfaceSchema; PhySortingInterface.args = { activePage, globalState: PhySortingInterfaceGlobalCopy }; export const NeuroScopeRecordingInterface = PageTemplate.bind({}); -const NeuroScopeRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -NeuroScopeRecordingInterfaceGlobalCopy.interfaces.interface = NeuroScopeRecordingInterface -NeuroScopeRecordingInterfaceGlobalCopy.schema.source_data = NeuroScopeRecordingInterfaceSchema +const NeuroScopeRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +NeuroScopeRecordingInterfaceGlobalCopy.interfaces.interface = NeuroScopeRecordingInterface; +NeuroScopeRecordingInterfaceGlobalCopy.schema.source_data = NeuroScopeRecordingInterfaceSchema; NeuroScopeRecordingInterface.args = { activePage, globalState: NeuroScopeRecordingInterfaceGlobalCopy }; export const NeuroScopeLFPInterface = PageTemplate.bind({}); -const NeuroScopeLFPInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -NeuroScopeLFPInterfaceGlobalCopy.interfaces.interface = NeuroScopeLFPInterface -NeuroScopeLFPInterfaceGlobalCopy.schema.source_data = NeuroScopeLFPInterfaceSchema +const NeuroScopeLFPInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +NeuroScopeLFPInterfaceGlobalCopy.interfaces.interface = NeuroScopeLFPInterface; +NeuroScopeLFPInterfaceGlobalCopy.schema.source_data = NeuroScopeLFPInterfaceSchema; NeuroScopeLFPInterface.args = { activePage, globalState: NeuroScopeLFPInterfaceGlobalCopy }; export const NeuroScopeSortingInterface = PageTemplate.bind({}); -const NeuroScopeSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -NeuroScopeSortingInterfaceGlobalCopy.interfaces.interface = NeuroScopeSortingInterface -NeuroScopeSortingInterfaceGlobalCopy.schema.source_data = NeuroScopeSortingInterfaceSchema +const NeuroScopeSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +NeuroScopeSortingInterfaceGlobalCopy.interfaces.interface = NeuroScopeSortingInterface; +NeuroScopeSortingInterfaceGlobalCopy.schema.source_data = NeuroScopeSortingInterfaceSchema; NeuroScopeSortingInterface.args = { activePage, globalState: NeuroScopeSortingInterfaceGlobalCopy }; export const BiocamRecordingInterface = PageTemplate.bind({}); -const BiocamRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BiocamRecordingInterfaceGlobalCopy.interfaces.interface = BiocamRecordingInterface -BiocamRecordingInterfaceGlobalCopy.schema.source_data = BiocamRecordingInterfaceSchema +const BiocamRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BiocamRecordingInterfaceGlobalCopy.interfaces.interface = BiocamRecordingInterface; +BiocamRecordingInterfaceGlobalCopy.schema.source_data = BiocamRecordingInterfaceSchema; BiocamRecordingInterface.args = { activePage, globalState: BiocamRecordingInterfaceGlobalCopy }; export const IntanRecordingInterface = PageTemplate.bind({}); -const IntanRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -IntanRecordingInterfaceGlobalCopy.interfaces.interface = IntanRecordingInterface -IntanRecordingInterfaceGlobalCopy.schema.source_data = IntanRecordingInterfaceSchema +const IntanRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +IntanRecordingInterfaceGlobalCopy.interfaces.interface = IntanRecordingInterface; +IntanRecordingInterfaceGlobalCopy.schema.source_data = IntanRecordingInterfaceSchema; IntanRecordingInterface.args = { activePage, globalState: IntanRecordingInterfaceGlobalCopy }; export const OpenEphysRecordingInterface = PageTemplate.bind({}); -const OpenEphysRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -OpenEphysRecordingInterfaceGlobalCopy.interfaces.interface = OpenEphysRecordingInterface -OpenEphysRecordingInterfaceGlobalCopy.schema.source_data = OpenEphysRecordingInterfaceSchema +const OpenEphysRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +OpenEphysRecordingInterfaceGlobalCopy.interfaces.interface = OpenEphysRecordingInterface; +OpenEphysRecordingInterfaceGlobalCopy.schema.source_data = OpenEphysRecordingInterfaceSchema; OpenEphysRecordingInterface.args = { activePage, globalState: OpenEphysRecordingInterfaceGlobalCopy }; export const BlackrockRecordingInterface = PageTemplate.bind({}); -const BlackrockRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BlackrockRecordingInterfaceGlobalCopy.interfaces.interface = BlackrockRecordingInterface -BlackrockRecordingInterfaceGlobalCopy.schema.source_data = BlackrockRecordingInterfaceSchema +const BlackrockRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BlackrockRecordingInterfaceGlobalCopy.interfaces.interface = BlackrockRecordingInterface; +BlackrockRecordingInterfaceGlobalCopy.schema.source_data = BlackrockRecordingInterfaceSchema; BlackrockRecordingInterface.args = { activePage, globalState: BlackrockRecordingInterfaceGlobalCopy }; export const BlackrockSortingInterface = PageTemplate.bind({}); -const BlackrockSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BlackrockSortingInterfaceGlobalCopy.interfaces.interface = BlackrockSortingInterface -BlackrockSortingInterfaceGlobalCopy.schema.source_data = BlackrockSortingInterfaceSchema +const BlackrockSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BlackrockSortingInterfaceGlobalCopy.interfaces.interface = BlackrockSortingInterface; +BlackrockSortingInterfaceGlobalCopy.schema.source_data = BlackrockSortingInterfaceSchema; BlackrockSortingInterface.args = { activePage, globalState: BlackrockSortingInterfaceGlobalCopy }; export const CellExplorerSortingInterface = PageTemplate.bind({}); -const CellExplorerSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -CellExplorerSortingInterfaceGlobalCopy.interfaces.interface = CellExplorerSortingInterface -CellExplorerSortingInterfaceGlobalCopy.schema.source_data = CellExplorerSortingInterfaceSchema +const CellExplorerSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +CellExplorerSortingInterfaceGlobalCopy.interfaces.interface = CellExplorerSortingInterface; +CellExplorerSortingInterfaceGlobalCopy.schema.source_data = CellExplorerSortingInterfaceSchema; CellExplorerSortingInterface.args = { activePage, globalState: CellExplorerSortingInterfaceGlobalCopy }; export const KiloSortSortingInterface = PageTemplate.bind({}); -const KiloSortSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -KiloSortSortingInterfaceGlobalCopy.interfaces.interface = KiloSortSortingInterface -KiloSortSortingInterfaceGlobalCopy.schema.source_data = KiloSortSortingInterfaceSchema +const KiloSortSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +KiloSortSortingInterfaceGlobalCopy.interfaces.interface = KiloSortSortingInterface; +KiloSortSortingInterfaceGlobalCopy.schema.source_data = KiloSortSortingInterfaceSchema; KiloSortSortingInterface.args = { activePage, globalState: KiloSortSortingInterfaceGlobalCopy }; export const Spike2RecordingInterface = PageTemplate.bind({}); -const Spike2RecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -Spike2RecordingInterfaceGlobalCopy.interfaces.interface = Spike2RecordingInterface -Spike2RecordingInterfaceGlobalCopy.schema.source_data = Spike2RecordingInterfaceSchema +const Spike2RecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +Spike2RecordingInterfaceGlobalCopy.interfaces.interface = Spike2RecordingInterface; +Spike2RecordingInterfaceGlobalCopy.schema.source_data = Spike2RecordingInterfaceSchema; Spike2RecordingInterface.args = { activePage, globalState: Spike2RecordingInterfaceGlobalCopy }; export const BrukerTiffSinglePlaneImagingInterface = PageTemplate.bind({}); -const BrukerTiffSinglePlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffSinglePlaneImagingInterface -BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffSinglePlaneImagingInterfaceSchema -BrukerTiffSinglePlaneImagingInterface.args = { activePage, globalState: BrukerTiffSinglePlaneImagingInterfaceGlobalCopy }; +const BrukerTiffSinglePlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffSinglePlaneImagingInterface; +BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffSinglePlaneImagingInterfaceSchema; +BrukerTiffSinglePlaneImagingInterface.args = { + activePage, + globalState: BrukerTiffSinglePlaneImagingInterfaceGlobalCopy, +}; export const BrukerTiffMultiPlaneImagingInterface = PageTemplate.bind({}); -const BrukerTiffMultiPlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BrukerTiffMultiPlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffMultiPlaneImagingInterface -BrukerTiffMultiPlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffMultiPlaneImagingInterfaceSchema +const BrukerTiffMultiPlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BrukerTiffMultiPlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffMultiPlaneImagingInterface; +BrukerTiffMultiPlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffMultiPlaneImagingInterfaceSchema; BrukerTiffMultiPlaneImagingInterface.args = { activePage, globalState: BrukerTiffMultiPlaneImagingInterfaceGlobalCopy }; export const MicroManagerTiffImagingInterface = PageTemplate.bind({}); -const MicroManagerTiffImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -MicroManagerTiffImagingInterfaceGlobalCopy.interfaces.interface = MicroManagerTiffImagingInterface -MicroManagerTiffImagingInterfaceGlobalCopy.schema.source_data = MicroManagerTiffImagingInterfaceSchema +const MicroManagerTiffImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +MicroManagerTiffImagingInterfaceGlobalCopy.interfaces.interface = MicroManagerTiffImagingInterface; +MicroManagerTiffImagingInterfaceGlobalCopy.schema.source_data = MicroManagerTiffImagingInterfaceSchema; MicroManagerTiffImagingInterface.args = { activePage, globalState: MicroManagerTiffImagingInterfaceGlobalCopy }; export const ScanImageImagingInterface = PageTemplate.bind({}); -const ScanImageImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -ScanImageImagingInterfaceGlobalCopy.interfaces.interface = ScanImageImagingInterface -ScanImageImagingInterfaceGlobalCopy.schema.source_data = ScanImageImagingInterfaceSchema +const ScanImageImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +ScanImageImagingInterfaceGlobalCopy.interfaces.interface = ScanImageImagingInterface; +ScanImageImagingInterfaceGlobalCopy.schema.source_data = ScanImageImagingInterfaceSchema; ScanImageImagingInterface.args = { activePage, globalState: ScanImageImagingInterfaceGlobalCopy }; export const TiffImagingInterface = PageTemplate.bind({}); -const TiffImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -TiffImagingInterfaceGlobalCopy.interfaces.interface = TiffImagingInterface -TiffImagingInterfaceGlobalCopy.schema.source_data = TiffImagingInterfaceSchema +const TiffImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +TiffImagingInterfaceGlobalCopy.interfaces.interface = TiffImagingInterface; +TiffImagingInterfaceGlobalCopy.schema.source_data = TiffImagingInterfaceSchema; TiffImagingInterface.args = { activePage, globalState: TiffImagingInterfaceGlobalCopy }; export const MiniscopeImagingInterface = PageTemplate.bind({}); -const MiniscopeImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -MiniscopeImagingInterfaceGlobalCopy.interfaces.interface = MiniscopeImagingInterface -MiniscopeImagingInterfaceGlobalCopy.schema.source_data = MiniscopeImagingInterfaceSchema +const MiniscopeImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +MiniscopeImagingInterfaceGlobalCopy.interfaces.interface = MiniscopeImagingInterface; +MiniscopeImagingInterfaceGlobalCopy.schema.source_data = MiniscopeImagingInterfaceSchema; MiniscopeImagingInterface.args = { activePage, globalState: MiniscopeImagingInterfaceGlobalCopy }; export const SbxImagingInterface = PageTemplate.bind({}); -const SbxImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -SbxImagingInterfaceGlobalCopy.interfaces.interface = SbxImagingInterface -SbxImagingInterfaceGlobalCopy.schema.source_data = SbxImagingInterfaceSchema +const SbxImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +SbxImagingInterfaceGlobalCopy.interfaces.interface = SbxImagingInterface; +SbxImagingInterfaceGlobalCopy.schema.source_data = SbxImagingInterfaceSchema; SbxImagingInterface.args = { activePage, globalState: SbxImagingInterfaceGlobalCopy }; export const CaimanSegmentationInterface = PageTemplate.bind({}); -const CaimanSegmentationInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -CaimanSegmentationInterfaceGlobalCopy.interfaces.interface = CaimanSegmentationInterface -CaimanSegmentationInterfaceGlobalCopy.schema.source_data = CaimanSegmentationInterfaceSchema +const CaimanSegmentationInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +CaimanSegmentationInterfaceGlobalCopy.interfaces.interface = CaimanSegmentationInterface; +CaimanSegmentationInterfaceGlobalCopy.schema.source_data = CaimanSegmentationInterfaceSchema; CaimanSegmentationInterface.args = { activePage, globalState: CaimanSegmentationInterfaceGlobalCopy }; - From c3ea82346991b11bf62207810838f38cc279a590 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 29 Sep 2023 12:00:23 -0700 Subject: [PATCH 5/9] Patch neuroconv schema inconsistency and add requirement entry for objects --- pyflask/manageNeuroconv/manage_neuroconv.py | 2 +- src/renderer/src/stories/JSONSchemaForm.js | 110 ++++++++++-------- src/renderer/src/stories/JSONSchemaInput.js | 3 +- .../pages/guided-mode/data/GuidedMetadata.js | 8 +- .../stories/pages/guided-mode/data/utils.js | 8 ++ 5 files changed, 80 insertions(+), 51 deletions(-) diff --git a/pyflask/manageNeuroconv/manage_neuroconv.py b/pyflask/manageNeuroconv/manage_neuroconv.py index 1888a0f10..6082703e2 100644 --- a/pyflask/manageNeuroconv/manage_neuroconv.py +++ b/pyflask/manageNeuroconv/manage_neuroconv.py @@ -88,7 +88,7 @@ def coerce_schema_compliance_recursive(obj, schema): coerce_schema_compliance_recursive(value, prop_schema) elif isinstance(obj, list): for item in obj: - coerce_schema_compliance_recursive(item, schema.get("items", {})) + coerce_schema_compliance_recursive(item, schema.get("items", schema if 'properties' else {})) # NEUROCONV PATCH return obj diff --git a/src/renderer/src/stories/JSONSchemaForm.js b/src/renderer/src/stories/JSONSchemaForm.js index f8c82241a..3c5d8f50e 100644 --- a/src/renderer/src/stories/JSONSchemaForm.js +++ b/src/renderer/src/stories/JSONSchemaForm.js @@ -12,6 +12,9 @@ import { resolveProperties } from "./pages/guided-mode/data/utils"; import { JSONSchemaInput } from "./JSONSchemaInput"; import { InspectorListItem } from "./preview/inspector/InspectorList"; + +const selfRequiredSymbol = Symbol() + const componentCSS = ` * { @@ -153,7 +156,7 @@ export class JSONSchemaForm extends LitElement { }; } - #base = []; + base = []; #nestedForms = {}; tables = {}; #nErrors = 0; @@ -205,7 +208,7 @@ export class JSONSchemaForm extends LitElement { if (props.onStatusChange) this.onStatusChange = props.onStatusChange; - if (props.base) this.#base = props.base; + if (props.base) this.base = props.base; } getTable = (path) => { @@ -242,8 +245,9 @@ export class JSONSchemaForm extends LitElement { } // Track resolved values for the form (data only) - updateData(fullPath, value) { - const path = [...fullPath]; + updateData(localPath, value) { + + const path = [...localPath]; const name = path.pop(); const reducer = (acc, key) => (key in acc ? acc[key] : (acc[key] = {})); // NOTE: Create nested objects if required to set a new path @@ -260,8 +264,8 @@ export class JSONSchemaForm extends LitElement { resultParent[name] = value; resolvedParent[name] = value; } - - if (hasUpdate) this.onUpdate(fullPath, value); // Ensure the value has actually changed + + if (hasUpdate) this.onUpdate(localPath, value); // Ensure the value has actually changed } #addMessage = (name, message, type) => { @@ -271,9 +275,9 @@ export class JSONSchemaForm extends LitElement { container.appendChild(item); }; - #clearMessages = (fullPath, type) => { - if (Array.isArray(fullPath)) fullPath = fullPath.join("-"); // Convert array to string - const container = this.shadowRoot.querySelector(`#${fullPath} .${type}`); + #clearMessages = (localPath, type) => { + if (Array.isArray(localPath)) localPath = localPath.join("-"); // Convert array to string + const container = this.shadowRoot.querySelector(`#${localPath} .${type}`); if (container) { const nChildren = container.children.length; @@ -348,15 +352,15 @@ export class JSONSchemaForm extends LitElement { }; #get = (path, object = this.resolved) => { - // path = path.slice(this.#base.length); // Correct for base path + // path = path.slice(this.base.length); // Correct for base path return path.reduce((acc, curr) => (acc = acc[curr]), object); }; - #checkRequiredAfterChange = async (fullPath) => { - const path = [...fullPath]; + #checkRequiredAfterChange = async (localPath) => { + const path = [...localPath]; const name = path.pop(); const element = this.shadowRoot - .querySelector(`#${fullPath.join("-")}`) + .querySelector(`#${localPath.join("-")}`) .querySelector("jsonschema-input") .getElement(); const isValid = await this.triggerValidation(name, element, path, false); @@ -367,13 +371,13 @@ export class JSONSchemaForm extends LitElement { if (typeof path === "string") path = path.split("."); // NOTE: Still must correct for the base here - if (this.#base.length) { - const base = this.#base.slice(-1)[0]; + if (this.base.length) { + const base = this.base.slice(-1)[0]; const indexOf = path.indexOf(base); if (indexOf !== -1) path = path.slice(indexOf + 1); } - const resolved = path.reduce((acc, curr) => (acc = acc[curr]), schema); + const resolved = this.#get(path, schema) if (resolved["$ref"]) return this.getSchema(resolved["$ref"].split("/").slice(1)); // NOTE: This assumes reference to the root of the schema return resolved; @@ -382,8 +386,8 @@ export class JSONSchemaForm extends LitElement { #renderInteractiveElement = (name, info, required, path = []) => { let isRequired = required[name]; - const fullPath = [...path, name]; - const externalPath = [...this.#base, ...fullPath]; + const localPath = [...path, name]; + const externalPath = [...this.base, ...localPath]; const resolved = this.#get(path, this.resolved); const value = resolved[name]; @@ -392,11 +396,11 @@ export class JSONSchemaForm extends LitElement { if (isConditional && !isRequired) isRequired = required[name] = async () => { - const isRequiredAfterChange = await this.#checkRequiredAfterChange(fullPath); + const isRequiredAfterChange = await this.#checkRequiredAfterChange(localPath); if (isRequiredAfterChange) { return true; } else { - const linkResults = await this.#applyToLinkedProperties(this.#checkRequiredAfterChange, fullPath); // Check links + const linkResults = await this.#applyToLinkedProperties(this.#checkRequiredAfterChange, localPath); // Check links if (linkResults.includes(true)) return true; // Handle updates when no longer required else return false; @@ -405,7 +409,7 @@ export class JSONSchemaForm extends LitElement { const interactiveInput = new JSONSchemaInput({ info, - path: fullPath, + path: localPath, value, form: this, required: isRequired, @@ -425,7 +429,7 @@ export class JSONSchemaForm extends LitElement { return html`
{}; onLoaded = () => {}; - onUpdate = () => {}; + onUpdate = () => {} #deleteExtraneousResults = (results, schema) => { for (let name in results) { @@ -510,7 +517,7 @@ export class JSONSchemaForm extends LitElement { if (this.ignore.includes(key)) return false; if (this.showLevelOverride >= path.length) return isRenderable(key, value); if (required[key]) return isRenderable(key, value); - if (this.#getLink([...this.#base, ...path, key])) return isRenderable(key, value); + if (this.#getLink([...this.base, ...path, key])) return isRenderable(key, value); if (!this.onlyRequired) return isRenderable(key, value); return false; }) @@ -548,7 +555,7 @@ export class JSONSchemaForm extends LitElement { #isLinkResolved = async (pathArr) => { return ( await this.#applyToLinkedProperties((link) => { - const isRequired = this.#isRequired(link.slice((this.#base ?? []).length)); + const isRequired = this.#isRequired(link.slice((this.base ?? []).length)); if (typeof isRequired === "function") return !isRequired.call(this.resolved); else return !isRequired; }, pathArr) @@ -557,8 +564,11 @@ export class JSONSchemaForm extends LitElement { #isRequired = (path) => { if (typeof path === "string") path = path.split("-"); - // path = path.slice(this.#base.length); // Remove base path - return path.reduce((obj, key) => obj && obj[key], this.#requirements); + // path = path.slice(this.base.length); // Remove base path + const res = path.reduce((obj, key) => obj && obj[key], this.#requirements); + + if (typeof res === 'object') res = res[selfRequiredSymbol] + return res }; #getLinkElement = (externalPath) => { @@ -569,17 +579,20 @@ export class JSONSchemaForm extends LitElement { // Assume this is going to return as a Promise—even if the change function isn't returning one triggerValidation = async (name, element, path = [], checkLinks = true) => { + const parent = this.#get(path, this.resolved); + const pathToValidate = [...(this.base ?? []), ...path] + const valid = !this.validateEmptyValues && !(name in parent) ? true - : await this.validateOnChange(name, parent, [...(this.#base ?? []), ...path]); + : await this.validateOnChange(name, parent, pathToValidate); - const fullPath = [...path, name]; // Use basePath to augment the validation - const externalPath = [...this.#base, name]; + const localPath = [...path, name]; // Use basePath to augment the validation + const externalPath = [...this.base, name]; - const isRequired = this.#isRequired(fullPath); + const isRequired = this.#isRequired(localPath); let warnings = Array.isArray(valid) ? valid.filter((info) => info.type === "warning" && (!isRequired || !info.missing)) : []; @@ -596,7 +609,7 @@ export class JSONSchemaForm extends LitElement { // Clear old errors and warnings on linked properties this.#applyToLinkedProperties((path) => { - const internalPath = path.slice((this.#base ?? []).length); + const internalPath = path.slice((this.base ?? []).length); this.#clearMessages(internalPath, "errors"); this.#clearMessages(internalPath, "warnings"); }, externalPath); @@ -610,8 +623,8 @@ export class JSONSchemaForm extends LitElement { } // Clear old errors and warnings - this.#clearMessages(fullPath, "errors"); - this.#clearMessages(fullPath, "warnings"); + this.#clearMessages(localPath, "errors"); + this.#clearMessages(localPath, "warnings"); const isFunction = typeof valid === "function"; const isValid = @@ -628,7 +641,7 @@ export class JSONSchemaForm extends LitElement { this.checkStatus(); // Show aggregated errors and warnings (if any) - warnings.forEach((info) => this.#addMessage(fullPath, info, "warnings")); + warnings.forEach((info) => this.#addMessage(localPath, info, "warnings")); if (isValid && errors.length === 0) { element.classList.remove("invalid"); @@ -638,7 +651,7 @@ export class JSONSchemaForm extends LitElement { await this.#applyToLinkedProperties((path, element) => { element.classList.remove("required", "conditional"); // Links manage their own error and validity states, but only one needs to be valid - }, fullPath); + }, localPath); if (isFunction) valid(); // Run if returned value is a function @@ -656,7 +669,7 @@ export class JSONSchemaForm extends LitElement { [...path, name] ); - errors.forEach((info) => this.#addMessage(fullPath, info, "errors")); + errors.forEach((info) => this.#addMessage(localPath, info, "errors")); // element.title = errors.map((info) => info.message).join("\n"); // Set all errors to show on hover return false; @@ -674,7 +687,7 @@ export class JSONSchemaForm extends LitElement { if (renderable.length === 0) return html`

No properties to render

`; let renderableWithLinks = renderable.reduce((acc, [name, info]) => { - const externalPath = [...this.#base, ...path, name]; + const externalPath = [...this.base, ...path, name]; const link = this.#getLink(externalPath); // Use the base path to find a link if (link) { @@ -735,7 +748,7 @@ export class JSONSchemaForm extends LitElement { // Render linked properties if (entry[isLink]) { const linkedProperties = info.properties.map((path) => { - const pathCopy = [...path].slice((this.#base ?? []).length); + const pathCopy = [...path].slice((this.base ?? []).length); const name = pathCopy.pop(); return this.#renderInteractiveElement(name, schema.properties[name], required, pathCopy); }); @@ -751,7 +764,7 @@ export class JSONSchemaForm extends LitElement { const hasMany = renderable.length > 1; // How many siblings? - const fullPath = [...path, name]; + const localPath = [...path, name]; if (this.mode === "accordion" && hasMany) { const headerName = header(name); @@ -762,8 +775,10 @@ export class JSONSchemaForm extends LitElement { results: { ...results[name] }, globals: this.globals?.[name], + mode: this.mode, + onUpdate: (internalPath, value) => { - const path = [...fullPath, ...internalPath]; + const path = [...localPath, ...internalPath]; this.updateData(path, value); }, @@ -788,13 +803,13 @@ export class JSONSchemaForm extends LitElement { this.checkAllLoaded(); }, renderTable: (...args) => this.renderTable(...args), - base: fullPath, + base: [...this.base, ...localPath], }); const accordion = new Accordion({ sections: { [headerName]: { - subtitle: `${this.#getRenderable(info, required[name], fullPath, true).length} fields`, + subtitle: `${this.#getRenderable(info, required[name], localPath, true).length} fields`, content: this.#nestedForms[name], }, }, @@ -806,7 +821,7 @@ export class JSONSchemaForm extends LitElement { } // Render properties in the sub-schema - const rendered = this.#render(info, results?.[name], required[name], fullPath); + const rendered = this.#render(info, results?.[name], required[name], localPath); return hasMany || path.length > 1 ? html`
@@ -829,7 +844,8 @@ export class JSONSchemaForm extends LitElement { Object.entries(schema.properties).forEach(([key, value]) => { if (value.properties) { let nextAccumulator = acc[key]; - if (!nextAccumulator || typeof nextAccumulator !== "object") nextAccumulator = acc[key] = {}; + const isNotObject = typeof nextAccumulator !== "object" + if (!nextAccumulator || isNotObject) nextAccumulator = acc[key] = {[selfRequiredSymbol]: !!nextAccumulator}; this.#registerRequirements(value, requirements[key], nextAccumulator); } }); diff --git a/src/renderer/src/stories/JSONSchemaInput.js b/src/renderer/src/stories/JSONSchemaInput.js index 5fee127a5..2bb6331df 100644 --- a/src/renderer/src/stories/JSONSchemaInput.js +++ b/src/renderer/src/stories/JSONSchemaInput.js @@ -186,6 +186,7 @@ export class JSONSchemaInput extends LitElement { const fileSystemFormat = isFilesystemSelector(itemSchema.format); if (fileSystemFormat) return createFilesystemSelector(fileSystemFormat); else if (isTable) { + const tableMetadata = { schema: itemSchema, data: this.value, @@ -197,7 +198,7 @@ export class JSONSchemaInput extends LitElement { (this.onValidate ? this.onValidate() : this.form - ? this.form.validateOnChange(key, parent, fullPath, v) + ? this.form.validateOnChange(key, parent, [...this.form.base, ...fullPath], v) : "") ); }, diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js index d3de48412..09b230b2c 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js +++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js @@ -110,7 +110,11 @@ export class GuidedMetadataPage extends ManagedPage { results, globals: aggregateGlobalMetadata, - ignore: ["Ophys", "subject_id", "session_id"], + ignore: [ + "Ophys", + "subject_id", + "session_id" + ], conditionalRequirements: [ { @@ -128,7 +132,7 @@ export class GuidedMetadataPage extends ManagedPage { this.#checkAllLoaded(); }, - onUpdate: (...args) => { + onUpdate: () => { this.unsavedUpdates = true; }, diff --git a/src/renderer/src/stories/pages/guided-mode/data/utils.js b/src/renderer/src/stories/pages/guided-mode/data/utils.js index e5ab73f9d..2fa6d5d26 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/utils.js +++ b/src/renderer/src/stories/pages/guided-mode/data/utils.js @@ -29,10 +29,18 @@ export function resolveProperties(properties = {}, target, globals = {}) { for (let name in properties) { const info = properties[name]; + + // NEUROCONV PATCH: Correct for incorrect array schema + if (info.properties && info.type === 'array') { + info.items = { type: "object", properties: info.properties, required: info.required } + delete info.properties + } + const props = info.properties; if (!(name in target)) { if (props) target[name] = {}; // Regisiter new interfaces in results + if (info.type === 'array') target[name] = [] // Auto-populate arrays // Apply global or default value if empty if (name in globals) target[name] = globals[name]; From 8e5e2344573ce003649aa242fe770b21b96f0732 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 19:03:37 +0000 Subject: [PATCH 6/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyflask/manageNeuroconv/manage_neuroconv.py | 4 ++- src/renderer/src/stories/JSONSchemaForm.js | 27 +++++++++---------- src/renderer/src/stories/JSONSchemaInput.js | 1 - .../pages/guided-mode/data/GuidedMetadata.js | 6 +---- .../stories/pages/guided-mode/data/utils.js | 8 +++--- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/pyflask/manageNeuroconv/manage_neuroconv.py b/pyflask/manageNeuroconv/manage_neuroconv.py index 6082703e2..eab144798 100644 --- a/pyflask/manageNeuroconv/manage_neuroconv.py +++ b/pyflask/manageNeuroconv/manage_neuroconv.py @@ -88,7 +88,9 @@ def coerce_schema_compliance_recursive(obj, schema): coerce_schema_compliance_recursive(value, prop_schema) elif isinstance(obj, list): for item in obj: - coerce_schema_compliance_recursive(item, schema.get("items", schema if 'properties' else {})) # NEUROCONV PATCH + coerce_schema_compliance_recursive( + item, schema.get("items", schema if "properties" else {}) + ) # NEUROCONV PATCH return obj diff --git a/src/renderer/src/stories/JSONSchemaForm.js b/src/renderer/src/stories/JSONSchemaForm.js index 3c5d8f50e..ea248fe7c 100644 --- a/src/renderer/src/stories/JSONSchemaForm.js +++ b/src/renderer/src/stories/JSONSchemaForm.js @@ -12,8 +12,7 @@ import { resolveProperties } from "./pages/guided-mode/data/utils"; import { JSONSchemaInput } from "./JSONSchemaInput"; import { InspectorListItem } from "./preview/inspector/InspectorList"; - -const selfRequiredSymbol = Symbol() +const selfRequiredSymbol = Symbol(); const componentCSS = ` @@ -246,7 +245,6 @@ export class JSONSchemaForm extends LitElement { // Track resolved values for the form (data only) updateData(localPath, value) { - const path = [...localPath]; const name = path.pop(); @@ -264,7 +262,7 @@ export class JSONSchemaForm extends LitElement { resultParent[name] = value; resolvedParent[name] = value; } - + if (hasUpdate) this.onUpdate(localPath, value); // Ensure the value has actually changed } @@ -377,7 +375,7 @@ export class JSONSchemaForm extends LitElement { if (indexOf !== -1) path = path.slice(indexOf + 1); } - const resolved = this.#get(path, schema) + const resolved = this.#get(path, schema); if (resolved["$ref"]) return this.getSchema(resolved["$ref"].split("/").slice(1)); // NOTE: This assumes reference to the root of the schema return resolved; @@ -465,12 +463,13 @@ export class JSONSchemaForm extends LitElement { // // NOTE: Uncomment to block checking requirements inside optional properties // if (!requirements[name][selfRequiredSymbol] && !resolved[name]) continue; // Do not continue checking requirements if absent and not required - + if (typeof isRequired === "function") isRequired = await isRequired.call(this.resolved); if (isRequired) { let path = parentPath ? `${parentPath}-${name}` : name; - if (typeof isRequired === "object" && !Array.isArray(isRequired)) invalid.push(...(await this.#validateRequirements(resolved[name], isRequired, path))); + if (typeof isRequired === "object" && !Array.isArray(isRequired)) + invalid.push(...(await this.#validateRequirements(resolved[name], isRequired, path))); else if (!resolved[name]) invalid.push(path); } } @@ -481,7 +480,7 @@ export class JSONSchemaForm extends LitElement { // Checks missing required properties and throws an error if any are found onInvalid = () => {}; onLoaded = () => {}; - onUpdate = () => {} + onUpdate = () => {}; #deleteExtraneousResults = (results, schema) => { for (let name in results) { @@ -567,8 +566,8 @@ export class JSONSchemaForm extends LitElement { // path = path.slice(this.base.length); // Remove base path const res = path.reduce((obj, key) => obj && obj[key], this.#requirements); - if (typeof res === 'object') res = res[selfRequiredSymbol] - return res + if (typeof res === "object") res = res[selfRequiredSymbol]; + return res; }; #getLinkElement = (externalPath) => { @@ -579,10 +578,9 @@ export class JSONSchemaForm extends LitElement { // Assume this is going to return as a Promise—even if the change function isn't returning one triggerValidation = async (name, element, path = [], checkLinks = true) => { - const parent = this.#get(path, this.resolved); - const pathToValidate = [...(this.base ?? []), ...path] + const pathToValidate = [...(this.base ?? []), ...path]; const valid = !this.validateEmptyValues && !(name in parent) @@ -844,8 +842,9 @@ export class JSONSchemaForm extends LitElement { Object.entries(schema.properties).forEach(([key, value]) => { if (value.properties) { let nextAccumulator = acc[key]; - const isNotObject = typeof nextAccumulator !== "object" - if (!nextAccumulator || isNotObject) nextAccumulator = acc[key] = {[selfRequiredSymbol]: !!nextAccumulator}; + const isNotObject = typeof nextAccumulator !== "object"; + if (!nextAccumulator || isNotObject) + nextAccumulator = acc[key] = { [selfRequiredSymbol]: !!nextAccumulator }; this.#registerRequirements(value, requirements[key], nextAccumulator); } }); diff --git a/src/renderer/src/stories/JSONSchemaInput.js b/src/renderer/src/stories/JSONSchemaInput.js index 2bb6331df..d125fb257 100644 --- a/src/renderer/src/stories/JSONSchemaInput.js +++ b/src/renderer/src/stories/JSONSchemaInput.js @@ -186,7 +186,6 @@ export class JSONSchemaInput extends LitElement { const fileSystemFormat = isFilesystemSelector(itemSchema.format); if (fileSystemFormat) return createFilesystemSelector(fileSystemFormat); else if (isTable) { - const tableMetadata = { schema: itemSchema, data: this.value, diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js index 09b230b2c..e265e15d5 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js +++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js @@ -110,11 +110,7 @@ export class GuidedMetadataPage extends ManagedPage { results, globals: aggregateGlobalMetadata, - ignore: [ - "Ophys", - "subject_id", - "session_id" - ], + ignore: ["Ophys", "subject_id", "session_id"], conditionalRequirements: [ { diff --git a/src/renderer/src/stories/pages/guided-mode/data/utils.js b/src/renderer/src/stories/pages/guided-mode/data/utils.js index 2fa6d5d26..3c3cb6b77 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/utils.js +++ b/src/renderer/src/stories/pages/guided-mode/data/utils.js @@ -31,16 +31,16 @@ export function resolveProperties(properties = {}, target, globals = {}) { const info = properties[name]; // NEUROCONV PATCH: Correct for incorrect array schema - if (info.properties && info.type === 'array') { - info.items = { type: "object", properties: info.properties, required: info.required } - delete info.properties + if (info.properties && info.type === "array") { + info.items = { type: "object", properties: info.properties, required: info.required }; + delete info.properties; } const props = info.properties; if (!(name in target)) { if (props) target[name] = {}; // Regisiter new interfaces in results - if (info.type === 'array') target[name] = [] // Auto-populate arrays + if (info.type === "array") target[name] = []; // Auto-populate arrays // Apply global or default value if empty if (name in globals) target[name] = globals[name]; From 8dcd0518fe9e6ab6e1b949b41b3df701602cfcd2 Mon Sep 17 00:00:00 2001 From: Garrett Date: Mon, 2 Oct 2023 10:48:30 +0200 Subject: [PATCH 7/9] Fix TwoPhotonSeries autopopulation --- src/renderer/src/stories/pages/guided-mode/data/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/stories/pages/guided-mode/data/utils.js b/src/renderer/src/stories/pages/guided-mode/data/utils.js index 3c3cb6b77..17a06aa0e 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/utils.js +++ b/src/renderer/src/stories/pages/guided-mode/data/utils.js @@ -40,7 +40,7 @@ export function resolveProperties(properties = {}, target, globals = {}) { if (!(name in target)) { if (props) target[name] = {}; // Regisiter new interfaces in results - if (info.type === "array") target[name] = []; // Auto-populate arrays + // if (info.type === "array") target[name] = []; // Auto-populate arrays (NOTE: Breaks PyNWB when adding to TwoPhotonSeries field...) // Apply global or default value if empty if (name in globals) target[name] = globals[name]; From 24669aef38e793798952c73fb7449cc7635b88fd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 08:52:15 +0000 Subject: [PATCH 8/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../pages/guided-mode/SourceData.stories.js | 289 ++++++++++-------- 1 file changed, 157 insertions(+), 132 deletions(-) diff --git a/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js b/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js index b074ebd29..e668929eb 100644 --- a/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js +++ b/src/renderer/src/stories/pages/guided-mode/SourceData.stories.js @@ -1,215 +1,240 @@ import { globalState, PageTemplate } from "./storyStates"; -import SpikeGLXRecordingInterfaceSchema from '../../../../../../schemas/json/generated/SpikeGLXRecordingInterface.json' -import SpikeGLXNIDQInterfaceSchema from '../../../../../../schemas/json/generated/SpikeGLXNIDQInterface.json' -import PhySortingInterfaceSchema from '../../../../../../schemas/json/generated/PhySortingInterface.json' -import NeuroScopeRecordingInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeRecordingInterface.json' -import NeuroScopeLFPInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeLFPInterface.json' -import NeuroScopeSortingInterfaceSchema from '../../../../../../schemas/json/generated/NeuroScopeSortingInterface.json' -import BiocamRecordingInterfaceSchema from '../../../../../../schemas/json/generated/BiocamRecordingInterface.json' -import IntanRecordingInterfaceSchema from '../../../../../../schemas/json/generated/IntanRecordingInterface.json' -import OpenEphysRecordingInterfaceSchema from '../../../../../../schemas/json/generated/OpenEphysRecordingInterface.json' -import BlackrockRecordingInterfaceSchema from '../../../../../../schemas/json/generated/BlackrockRecordingInterface.json' -import BlackrockSortingInterfaceSchema from '../../../../../../schemas/json/generated/BlackrockSortingInterface.json' -import CellExplorerSortingInterfaceSchema from '../../../../../../schemas/json/generated/CellExplorerSortingInterface.json' -import KiloSortSortingInterfaceSchema from '../../../../../../schemas/json/generated/KiloSortSortingInterface.json' -import Spike2RecordingInterfaceSchema from '../../../../../../schemas/json/generated/Spike2RecordingInterface.json' -import BrukerTiffSinglePlaneImagingInterfaceSchema from '../../../../../../schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json' -import BrukerTiffMultiPlaneImagingInterfaceSchema from '../../../../../../schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json' -import MicroManagerTiffImagingInterfaceSchema from '../../../../../../schemas/json/generated/MicroManagerTiffImagingInterface.json' -import ScanImageImagingInterfaceSchema from '../../../../../../schemas/json/generated/ScanImageImagingInterface.json' -import TiffImagingInterfaceSchema from '../../../../../../schemas/json/generated/TiffImagingInterface.json' -import MiniscopeImagingInterfaceSchema from '../../../../../../schemas/json/generated/MiniscopeImagingInterface.json' -import SbxImagingInterfaceSchema from '../../../../../../schemas/json/generated/SbxImagingInterface.json' -import CaimanSegmentationInterfaceSchema from '../../../../../../schemas/json/generated/CaimanSegmentationInterface.json' -import MCSRawRecordingInterfaceSchema from '../../../../../../schemas/json/generated/MCSRawRecordingInterface.json' -import MEArecRecordingInterfaceSchema from '../../../../../../schemas/json/generated/MEArecRecordingInterface.json' +import SpikeGLXRecordingInterfaceSchema from "../../../../../../schemas/json/generated/SpikeGLXRecordingInterface.json"; +import SpikeGLXNIDQInterfaceSchema from "../../../../../../schemas/json/generated/SpikeGLXNIDQInterface.json"; +import PhySortingInterfaceSchema from "../../../../../../schemas/json/generated/PhySortingInterface.json"; +import NeuroScopeRecordingInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeRecordingInterface.json"; +import NeuroScopeLFPInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeLFPInterface.json"; +import NeuroScopeSortingInterfaceSchema from "../../../../../../schemas/json/generated/NeuroScopeSortingInterface.json"; +import BiocamRecordingInterfaceSchema from "../../../../../../schemas/json/generated/BiocamRecordingInterface.json"; +import IntanRecordingInterfaceSchema from "../../../../../../schemas/json/generated/IntanRecordingInterface.json"; +import OpenEphysRecordingInterfaceSchema from "../../../../../../schemas/json/generated/OpenEphysRecordingInterface.json"; +import BlackrockRecordingInterfaceSchema from "../../../../../../schemas/json/generated/BlackrockRecordingInterface.json"; +import BlackrockSortingInterfaceSchema from "../../../../../../schemas/json/generated/BlackrockSortingInterface.json"; +import CellExplorerSortingInterfaceSchema from "../../../../../../schemas/json/generated/CellExplorerSortingInterface.json"; +import KiloSortSortingInterfaceSchema from "../../../../../../schemas/json/generated/KiloSortSortingInterface.json"; +import Spike2RecordingInterfaceSchema from "../../../../../../schemas/json/generated/Spike2RecordingInterface.json"; +import BrukerTiffSinglePlaneImagingInterfaceSchema from "../../../../../../schemas/json/generated/BrukerTiffSinglePlaneImagingInterface.json"; +import BrukerTiffMultiPlaneImagingInterfaceSchema from "../../../../../../schemas/json/generated/BrukerTiffMultiPlaneImagingInterface.json"; +import MicroManagerTiffImagingInterfaceSchema from "../../../../../../schemas/json/generated/MicroManagerTiffImagingInterface.json"; +import ScanImageImagingInterfaceSchema from "../../../../../../schemas/json/generated/ScanImageImagingInterface.json"; +import TiffImagingInterfaceSchema from "../../../../../../schemas/json/generated/TiffImagingInterface.json"; +import MiniscopeImagingInterfaceSchema from "../../../../../../schemas/json/generated/MiniscopeImagingInterface.json"; +import SbxImagingInterfaceSchema from "../../../../../../schemas/json/generated/SbxImagingInterface.json"; +import CaimanSegmentationInterfaceSchema from "../../../../../../schemas/json/generated/CaimanSegmentationInterface.json"; +import MCSRawRecordingInterfaceSchema from "../../../../../../schemas/json/generated/MCSRawRecordingInterface.json"; +import MEArecRecordingInterfaceSchema from "../../../../../../schemas/json/generated/MEArecRecordingInterface.json"; export default { title: "Pages/Guided Mode/Source Data", parameters: { chromatic: { disableSnapshot: false }, - } + }, }; -const activePage = "conversion/sourcedata" - - -const globalStateCopy = JSON.parse(JSON.stringify(globalState)) -globalStateCopy.schema.source_data.properties.SpikeGLXRecordingInterface = SpikeGLXRecordingInterfaceSchema.properties.SpikeGLXRecordingInterface -globalStateCopy.schema.source_data.properties.SpikeGLXNIDQInterface = SpikeGLXNIDQInterfaceSchema.properties.SpikeGLXNIDQInterface -globalStateCopy.schema.source_data.properties.PhySortingInterface = PhySortingInterfaceSchema.properties.PhySortingInterface -globalStateCopy.schema.source_data.properties.NeuroScopeRecordingInterface = NeuroScopeRecordingInterfaceSchema.properties.NeuroScopeRecordingInterface -globalStateCopy.schema.source_data.properties.NeuroScopeLFPInterface = NeuroScopeLFPInterfaceSchema.properties.NeuroScopeLFPInterface -globalStateCopy.schema.source_data.properties.NeuroScopeSortingInterface = NeuroScopeSortingInterfaceSchema.properties.NeuroScopeSortingInterface -globalStateCopy.schema.source_data.properties.BiocamRecordingInterface = BiocamRecordingInterfaceSchema.properties.BiocamRecordingInterface -globalStateCopy.schema.source_data.properties.IntanRecordingInterface = IntanRecordingInterfaceSchema.properties.IntanRecordingInterface -globalStateCopy.schema.source_data.properties.OpenEphysRecordingInterface = OpenEphysRecordingInterfaceSchema.properties.OpenEphysRecordingInterface -globalStateCopy.schema.source_data.properties.BlackrockRecordingInterface = BlackrockRecordingInterfaceSchema.properties.BlackrockRecordingInterface -globalStateCopy.schema.source_data.properties.BlackrockSortingInterface = BlackrockSortingInterfaceSchema.properties.BlackrockSortingInterface -globalStateCopy.schema.source_data.properties.CellExplorerSortingInterface = CellExplorerSortingInterfaceSchema.properties.CellExplorerSortingInterface -globalStateCopy.schema.source_data.properties.KiloSortSortingInterface = KiloSortSortingInterfaceSchema.properties.KiloSortSortingInterface -globalStateCopy.schema.source_data.properties.Spike2RecordingInterface = Spike2RecordingInterfaceSchema.properties.Spike2RecordingInterface -globalStateCopy.schema.source_data.properties.BrukerTiffSinglePlaneImagingInterface = BrukerTiffSinglePlaneImagingInterfaceSchema.properties.BrukerTiffSinglePlaneImagingInterface -globalStateCopy.schema.source_data.properties.BrukerTiffMultiPlaneImagingInterface = BrukerTiffMultiPlaneImagingInterfaceSchema.properties.BrukerTiffMultiPlaneImagingInterface -globalStateCopy.schema.source_data.properties.MicroManagerTiffImagingInterface = MicroManagerTiffImagingInterfaceSchema.properties.MicroManagerTiffImagingInterface -globalStateCopy.schema.source_data.properties.ScanImageImagingInterface = ScanImageImagingInterfaceSchema.properties.ScanImageImagingInterface -globalStateCopy.schema.source_data.properties.TiffImagingInterface = TiffImagingInterfaceSchema.properties.TiffImagingInterface -globalStateCopy.schema.source_data.properties.MiniscopeImagingInterface = MiniscopeImagingInterfaceSchema.properties.MiniscopeImagingInterface -globalStateCopy.schema.source_data.properties.SbxImagingInterface = SbxImagingInterfaceSchema.properties.SbxImagingInterface -globalStateCopy.schema.source_data.properties.CaimanSegmentationInterface = CaimanSegmentationInterfaceSchema.properties.CaimanSegmentationInterface -globalStateCopy.schema.source_data.properties.MCSRawRecordingInterface = MCSRawRecordingInterfaceSchema.properties.MCSRawRecordingInterface -globalStateCopy.schema.source_data.properties.MEArecRecordingInterface = MEArecRecordingInterfaceSchema.properties.MEArecRecordingInterface - -const results = globalStateCopy.results -for (let sub in results){ - for (let ses in results[sub]) results[sub][ses].source_data = {SpikeGLXNIDQInterface: {file_path: '/dummy/file/path'}} +const activePage = "conversion/sourcedata"; + +const globalStateCopy = JSON.parse(JSON.stringify(globalState)); +globalStateCopy.schema.source_data.properties.SpikeGLXRecordingInterface = + SpikeGLXRecordingInterfaceSchema.properties.SpikeGLXRecordingInterface; +globalStateCopy.schema.source_data.properties.SpikeGLXNIDQInterface = + SpikeGLXNIDQInterfaceSchema.properties.SpikeGLXNIDQInterface; +globalStateCopy.schema.source_data.properties.PhySortingInterface = + PhySortingInterfaceSchema.properties.PhySortingInterface; +globalStateCopy.schema.source_data.properties.NeuroScopeRecordingInterface = + NeuroScopeRecordingInterfaceSchema.properties.NeuroScopeRecordingInterface; +globalStateCopy.schema.source_data.properties.NeuroScopeLFPInterface = + NeuroScopeLFPInterfaceSchema.properties.NeuroScopeLFPInterface; +globalStateCopy.schema.source_data.properties.NeuroScopeSortingInterface = + NeuroScopeSortingInterfaceSchema.properties.NeuroScopeSortingInterface; +globalStateCopy.schema.source_data.properties.BiocamRecordingInterface = + BiocamRecordingInterfaceSchema.properties.BiocamRecordingInterface; +globalStateCopy.schema.source_data.properties.IntanRecordingInterface = + IntanRecordingInterfaceSchema.properties.IntanRecordingInterface; +globalStateCopy.schema.source_data.properties.OpenEphysRecordingInterface = + OpenEphysRecordingInterfaceSchema.properties.OpenEphysRecordingInterface; +globalStateCopy.schema.source_data.properties.BlackrockRecordingInterface = + BlackrockRecordingInterfaceSchema.properties.BlackrockRecordingInterface; +globalStateCopy.schema.source_data.properties.BlackrockSortingInterface = + BlackrockSortingInterfaceSchema.properties.BlackrockSortingInterface; +globalStateCopy.schema.source_data.properties.CellExplorerSortingInterface = + CellExplorerSortingInterfaceSchema.properties.CellExplorerSortingInterface; +globalStateCopy.schema.source_data.properties.KiloSortSortingInterface = + KiloSortSortingInterfaceSchema.properties.KiloSortSortingInterface; +globalStateCopy.schema.source_data.properties.Spike2RecordingInterface = + Spike2RecordingInterfaceSchema.properties.Spike2RecordingInterface; +globalStateCopy.schema.source_data.properties.BrukerTiffSinglePlaneImagingInterface = + BrukerTiffSinglePlaneImagingInterfaceSchema.properties.BrukerTiffSinglePlaneImagingInterface; +globalStateCopy.schema.source_data.properties.BrukerTiffMultiPlaneImagingInterface = + BrukerTiffMultiPlaneImagingInterfaceSchema.properties.BrukerTiffMultiPlaneImagingInterface; +globalStateCopy.schema.source_data.properties.MicroManagerTiffImagingInterface = + MicroManagerTiffImagingInterfaceSchema.properties.MicroManagerTiffImagingInterface; +globalStateCopy.schema.source_data.properties.ScanImageImagingInterface = + ScanImageImagingInterfaceSchema.properties.ScanImageImagingInterface; +globalStateCopy.schema.source_data.properties.TiffImagingInterface = + TiffImagingInterfaceSchema.properties.TiffImagingInterface; +globalStateCopy.schema.source_data.properties.MiniscopeImagingInterface = + MiniscopeImagingInterfaceSchema.properties.MiniscopeImagingInterface; +globalStateCopy.schema.source_data.properties.SbxImagingInterface = + SbxImagingInterfaceSchema.properties.SbxImagingInterface; +globalStateCopy.schema.source_data.properties.CaimanSegmentationInterface = + CaimanSegmentationInterfaceSchema.properties.CaimanSegmentationInterface; +globalStateCopy.schema.source_data.properties.MCSRawRecordingInterface = + MCSRawRecordingInterfaceSchema.properties.MCSRawRecordingInterface; +globalStateCopy.schema.source_data.properties.MEArecRecordingInterface = + MEArecRecordingInterfaceSchema.properties.MEArecRecordingInterface; + +const results = globalStateCopy.results; +for (let sub in results) { + for (let ses in results[sub]) + results[sub][ses].source_data = { SpikeGLXNIDQInterface: { file_path: "/dummy/file/path" } }; } - export const All = PageTemplate.bind({}); All.args = { activePage, globalState: globalStateCopy }; export const SpikeGLXRecordingInterface = PageTemplate.bind({}); -const SpikeGLXRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -SpikeGLXRecordingInterfaceGlobalCopy.interfaces.interface = SpikeGLXRecordingInterface -SpikeGLXRecordingInterfaceGlobalCopy.schema.source_data = SpikeGLXRecordingInterfaceSchema +const SpikeGLXRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +SpikeGLXRecordingInterfaceGlobalCopy.interfaces.interface = SpikeGLXRecordingInterface; +SpikeGLXRecordingInterfaceGlobalCopy.schema.source_data = SpikeGLXRecordingInterfaceSchema; SpikeGLXRecordingInterface.args = { activePage, globalState: SpikeGLXRecordingInterfaceGlobalCopy }; export const SpikeGLXNIDQInterface = PageTemplate.bind({}); -const SpikeGLXNIDQInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -SpikeGLXNIDQInterfaceGlobalCopy.interfaces.interface = SpikeGLXNIDQInterface -SpikeGLXNIDQInterfaceGlobalCopy.schema.source_data = SpikeGLXNIDQInterfaceSchema +const SpikeGLXNIDQInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +SpikeGLXNIDQInterfaceGlobalCopy.interfaces.interface = SpikeGLXNIDQInterface; +SpikeGLXNIDQInterfaceGlobalCopy.schema.source_data = SpikeGLXNIDQInterfaceSchema; SpikeGLXNIDQInterface.args = { activePage, globalState: SpikeGLXNIDQInterfaceGlobalCopy }; export const PhySortingInterface = PageTemplate.bind({}); -const PhySortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -PhySortingInterfaceGlobalCopy.interfaces.interface = PhySortingInterface -PhySortingInterfaceGlobalCopy.schema.source_data = PhySortingInterfaceSchema +const PhySortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +PhySortingInterfaceGlobalCopy.interfaces.interface = PhySortingInterface; +PhySortingInterfaceGlobalCopy.schema.source_data = PhySortingInterfaceSchema; PhySortingInterface.args = { activePage, globalState: PhySortingInterfaceGlobalCopy }; export const NeuroScopeRecordingInterface = PageTemplate.bind({}); -const NeuroScopeRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -NeuroScopeRecordingInterfaceGlobalCopy.interfaces.interface = NeuroScopeRecordingInterface -NeuroScopeRecordingInterfaceGlobalCopy.schema.source_data = NeuroScopeRecordingInterfaceSchema +const NeuroScopeRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +NeuroScopeRecordingInterfaceGlobalCopy.interfaces.interface = NeuroScopeRecordingInterface; +NeuroScopeRecordingInterfaceGlobalCopy.schema.source_data = NeuroScopeRecordingInterfaceSchema; NeuroScopeRecordingInterface.args = { activePage, globalState: NeuroScopeRecordingInterfaceGlobalCopy }; export const NeuroScopeLFPInterface = PageTemplate.bind({}); -const NeuroScopeLFPInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -NeuroScopeLFPInterfaceGlobalCopy.interfaces.interface = NeuroScopeLFPInterface -NeuroScopeLFPInterfaceGlobalCopy.schema.source_data = NeuroScopeLFPInterfaceSchema +const NeuroScopeLFPInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +NeuroScopeLFPInterfaceGlobalCopy.interfaces.interface = NeuroScopeLFPInterface; +NeuroScopeLFPInterfaceGlobalCopy.schema.source_data = NeuroScopeLFPInterfaceSchema; NeuroScopeLFPInterface.args = { activePage, globalState: NeuroScopeLFPInterfaceGlobalCopy }; export const NeuroScopeSortingInterface = PageTemplate.bind({}); -const NeuroScopeSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -NeuroScopeSortingInterfaceGlobalCopy.interfaces.interface = NeuroScopeSortingInterface -NeuroScopeSortingInterfaceGlobalCopy.schema.source_data = NeuroScopeSortingInterfaceSchema +const NeuroScopeSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +NeuroScopeSortingInterfaceGlobalCopy.interfaces.interface = NeuroScopeSortingInterface; +NeuroScopeSortingInterfaceGlobalCopy.schema.source_data = NeuroScopeSortingInterfaceSchema; NeuroScopeSortingInterface.args = { activePage, globalState: NeuroScopeSortingInterfaceGlobalCopy }; export const BiocamRecordingInterface = PageTemplate.bind({}); -const BiocamRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BiocamRecordingInterfaceGlobalCopy.interfaces.interface = BiocamRecordingInterface -BiocamRecordingInterfaceGlobalCopy.schema.source_data = BiocamRecordingInterfaceSchema +const BiocamRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BiocamRecordingInterfaceGlobalCopy.interfaces.interface = BiocamRecordingInterface; +BiocamRecordingInterfaceGlobalCopy.schema.source_data = BiocamRecordingInterfaceSchema; BiocamRecordingInterface.args = { activePage, globalState: BiocamRecordingInterfaceGlobalCopy }; export const IntanRecordingInterface = PageTemplate.bind({}); -const IntanRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -IntanRecordingInterfaceGlobalCopy.interfaces.interface = IntanRecordingInterface -IntanRecordingInterfaceGlobalCopy.schema.source_data = IntanRecordingInterfaceSchema +const IntanRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +IntanRecordingInterfaceGlobalCopy.interfaces.interface = IntanRecordingInterface; +IntanRecordingInterfaceGlobalCopy.schema.source_data = IntanRecordingInterfaceSchema; IntanRecordingInterface.args = { activePage, globalState: IntanRecordingInterfaceGlobalCopy }; export const OpenEphysRecordingInterface = PageTemplate.bind({}); -const OpenEphysRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -OpenEphysRecordingInterfaceGlobalCopy.interfaces.interface = OpenEphysRecordingInterface -OpenEphysRecordingInterfaceGlobalCopy.schema.source_data = OpenEphysRecordingInterfaceSchema +const OpenEphysRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +OpenEphysRecordingInterfaceGlobalCopy.interfaces.interface = OpenEphysRecordingInterface; +OpenEphysRecordingInterfaceGlobalCopy.schema.source_data = OpenEphysRecordingInterfaceSchema; OpenEphysRecordingInterface.args = { activePage, globalState: OpenEphysRecordingInterfaceGlobalCopy }; export const BlackrockRecordingInterface = PageTemplate.bind({}); -const BlackrockRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BlackrockRecordingInterfaceGlobalCopy.interfaces.interface = BlackrockRecordingInterface -BlackrockRecordingInterfaceGlobalCopy.schema.source_data = BlackrockRecordingInterfaceSchema +const BlackrockRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BlackrockRecordingInterfaceGlobalCopy.interfaces.interface = BlackrockRecordingInterface; +BlackrockRecordingInterfaceGlobalCopy.schema.source_data = BlackrockRecordingInterfaceSchema; BlackrockRecordingInterface.args = { activePage, globalState: BlackrockRecordingInterfaceGlobalCopy }; export const BlackrockSortingInterface = PageTemplate.bind({}); -const BlackrockSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BlackrockSortingInterfaceGlobalCopy.interfaces.interface = BlackrockSortingInterface -BlackrockSortingInterfaceGlobalCopy.schema.source_data = BlackrockSortingInterfaceSchema +const BlackrockSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BlackrockSortingInterfaceGlobalCopy.interfaces.interface = BlackrockSortingInterface; +BlackrockSortingInterfaceGlobalCopy.schema.source_data = BlackrockSortingInterfaceSchema; BlackrockSortingInterface.args = { activePage, globalState: BlackrockSortingInterfaceGlobalCopy }; export const CellExplorerSortingInterface = PageTemplate.bind({}); -const CellExplorerSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -CellExplorerSortingInterfaceGlobalCopy.interfaces.interface = CellExplorerSortingInterface -CellExplorerSortingInterfaceGlobalCopy.schema.source_data = CellExplorerSortingInterfaceSchema +const CellExplorerSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +CellExplorerSortingInterfaceGlobalCopy.interfaces.interface = CellExplorerSortingInterface; +CellExplorerSortingInterfaceGlobalCopy.schema.source_data = CellExplorerSortingInterfaceSchema; CellExplorerSortingInterface.args = { activePage, globalState: CellExplorerSortingInterfaceGlobalCopy }; export const KiloSortSortingInterface = PageTemplate.bind({}); -const KiloSortSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -KiloSortSortingInterfaceGlobalCopy.interfaces.interface = KiloSortSortingInterface -KiloSortSortingInterfaceGlobalCopy.schema.source_data = KiloSortSortingInterfaceSchema +const KiloSortSortingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +KiloSortSortingInterfaceGlobalCopy.interfaces.interface = KiloSortSortingInterface; +KiloSortSortingInterfaceGlobalCopy.schema.source_data = KiloSortSortingInterfaceSchema; KiloSortSortingInterface.args = { activePage, globalState: KiloSortSortingInterfaceGlobalCopy }; export const Spike2RecordingInterface = PageTemplate.bind({}); -const Spike2RecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -Spike2RecordingInterfaceGlobalCopy.interfaces.interface = Spike2RecordingInterface -Spike2RecordingInterfaceGlobalCopy.schema.source_data = Spike2RecordingInterfaceSchema +const Spike2RecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +Spike2RecordingInterfaceGlobalCopy.interfaces.interface = Spike2RecordingInterface; +Spike2RecordingInterfaceGlobalCopy.schema.source_data = Spike2RecordingInterfaceSchema; Spike2RecordingInterface.args = { activePage, globalState: Spike2RecordingInterfaceGlobalCopy }; export const BrukerTiffSinglePlaneImagingInterface = PageTemplate.bind({}); -const BrukerTiffSinglePlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffSinglePlaneImagingInterface -BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffSinglePlaneImagingInterfaceSchema -BrukerTiffSinglePlaneImagingInterface.args = { activePage, globalState: BrukerTiffSinglePlaneImagingInterfaceGlobalCopy }; +const BrukerTiffSinglePlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffSinglePlaneImagingInterface; +BrukerTiffSinglePlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffSinglePlaneImagingInterfaceSchema; +BrukerTiffSinglePlaneImagingInterface.args = { + activePage, + globalState: BrukerTiffSinglePlaneImagingInterfaceGlobalCopy, +}; export const BrukerTiffMultiPlaneImagingInterface = PageTemplate.bind({}); -const BrukerTiffMultiPlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -BrukerTiffMultiPlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffMultiPlaneImagingInterface -BrukerTiffMultiPlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffMultiPlaneImagingInterfaceSchema +const BrukerTiffMultiPlaneImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +BrukerTiffMultiPlaneImagingInterfaceGlobalCopy.interfaces.interface = BrukerTiffMultiPlaneImagingInterface; +BrukerTiffMultiPlaneImagingInterfaceGlobalCopy.schema.source_data = BrukerTiffMultiPlaneImagingInterfaceSchema; BrukerTiffMultiPlaneImagingInterface.args = { activePage, globalState: BrukerTiffMultiPlaneImagingInterfaceGlobalCopy }; export const MicroManagerTiffImagingInterface = PageTemplate.bind({}); -const MicroManagerTiffImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -MicroManagerTiffImagingInterfaceGlobalCopy.interfaces.interface = MicroManagerTiffImagingInterface -MicroManagerTiffImagingInterfaceGlobalCopy.schema.source_data = MicroManagerTiffImagingInterfaceSchema +const MicroManagerTiffImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +MicroManagerTiffImagingInterfaceGlobalCopy.interfaces.interface = MicroManagerTiffImagingInterface; +MicroManagerTiffImagingInterfaceGlobalCopy.schema.source_data = MicroManagerTiffImagingInterfaceSchema; MicroManagerTiffImagingInterface.args = { activePage, globalState: MicroManagerTiffImagingInterfaceGlobalCopy }; export const ScanImageImagingInterface = PageTemplate.bind({}); -const ScanImageImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -ScanImageImagingInterfaceGlobalCopy.interfaces.interface = ScanImageImagingInterface -ScanImageImagingInterfaceGlobalCopy.schema.source_data = ScanImageImagingInterfaceSchema +const ScanImageImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +ScanImageImagingInterfaceGlobalCopy.interfaces.interface = ScanImageImagingInterface; +ScanImageImagingInterfaceGlobalCopy.schema.source_data = ScanImageImagingInterfaceSchema; ScanImageImagingInterface.args = { activePage, globalState: ScanImageImagingInterfaceGlobalCopy }; export const TiffImagingInterface = PageTemplate.bind({}); -const TiffImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -TiffImagingInterfaceGlobalCopy.interfaces.interface = TiffImagingInterface -TiffImagingInterfaceGlobalCopy.schema.source_data = TiffImagingInterfaceSchema +const TiffImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +TiffImagingInterfaceGlobalCopy.interfaces.interface = TiffImagingInterface; +TiffImagingInterfaceGlobalCopy.schema.source_data = TiffImagingInterfaceSchema; TiffImagingInterface.args = { activePage, globalState: TiffImagingInterfaceGlobalCopy }; export const MiniscopeImagingInterface = PageTemplate.bind({}); -const MiniscopeImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -MiniscopeImagingInterfaceGlobalCopy.interfaces.interface = MiniscopeImagingInterface -MiniscopeImagingInterfaceGlobalCopy.schema.source_data = MiniscopeImagingInterfaceSchema +const MiniscopeImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +MiniscopeImagingInterfaceGlobalCopy.interfaces.interface = MiniscopeImagingInterface; +MiniscopeImagingInterfaceGlobalCopy.schema.source_data = MiniscopeImagingInterfaceSchema; MiniscopeImagingInterface.args = { activePage, globalState: MiniscopeImagingInterfaceGlobalCopy }; export const SbxImagingInterface = PageTemplate.bind({}); -const SbxImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -SbxImagingInterfaceGlobalCopy.interfaces.interface = SbxImagingInterface -SbxImagingInterfaceGlobalCopy.schema.source_data = SbxImagingInterfaceSchema +const SbxImagingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +SbxImagingInterfaceGlobalCopy.interfaces.interface = SbxImagingInterface; +SbxImagingInterfaceGlobalCopy.schema.source_data = SbxImagingInterfaceSchema; SbxImagingInterface.args = { activePage, globalState: SbxImagingInterfaceGlobalCopy }; export const CaimanSegmentationInterface = PageTemplate.bind({}); -const CaimanSegmentationInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -CaimanSegmentationInterfaceGlobalCopy.interfaces.interface = CaimanSegmentationInterface -CaimanSegmentationInterfaceGlobalCopy.schema.source_data = CaimanSegmentationInterfaceSchema +const CaimanSegmentationInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +CaimanSegmentationInterfaceGlobalCopy.interfaces.interface = CaimanSegmentationInterface; +CaimanSegmentationInterfaceGlobalCopy.schema.source_data = CaimanSegmentationInterfaceSchema; CaimanSegmentationInterface.args = { activePage, globalState: CaimanSegmentationInterfaceGlobalCopy }; export const MCSRawRecordingInterface = PageTemplate.bind({}); -const MCSRawRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -MCSRawRecordingInterfaceGlobalCopy.interfaces.interface = MCSRawRecordingInterface -MCSRawRecordingInterfaceGlobalCopy.schema.source_data = MCSRawRecordingInterfaceSchema +const MCSRawRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +MCSRawRecordingInterfaceGlobalCopy.interfaces.interface = MCSRawRecordingInterface; +MCSRawRecordingInterfaceGlobalCopy.schema.source_data = MCSRawRecordingInterfaceSchema; MCSRawRecordingInterface.args = { activePage, globalState: MCSRawRecordingInterfaceGlobalCopy }; export const MEArecRecordingInterface = PageTemplate.bind({}); -const MEArecRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)) -MEArecRecordingInterfaceGlobalCopy.interfaces.interface = MEArecRecordingInterface -MEArecRecordingInterfaceGlobalCopy.schema.source_data = MEArecRecordingInterfaceSchema +const MEArecRecordingInterfaceGlobalCopy = JSON.parse(JSON.stringify(globalState)); +MEArecRecordingInterfaceGlobalCopy.interfaces.interface = MEArecRecordingInterface; +MEArecRecordingInterfaceGlobalCopy.schema.source_data = MEArecRecordingInterfaceSchema; MEArecRecordingInterface.args = { activePage, globalState: MEArecRecordingInterfaceGlobalCopy }; - From 717b3a36b5058e100f2a66520a5d4e4734d34392 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:21:13 -0400 Subject: [PATCH 9/9] fix bad conflict resolution --- src/renderer/src/stories/JSONSchemaForm.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/stories/JSONSchemaForm.js b/src/renderer/src/stories/JSONSchemaForm.js index a20a4f346..334a03ed6 100644 --- a/src/renderer/src/stories/JSONSchemaForm.js +++ b/src/renderer/src/stories/JSONSchemaForm.js @@ -624,9 +624,9 @@ export class JSONSchemaForm extends LitElement { } // Clear old errors and warnings - this.#clearMessages(fullPath, "errors"); - this.#clearMessages(fullPath, "warnings"); - this.#clearMessages(fullPath, "info"); + this.#clearMessages(localPath, "errors"); + this.#clearMessages(localPath, "warnings"); + this.#clearMessages(localPath, "info"); const isFunction = typeof valid === "function"; const isValid = @@ -643,8 +643,8 @@ export class JSONSchemaForm extends LitElement { this.checkStatus(); // Show aggregated errors and warnings (if any) - warnings.forEach((info) => this.#addMessage(fullPath, info, "warnings")); - info.forEach((info) => this.#addMessage(fullPath, info, "info")); + warnings.forEach((info) => this.#addMessage(localPath, info, "warnings")); + info.forEach((info) => this.#addMessage(localPath, info, "info")); if (isValid && errors.length === 0) { element.classList.remove("invalid");