fix for frontend parsing settings

.github/workflows/autoupdate.yml

@@ -0,0 +1,35 @@
+on: "pull_request_target"
+
+permissions:
+  pull-requests: "write"
+  contents: "write"
+
+jobs:
+  dependabot:
+    runs-on: "ubuntu-latest"
+    # Checking the actor will prevent your Action run failing on non-Dependabot
+    # PRs but also ensures that it only does work for Dependabot PRs.
+    if: "${{ github.actor == 'dependabot[bot]' }}"
+    steps:
+      # This first step will fail if there's no metadata and so the approval
+      # will not occur.
+      - name: "Dependabot metadata"
+        id: "dependabot-metadata"
+        uses: "dependabot/fetch-metadata@v1"
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      # Here the PR gets approved.
+      - uses: "actions/checkout@v4"
+      - name: "Approve a PR"
+        run: "gh pr review --approve $PR_URL"
+        env:
+          PR_URL: "${{ github.event.pull_request.html_url }}"
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      # Finally, this sets the PR to allow auto-merging for patch and minor
+      # updates if all checks pass
+      - name: "Enable auto-merge for Dependabot PRs"
+        #if: "${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}"
+        run: "gh pr merge --auto --squash $PR_URL"
+        env:
+          PR_URL: "${{ github.event.pull_request.html_url }}"
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/build.yml

@@ -1,5 +1,3 @@
-name: "build"
-
 on:
   push:
     branches:

.github/workflows/deploy.yml

@@ -1,51 +1,40 @@
-name: "maybe deploy"
-
 on:
-  workflow_run:
+  push:
-    workflows: [ "build" ]
+    tags:
-    types: [ "completed" ]
+      - "v**"
-    branches: [ "master" ]
+  workflow_dispatch:
-
 
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
   contents: "write"
+  pages: "write"
+  id-token: "write"
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
 
 jobs:
-  check-early-exit:
-    runs-on: "ubuntu-latest"
-    outputs:
-      should-deploy: "${{ steps.check-early-exit.outputs.should-deploy }}"
-    steps:
-      - run: |
-          if [ "${{ github.event.workflow_run.conclusion }}" != "success" ]; then
-            echo "Not deploying because the CI workflow did not succeed."
-            echo "should-deploy=false" >> $GITHUB_ENV
-          elif ! echo "${{ github.ref }}" | grep -q -E "^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+.*"; then
-            echo "Not deploying because the CI workflow was not triggered by a release tag."
-            echo "should-deploy=false" >> $GITHUB_ENV
-          else
-            echo "should-deploy=true" >> $GITHUB_ENV
-          fi
   deploy:
-    concurrency: "ci-${{ github.ref }}" # Recommended if you intend to make multiple deployments in quick succession.
     runs-on: "ubuntu-latest"
-    needs: "check-early-exit"
+    environment:
-    if: "needs.check-early-exit.outputs.should-deploy == 'true'"
+      name: "github-pages"
+      url: "${{ steps.deployment.outputs.page_url }}"
     steps:
       - uses: "dawidd6/action-download-artifact@v3"
         with:
-          workflow: "ci.yml"
+          workflow: "build.yml"
           name: "frontend"
           path: "./public"
+          allow_forks: false
       - uses: "dawidd6/action-download-artifact@v3"
         with:
-          workflow: "ci.yml"
+          workflow: "build.yml"
           name: "logo"
           path: "./public"
-      - run: "ls -l -R ./public"
+          allow_forks: false
-      - uses: "JamesIves/github-pages-deploy-action@v4"
-        with:
-          folder: "public"
       - uses: "svenstaro/upload-release-action@v2"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
@@ -54,4 +43,10 @@ jobs:
           tag: "${{ github.ref }}"
           overwrite: true
           file_glob: true
+      - uses: "actions/configure-pages@v4"
+      - uses: "actions/upload-pages-artifact@v3"
+        with:
+          path: 'public'
+      - id: "deployment"
+        uses: "actions/deploy-pages@v4"
 

README.md

