From aad84f0b05e37e99366dfab31c83ea03df938e32 Mon Sep 17 00:00:00 2001 From: Nathan Vieira Marcelino Date: Fri, 19 Jul 2024 15:07:27 -0300 Subject: [PATCH 1/6] feat: use new vame version --- .github/workflows/build-and-release-linux.yml | 9 ++------- .github/workflows/build-and-release-mac.yml | 9 ++------- .github/workflows/build-and-release-win.yml | 7 +------ .github/workflows/test-build-linux.yml | 2 +- .github/workflows/test-build-mac.yml | 2 +- .github/workflows/test-build-win.yml | 2 +- src/renderer/src/@types/index.d.ts | 1 + .../components/DynamicForm/DynamicInput.tsx | 2 ++ .../src/components/DynamicForm/index.tsx | 11 ++++++++++- .../src/components/DynamicForm/styles.ts | 2 +- src/renderer/src/context/Projects/index.tsx | 1 + .../pages/Project/Tabs/CommunityAnalysis.tsx | 5 +++-- .../pages/Project/Tabs/CommunityVideos.tsx | 17 +++++++++++------ src/renderer/src/pages/Project/Tabs/Model.tsx | 4 ++-- .../src/pages/Project/Tabs/MotifVideos.tsx | 19 ++++++++++++------- .../src/pages/Project/Tabs/Organize.tsx | 2 +- .../Project/Tabs/ProjectConfiguration.tsx | 2 +- .../src/pages/Project/Tabs/Segmentation.tsx | 2 +- .../pages/Project/Tabs/UMAPVisualization.tsx | 17 +++++++++++------ src/renderer/src/pages/Project/index.tsx | 12 ++++++++---- .../src/utils/extractDefaultValues.ts | 2 +- src/schema/community-videos.schema.json | 13 +++++++++++++ src/schema/community.schema.json | 5 +++++ src/schema/config.schema.json | 9 ++++++--- src/schema/motif-videos.schema.json | 13 +++++++++++++ src/schema/umap.schema.json | 14 ++++++++++++++ 26 files changed, 125 insertions(+), 59 deletions(-) create mode 100644 src/schema/community-videos.schema.json create mode 100644 src/schema/motif-videos.schema.json create mode 100644 src/schema/umap.schema.json diff --git a/.github/workflows/build-and-release-linux.yml b/.github/workflows/build-and-release-linux.yml index b924117..54e9cbf 100644 --- a/.github/workflows/build-and-release-linux.yml +++ b/.github/workflows/build-and-release-linux.yml @@ -38,12 +38,7 @@ jobs: - name: Install dependencies run: npm install - - name: Build + - name: Build and deploy on Linux(Debian) env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run build:linux - - - name: Deploy Linux - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run publish -- --publish=always + run: npm run build:linux --publish=always diff --git a/.github/workflows/build-and-release-mac.yml b/.github/workflows/build-and-release-mac.yml index ea5a2f3..0f6417d 100644 --- a/.github/workflows/build-and-release-mac.yml +++ b/.github/workflows/build-and-release-mac.yml @@ -43,12 +43,7 @@ jobs: p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }} p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }} - - name: Build Mac + - name: Build and deploy on MacOS env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run build:mac - - - name: Deploy Mac - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run publish -- --publish=always \ No newline at end of file + run: npm run build:mac -- --publish=always diff --git a/.github/workflows/build-and-release-win.yml b/.github/workflows/build-and-release-win.yml index 29fa425..15d65b9 100644 --- a/.github/workflows/build-and-release-win.yml +++ b/.github/workflows/build-and-release-win.yml @@ -41,9 +41,4 @@ jobs: - name: Build and deploy on Windows env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run build:win - - - name: Deploy Windows - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run publish -- --publish=always + run: npm run build:win -- --publish=always diff --git a/.github/workflows/test-build-linux.yml b/.github/workflows/test-build-linux.yml index 05f2ab5..3f27188 100644 --- a/.github/workflows/test-build-linux.yml +++ b/.github/workflows/test-build-linux.yml @@ -33,4 +33,4 @@ jobs: run: npm install - name: Build - run: npm run build:linux + run: npm run build:linux -- --publish=never diff --git a/.github/workflows/test-build-mac.yml b/.github/workflows/test-build-mac.yml index b7a0e8f..7739a23 100644 --- a/.github/workflows/test-build-mac.yml +++ b/.github/workflows/test-build-mac.yml @@ -33,4 +33,4 @@ jobs: run: npm install - name: Build and deploy on Mac - run: npm run build:mac \ No newline at end of file + run: npm run build:mac -- --publish=never \ No newline at end of file diff --git a/.github/workflows/test-build-win.yml b/.github/workflows/test-build-win.yml index b54a1a9..911a722 100644 --- a/.github/workflows/test-build-win.yml +++ b/.github/workflows/test-build-win.yml @@ -33,4 +33,4 @@ jobs: run: npm install - name: Build and deploy on Windows - run: npm run build:win + run: npm run build:win -- --publish=never diff --git a/src/renderer/src/@types/index.d.ts b/src/renderer/src/@types/index.d.ts index eee6aff..e5c4554 100644 --- a/src/renderer/src/@types/index.d.ts +++ b/src/renderer/src/@types/index.d.ts @@ -227,6 +227,7 @@ declare global { export type EnumProperty = DefaultPropertyAttrs & { type: "string"; enum: string[]; + multiple?: boolean; default?: string; }; diff --git a/src/renderer/src/components/DynamicForm/DynamicInput.tsx b/src/renderer/src/components/DynamicForm/DynamicInput.tsx index f964b22..8421c1a 100644 --- a/src/renderer/src/components/DynamicForm/DynamicInput.tsx +++ b/src/renderer/src/components/DynamicForm/DynamicInput.tsx @@ -41,9 +41,11 @@ const DynamicInput: React.FC = ({ // Handle select fields if (type === "enum") { + const enumProperty = property as EnumProperty return (