diff --git a/.gitignore b/.gitignore
index 4b8779f..f31bc6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ docs/_build/
docs/source/autoapi/
docs/source/modules/autogen/
scripts/settings_page.html
+.vite
diff --git a/scripts/settings/index.html b/scripts/settings/index.html
index b0cfa48..22ff169 100644
--- a/scripts/settings/index.html
+++ b/scripts/settings/index.html
@@ -1,19 +1,3 @@
-
-
-
-
-
-
-
-
-
- Auto Archiver Settings
-
-
+
-
-
diff --git a/scripts/settings/src/App.tsx b/scripts/settings/src/App.tsx
index 55ff5dd..511e602 100644
--- a/scripts/settings/src/App.tsx
+++ b/scripts/settings/src/App.tsx
@@ -282,10 +282,7 @@ export default function App() {
let existingSteps = finalYamlFile.getIn(['steps', stepType]) as YAMLSeq;
stepsConfig[stepType].forEach(([name, enabled]: [string, boolean]) => {
let index = existingSteps.items.findIndex((item) => {
- return item.value === name
- });
- let commentIndex = existingSteps.items.findIndex((item) => {
- return item.comment?.indexOf(name) || item.commentBefore?.indexOf()
+ return (item.value || item) === name
});
let stepItem = finalYamlFile.getIn(['steps', stepType], true) as YAMLSeq;
@@ -300,6 +297,11 @@ export default function App() {
finalYamlFile.setIn(['steps', stepType], stepItem);
}
});
+ // sort the items
+ existingSteps.items.sort((a: Scalar | string, b: Scalar | string) => {
+ return (stepsConfig[stepType].findIndex((val: [string, boolean]) => {return val[0] === (a.value || a)}) -
+ stepsConfig[stepType].findIndex((val: [string, boolean]) => {return val[0] === (b.value || b)}))
+ });
existingSteps.flow = existingSteps.items.length ? false : true;
});
@@ -313,8 +315,6 @@ export default function App() {
Object.keys(configValues[module_name]).forEach((config_name: string) => {
let existingConfigYAML = existingConfig.get(config_name, true) as Scalar;
if (existingConfigYAML) {
- console.log(existingConfigYAML.comment);
- console.log(existingConfigYAML.commentBefore);
existingConfigYAML.value = configValues[module_name][config_name];
existingConfig.set(config_name, existingConfigYAML);
} else {
diff --git a/scripts/settings/src/StepCard.tsx b/scripts/settings/src/StepCard.tsx
index 1d0014a..f8a55b5 100644
--- a/scripts/settings/src/StepCard.tsx
+++ b/scripts/settings/src/StepCard.tsx
@@ -146,7 +146,8 @@ function ConfigField({ config_value, module, configValues }: { config_value: any
(
config_args.choices !== undefined ?