@@ -14,17 +14,17 @@ in a web browser.
 - Control clipping planes and transparency of each model.
 - Select any entity and measure bounding box size and distances.
 - Fully-featured [static deployment](#static-deployment): just upload the viewer and models to your server.
-- [Live lazy updates](#live-updates) while editing the CAD model (using the [yacv_server](yacv_server)).
+- [Live lazy updates](#live-updates) while editing the CAD model (using the `yacv-server` package).
 
 ## Usage & demo
 
-The latest build is available at https://yeicor-3d.github.io/yet-another-cad-viewer/.
+The [logo](yacv_server/logo.py) also works as an example of how to use the viewer.
 
 ### Live updates
 
 To see the live updates you will need to run the [yacv_server](yacv_server) and
 open [the viewer](https://yeicor-3d.github.io/yet-another-cad-viewer/) with
-the `preloadModels=ws://<host>:32323/` query parameter (by default it already tries localhost).
+the `preload=ws://<host>:32323/` query parameter (by default it already tries localhost).
 
 Note that [yacv_server](yacv_server) also hosts the frontend at `http://localhost:32323/` if you have no access to the
 internet.
@@ -32,13 +32,13 @@ internet.
 ### Static deployment
 
 To deploy the viewer and models as a static website you can simply copy the latest build directory to your server.
-To load models use the `preloadModels=...` query parameter in the URL.
+To load models use the `preload=...` query parameter in the URL.
 It can be set multiple times to load multiple models.
 
 Note that you can simply reuse the [main deployment](https://yeicor-3d.github.io/yet-another-cad-viewer/) and host only
-your own models (linking them from the viewer with the `preloadModels` query parameter).
+your own models (linking them from the viewer with the `preload` query parameter).
 
 To see a working example of a static deployment you can check out
-the [demo](https://yeicor-3d.github.io/yet-another-cad-viewer/?preloadModels=base.glb&preloadModels=fox.glb&preloadModels=img.jpg.glb&preloadModels=location.glb).
+the [demo](https://yeicor-3d.github.io/yet-another-cad-viewer/?preload=base.glb&preload=fox.glb&preload=img.jpg.glb&preload=location.glb).
 
 ![Demo](assets/screenshot.png)

frontend/App.vue

@@ -46,7 +46,7 @@ async function onModelRemoveRequest(name: string) {
 let networkMgr = new NetworkManager();
 networkMgr.addEventListener('update', (e) => onModelLoadRequest(e as NetworkUpdateEvent));
 // Start loading all configured models ASAP
-for (let model of settings.preloadModels) {
+for (let model of settings.preload) {
   networkMgr.load(model);
 }
 

frontend/misc/settings.ts

@@ -1,6 +1,6 @@
 // These are the default values for the settings, which are overridden below
 export const settings = {
-    preloadModels: [
+    preload: [
         // @ts-ignore
         // new URL('../../assets/fox.glb', import.meta.url).href,
         // @ts-ignore
@@ -29,15 +29,19 @@ function parseSetting(name: string, value: string): any {
     if (arrayElem) name = name.slice(0, -2);
     let prevValue = (settings as any)[name];
     if (prevValue === undefined) throw new Error(`Unknown setting: ${name}`);
-    if (Array.isArray(prevValue) && !arrayElem) {
+    if (Array.isArray(prevValue)) {
-        let toExtend = []
+        if (!arrayElem) {
-        if (!firstTimeNames.includes(name)) {
+            let toExtend = []
-            firstTimeNames.push(name);
+            if (!firstTimeNames.includes(name)) {
+                firstTimeNames.push(name);
+            } else {
+                toExtend = prevValue;
+            }
+            toExtend.push(parseSetting(name + ".0", value));
+            return toExtend;
         } else {
-            toExtend = prevValue;
+            prevValue = prevValue[0];
         }
-        toExtend.push(parseSetting(name + ".0", value));
-        return toExtend;
     }
     switch (typeof prevValue) {
         case 'boolean':
@@ -47,7 +51,7 @@ function parseSetting(name: string, value: string): any {
         case 'string':
             return value;
         default:
-            throw new Error(`Unknown setting type: ${typeof prevValue}`);
+            throw new Error(`Unknown setting type: ${typeof prevValue} -- ${prevValue}`);
     }
 }
 

vite.config.ts

@@ -6,6 +6,7 @@ import vueJsx from '@vitejs/plugin-vue-jsx'
 
 // https://vitejs.dev/config/
 export default defineConfig({
+    base: "",
     plugins: [
         vue({
             template: {