Merge pull request #129 from HerrZatacke/develop

Develop
HerrZatacke · Apr 1, 2024 · 4ec21bc · 4ec21bc
2 parents 143ed2c + 7cd42c3
commit 4ec21bc
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 57 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gb-printer-web",
-  "version": "1.34.2",
+  "version": "1.34.3",
   "description": "gb-printer-web",
   "scripts": {
     "start": "webpack serve --config ./scripts/webpack.dev.js",

diff --git a/src/javascript/tools/getGetSettings/index.js b/src/javascript/tools/getGetSettings/index.js
@@ -4,6 +4,7 @@ import getFrames from './getFrames';
 import getImageHashesForExport from './getImageHashesForExport';
 import getFrameHashesForExport from './getFrameHashesForExport';
 import { getEnv } from '../getEnv';
+import getFrameGroups from '../getFrameGroups';
 
 const getGetSettings = (store) => (what, { lastUpdateUTC, selectedFrameGroup } = {}) => {
 
@@ -39,6 +40,11 @@ const getGetSettings = (store) => (what, { lastUpdateUTC, selectedFrameGroup } =
         ));
       }
 
+      // Remove unused framegroups from export
+      if (key === 'frameGroupNames' && what !== 'debug') {
+        exportableState[key] = getFrameGroups(exportableState.frames, exportableState[key]);
+      }
+
       if (key === 'frameGroupNames' && what === 'framegroup') {
         exportableState[key] = exportableState[key].filter((group) => group.id === frameSetID);
       }