Merge pull request #74 from Geode-solutions/next

Next

.github/workflows/CICD.yaml

@@ -27,7 +27,7 @@ jobs:
     if: needs.semantic.outputs.new_release == 'true'
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-20.04, windows-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -45,6 +45,7 @@ jobs:
           cat package.json
           rm -rf node_modules package-lock.json
           npm install
+          npm run build_microservices
           npm run package
         shell: bash
         env:

.gitignore

@@ -27,10 +27,10 @@ logs
 # Other
 /build
 /dist-electron
-/electron-server/dist_back
-/electron-server/dist_viewer
-/electron-server/venv_back
-/electron-server/venv_viewer
+/electron-server/back/dist
+/electron-server/viewer/dist
+/electron-server/back/venv
+/electron-server/viewer/venv
 /release
 /uploads
 vease-back*

components/ImportFile.vue

@@ -5,7 +5,7 @@
       <v-progress-circular indeterminate size="20" color="white" width="3" />
     </template>
   </v-btn>
-  <v-btn variant="text" @click="$emit('decrement_step')"> Cancel </v-btn>
+  <v-btn variant="text" @click="UIState.setShowStepper(false)"> Cancel </v-btn>
 </template>
 
 <script setup>

components/NewProject.vue

@@ -7,7 +7,7 @@
     class="text-center"
   >
     <v-sheet border="md">
-      <v-card color="#3c9983">
+      <v-card color="primary">
         <v-card-title>
           <h3 class="mt-4">New Project</h3>
         </v-card-title>

components/OpenProject.vue

@@ -6,7 +6,7 @@
     class="text-center"
   >
     <v-sheet border="md">
-      <v-card color="#3c9983">
+      <v-card color="primary">
         <v-card-title>
           <h3 class="mt-4">Open Project</h3>
         </v-card-title>

components/StepImport.vue

@@ -10,6 +10,7 @@ import ObjectSelector from "@geode/opengeodeweb-front/components/ObjectSelector.
 import ImportFile from "@/components/ImportFile.vue";
 
 const files = ref([]);
+const auto_upload = ref(true);
 const input_geode_object = ref("");
 const additional_files = ref([]);
 const supported_feature = "";
