Merge pull request #284 from fairdataihub/staging

feat: 13.1.0 release

.github/workflows/Build-and-deploy-linux.yml

@@ -1,5 +1,5 @@
 name: Build-and-deploy-linux
-run-name: ${{ github.actor }} is building a linux release for SODA - should work
+run-name: ${{ github.actor }} is building a linux release for SODA
 
 on:
   push:
@@ -36,15 +36,11 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.14.0"
+          node-version: "20.8.0"
 
       - name: Install package.json modules and their dependencies
         run: npm install --ignore-scripts
 
-      - name: Build the python server executable
-        run: |
-          npm run python-onefile-build-unix
-
       - name: Deploy the app to GitHub
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Build-and-deploy-mac.yml

@@ -30,13 +30,13 @@ jobs:
           auto-update-conda: true
           auto-activate-base: false
       - run: |
-          conda activate env-electron-python
+          conda activate  env-electron-python
           conda info
           conda list
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.14.0"
+          node-version: "18.16.0"
 
       - name: Install package.json modules and their dependencies
         run: npm install --ignore-scripts
@@ -46,10 +46,6 @@ jobs:
           p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }}
           p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }}
 
-      - name: Build the python server executable
-        run: |
-          npm run python-onefile-build-unix
-
       - name: Deploy the app to GitHub
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Build-and-deploy-win.yml

@@ -30,21 +30,17 @@ jobs:
           auto-update-conda: true
           auto-activate-base: false
       - run: |
-          conda activate env-electron-python
+          conda activate  env-electron-python
           conda info
           conda list
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.14.0"
+          node-version: "20.8.0"
 
       - name: Install package.json modules and their dependencies
         run: npm install --ignore-scripts
 
-      - name: Build the python server executable
-        run: |
-          npm run python-onefile-build-win
-
       - name: Deploy the app to GitHub
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -2,6 +2,7 @@
 *~
 
 # Ignore node_modules folder
+out
 node_modules
 build/api
 pysodadist
@@ -12,14 +13,15 @@ src/Users
 semantic
 semantic.json
 .env
-build/
+
+*.log*
+__pycache__
 
 app.spec
 
 *.pyc
 src/.DS_Store
 .DS_Store
-electron-builder.yml
 website/.eslintcache
 website/images-bhavesh/~$suggestions.pptx
 website/package-lock.json
@@ -34,4 +36,5 @@ src/build
 .env.production
 access_token.txt
 
-.vscode
+.vscode
+

CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to SODA will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v.13.0.0 - 2024-01-29
+
+## Feature Additions:
+
+- Users can generate datasets on their computer/local device in Guided Mode without having to sign in with a Pennsieve account.
+- Pennsieve API Key names are more unique to resolve myriad of issues that come from having multiple users on one computer and from having one user with acccounts across multiple computers.
+- Switching workspaces resets FFM UI to default state.
+
+## Bug fixes:
+
+- Fixed issue preventing users from generating metadata files locally without a Pennsieve account in Free Form Mode.
+
+## v.13.0.0 - 2024-01-22
+
+## Feature Additions:
+
+- SODA added the ability for users to generate a local copy of their datasets for review to Guided Mode. This should assist users in ensuring their dataset is organized per their criteria before commiting to uploading their dataset to Pennsieve.
+- SODA has been converted to ESM and is using Electron-Vite for bundling.
+
 ## v.12.5.0 - 2023-01-04
 
 ## Feature Additions:

electron-builder.yml

@@ -0,0 +1,61 @@
+appId: com.fairdataihub.sodaforsparc
+productName: SODA for SPARC
+directories:
+  buildResources: build
+files:
+  - "!**/.vscode/*"
+  - "!src/main/*"
+  - "!src/renderer/*"
+  - "!src/preload/*"
+  - "!electron.vite.config.{js,ts,mjs,cjs}"
+  - "!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}"
+  - "!{.env,.env.*,.npmrc,pnpm-lock.yaml}"
+asarUnpack:
+  - resources/**
+win:
+  icon: "app-icon/win/icon.ico"
+  executableName: SODA for SPARC
+  extraResources:
+    - from: ./file_templates
+      to: ./file_templates
+    - from: ./pyflaskdist/app.exe
+  asar: true
+  target:
+    - nsis
+nsis:
+  artifactName: ${name}-${version}-setup.${ext}
+  shortcutName: ${productName}
+  uninstallDisplayName: ${productName}
+  createDesktopShortcut: always
+mac:
+  icon: "app-icon/png/icon.png"
+  entitlementsInherit: ./entitlements.mac.inherit.plist
+  notarize: true
+  extraResources:
+    - from: ./pyflaskdist/app
+    - from: ./file_templates
+      to: ./file_templates
+    - from: ./pennsieve-io-chain.pem
+      to: ./pennsieve-io-chain.pem
+dmg:
+  artifactName: ${name}-${version}.${ext}
+linux:
+  target:
+    - AppImage
+  extraResources:
+    - from: ./pyflaskdist/app
+    - from: ./file_templates
+      to: ./file_templates
+    - from: ./pennsieve-io-chain.pem
+      to: ./pennsieve-io-chain.pem
+  asar: true
+  maintainer: electronjs.org
+  category: Utility
+  icon: "icons/icon.png"
+appImage:
+  artifactName: ${name}-${version}.${ext}
+npmRebuild: false
+publish:
+  - provider: github
+    protocol: https
+afterSign: ./notarize.js