@@ -24,17 +25,19 @@ files.value = props.files;
 const stepper_tree = reactive({
   current_step_index: ref(0),
   files,
+  auto_upload,
   input_geode_object,
   supported_feature,
   steps: [
     {
-      step_title: "Please select a file to convert",
+      step_title: "Please select file(s) to import",
       component: {
         component_name: shallowRef(FileSelector),
         component_options: {
           multiple: true,
           supported_feature,
           files,
+          auto_upload,
         },
       },
       chips: computed(() => {

components/TopBar.vue

@@ -52,7 +52,6 @@
 import logo from "@/assets/img/logo.png";
 
 const search = ref("");
-const links = [{ title: "Account", to: "/account" }];
 const userStore = useUserStore();
 const { profileImagePath } = storeToRefs(userStore);
 

electron-builder.json

@@ -13,7 +13,7 @@
     "./vease-viewer*"
   ],
   "linux": {
-    "artifactName": "${productName}.${ext}",
+    "artifactName": "${productName}_${platform}.${ext}",
     "category": "Science",
     "target": [
       "AppImage",
@@ -24,7 +24,7 @@
     ]
   },
   "win": {
-    "artifactName": "${productName}.${ext}",
+    "artifactName": "${productName}_${platform}.${ext}",
     "sign": "./customSign.js",
     "signingHashAlgorithms": [
       "sha256"

electron-server/back/build.ps1

@@ -0,0 +1,9 @@
+echo "Building back microservice"
+$back_path=".\electron-server\back"
+$dist_path="$back_path\dist"
+$venv_path="$back_path\venv"
+. "$venv_path\Scripts\activate"
+$site_packages_path="$venv_path\Lib\site-packages"
+pip install pyinstaller
+pyinstaller --onefile --collect-data opengeodeweb_back --collect-data vease_back "$site_packages_path\vease_back\app.py" --distpath $dist_path -n vease-back --clean
+Copy-Item $dist_path\vease-back.exe .\

electron-server/back/build.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+back_path=./electron-server/back
+dist_path=$back_path/dist
+venv_path=$back_path/venv
+source $venv_path/bin/activate
+site_packages_path=$venv_path/lib/python3.10/site-packages
+pip install pyinstaller
+pyinstaller --onefile --collect-data opengeodeweb_back $site_packages_path/vease_back/app.py --distpath $dist_path -n vease-back --clean
+cp $dist_path/vease-back ./

electron-server/requirements_back.txt → electron-server/back/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile electron-server/requirements_back.in
+#    pip-compile ./electron-server/back/requirements.in
 #
 asgiref==3.8.1
     # via
@@ -25,8 +25,6 @@ click==8.1.7
     #   flask
     #   opengeodeweb-back
     #   vease-back
-colorama==0.4.6
-    # via vease-back
 flask[async]==3.0.3
     # via
     #   flask-cors
@@ -36,14 +34,14 @@ flask-cors==5.0.0
     # via
     #   opengeodeweb-back
     #   vease-back
-geode-background==8.6.1
+geode-background==8.7.0
     # via
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
     #   opengeodeweb-back
     #   vease-back
-geode-common==33.0.4
+geode-common==33.0.9
     # via
     #   geode-background
     #   geode-conversion
@@ -54,33 +52,33 @@ geode-common==33.0.4
     #   geode-viewables
     #   opengeodeweb-back
     #   vease-back
-geode-conversion==6.0.10
+geode-conversion==6.0.14
     # via
     #   geode-explicit
     #   geode-implicit
     #   opengeodeweb-back
     #   vease-back
-geode-explicit==6.1.9
+geode-explicit==6.1.14
     # via
     #   geode-implicit
     #   opengeodeweb-back
     #   vease-back
-geode-implicit==3.2.4
+geode-implicit==3.3.2
     # via
     #   opengeodeweb-back
     #   vease-back
-geode-numerics==5.1.3
+geode-numerics==5.1.8
     # via
     #   geode-implicit
     #   geode-simplex
     #   opengeodeweb-back
     #   vease-back
-geode-simplex==8.2.10
+geode-simplex==8.2.15
     # via
     #   geode-implicit
     #   opengeodeweb-back
     #   vease-back
-geode-viewables==3.0.5
+geode-viewables==3.0.6
     # via
     #   opengeodeweb-back
     #   vease-back
@@ -103,13 +101,13 @@ jsonschema-specifications==2024.10.1
     #   jsonschema
     #   opengeodeweb-back
     #   vease-back
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via
     #   jinja2
     #   opengeodeweb-back
     #   vease-back
     #   werkzeug
-opengeode-core==15.5.0
+opengeode-core==15.6.3
     # via
     #   geode-background
     #   geode-common
@@ -125,41 +123,41 @@ opengeode-core==15.5.0
     #   opengeode-io
     #   opengeodeweb-back
     #   vease-back
-opengeode-geosciences==8.1.0
+opengeode-geosciences==8.1.1
     # via
     #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
     #   opengeodeweb-back
     #   vease-back
-opengeode-geosciencesio==5.2.1
+opengeode-geosciencesio==5.2.3
     # via
     #   geode-implicit
     #   opengeodeweb-back
     #   vease-back
-opengeode-inspector==6.1.4
+opengeode-inspector==6.1.12
     # via
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
     #   opengeodeweb-back
     #   vease-back
-opengeode-io==7.0.3
+opengeode-io==7.0.5
     # via
     #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
     #   opengeodeweb-back
     #   vease-back
-opengeodeweb-back==5.3.1
+opengeodeweb-back==5.3.2
     # via vease-back
 referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
     #   opengeodeweb-back
     #   vease-back
-rpds-py==0.20.0
+rpds-py==0.21.0
     # via
     #   jsonschema
     #   opengeodeweb-back
@@ -170,9 +168,9 @@ typing-extensions==4.12.2
     #   asgiref
     #   opengeodeweb-back
     #   vease-back
-vease-back==1.0.0
-    # via -r electron-server/requirements_back.in
-werkzeug==3.0.4
+vease-back==1.0.1
+    # via -r ./electron-server/back/requirements.in
+werkzeug==3.1.2
     # via
     #   flask
     #   opengeodeweb-back

electron-server/compile.ps1

@@ -0,0 +1,9 @@
+$microservice_name=$args[0]
+echo "Compiling $args requirements"
+$microservice_path=".\electron-server\$microservice_name"
+$venv_path="$microservice_path\venv"
+python -m venv $venv_path
+Remove-Item -Recurse -Force "$microservice_path\requirements.txt" -ErrorAction:SilentlyContinue
+. "$venv_path\Scripts\activate"
+pip install pip-tools
+pip-compile "$microservice_path\requirements.in"

electron-server/compile.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+microservice_name=$1
+echo "Compiling $microservice_name requirements"
+microservice_path="./electron-server/$microservice_name"
+venv_path=$microservice_path/venv
+python3 -m venv $venv_path
+rm -rf $microservice_path/requirements.txt
+source $venv_path/bin/activate
+pip install pip-tools
+pip-compile $microservice_path/requirements.in

electron-server/install.ps1

@@ -0,0 +1,11 @@
+$microservice_name=$args[0]
+echo "Installing $args requirements"
+$microservice_path=".\electron-server\$microservice_name"
+$venv_path="$microservice_path\venv"
+echo "Installing in $venv_path"
+Remove-Item -Recurse -Force $venv_path -ErrorAction:SilentlyContinue
+Remove-Item -Recurse -Force "$microservice_path\dist\" -ErrorAction:SilentlyContinue
+Remove-Item -Recurse -Force "$microservice_path\build\" -ErrorAction:SilentlyContinue
+python -m venv $venv_path
+. "$venv_path\Scripts\activate"
+pip install -r "$microservice_path\requirements.txt"

electron-server/install.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+microservice_name=$1
+echo "Installing $microservice_name requirements"
+microservice_path="./electron-server/$microservice_name"
+venv_path=$microservice_path/venv
+rm -rf $venv_path $microservice_path/dist $microservice_path/build
+python3 -m venv $venv_path
+source $venv_path/bin/activate
+pip install -r $microservice_path/requirements.txt