#127,#241 added possibility to create new script configs

src/config/config_service.py

@@ -22,9 +22,14 @@ def _script_name_to_file_name(script_name):
 def _preprocess_incoming_config(config):
     name = config.get('name')
     if is_blank(name):
-        raise InvalidConfigException('Name is a required parameter for script')
+        raise InvalidConfigException('Script name is required')
     config['name'] = name.strip()
 
+    script_path = config.get('script_path')
+    if is_blank(script_path):
+        raise InvalidConfigException('Script path is required')
+    config['script_path'] = script_path.strip()
+
 
 class ConfigService:
     def __init__(self, authorizer, conf_folder) -> None:

src/tests/config_service_test.py

@@ -175,6 +175,21 @@ def test_strip_name(self):
         config['name'] = 'conf1'
         _validate_config(self, 'conf1.json', config)
 
+    def test_blank_script_path(self):
+        config = _prepare_script_config_object('Conf X', description='My wonderful test config')
+        config['script_path'] = '   '
+
+        self.assertRaises(InvalidConfigException, self.config_service.create_config,
+                          self.admin_user, config)
+
+    def test_strip_script_path(self):
+        config = _prepare_script_config_object('Conf X', description='My wonderful test config')
+        config['script_path'] = '  my_script.sh\t \t'
+
+        self.config_service.create_config(self.admin_user, config)
+        config['script_path'] = 'my_script.sh'
+        _validate_config(self, 'Conf_X.json', config)
+
     def test_name_already_exists(self):
         _create_script_config_file('confX', name='confX')
         config = _prepare_script_config_object('confX', description='My wonderful test config')
@@ -261,6 +276,21 @@ def test_strip_name(self):
         config['name'] = 'Conf X'
         _validate_config(self, 'confX.json', config)
 
+    def test_blank_script_path(self):
+        config = _prepare_script_config_object('Conf X', description='My wonderful test config')
+        config['script_path'] = '   '
+
+        self.assertRaises(InvalidConfigException, self.config_service.update_config,
+                          self.admin_user, config, 'confX.json')
+
+    def test_strip_script_path(self):
+        config = _prepare_script_config_object('Conf X', description='My wonderful test config')
+        config['script_path'] = '  my_script.sh\t \t'
+
+        self.config_service.update_config(self.admin_user, config, 'confX.json')
+        config['script_path'] = 'my_script.sh'
+        _validate_config(self, 'confX.json', config)
+
     def test_name_already_exists(self):
         config = _prepare_script_config_object('Conf Y', description='My wonderful test config')
 
@@ -370,7 +400,7 @@ def _validate_config(test_case, expected_filename, expected_body):
 
 
 def _prepare_script_config_object(name, **kwargs):
-    config = {'name': name}
+    config = {'name': name, 'script_path': name + '.sh'}
 
     if kwargs:
         config.update(kwargs)

src/web/server.py

@@ -200,7 +200,7 @@ def post(self, user):
         try:
             self.application.config_service.create_config(user, config)
         except (InvalidConfigException) as e:
-            raise tornado.web.HTTPError(422, str(e))
+            raise tornado.web.HTTPError(422, reason=str(e))
 
     @requires_admin_rights
     @inject_user

web-src/js/admin/components/PromisableButton.vue

@@ -21,6 +21,8 @@
 </template>
 
 <script>
+    import {isEmptyString} from '../../common';
+
     export default {
         name: 'PromisableButton',
         props: {
@@ -47,8 +49,12 @@
                     this.error = null;
                     this.inProgress = false;
                 })
-                    .catch(() => {
-                        this.error = 'Failed to ' + this.title;
+                    .catch((e) => {
+                        if (!isEmptyString(e.userMessage)) {
+                            this.error = e.userMessage;
+                        } else {
+                            this.error = 'Failed to ' + this.title;
+                        }
                         this.inProgress = false;
                     })
             }

web-src/js/admin/scripts-config/ScriptsList.vue

@@ -1,16 +1,25 @@
 <template>
-    <div class="collection container scripts-list">
+    <div class="container scripts-list">
         <PageProgress v-if="loading"/>
-        <router-link :key="script" :to="script" append class="collection-item" v-else
-                     v-for="script in scripts">
-            {{script}}
-        </router-link>
+        <div v-else>
+            <router-link :to="newScriptPath" append class="waves-effect waves-light btn add-script-btn">
+                <i class="material-icons left">add</i>
+                Add
+            </router-link>
+            <div class="collection">
+                <router-link :key="script" :to="script" append class="collection-item"
+                             v-for="script in scripts">
+                    {{script}}
+                </router-link>
+            </div>
+        </div>
     </div>
 </template>
 
 <script>
     import {mapActions, mapState} from 'vuex';
     import PageProgress from '../components/PageProgress';
+    import {NEW_SCRIPT} from './script-config-module';
 
     export default {
         name: 'ScriptsList',
@@ -19,6 +28,12 @@
             this.init();
         },
 
+        data() {
+            return {
+                newScriptPath: NEW_SCRIPT
+            }
+        },
+
         computed: {
             ...mapState('scripts', {
                 scripts: 'scripts',
@@ -41,4 +56,8 @@
         margin-top: 1.5em;
         margin-bottom: 1em;
     }
+
+    .add-script-btn {
+        margin-bottom: 1em;
+    }
 </style>

web-src/js/admin/scripts-config/script-config-module.js

@@ -21,16 +21,23 @@ function removeEmptyValues(config) {
     }
 }
 
+export const NEW_SCRIPT = '_new';
+
 export default {
     state: {
         scriptName: null,
         scriptConfig: null,
         scriptFilename: null,
-        error: null
+        error: null,
+        new: false
     },
     namespaced: true,
     actions: {
         init({commit, state}, scriptName) {
+            if (scriptName === NEW_SCRIPT) {
+                commit('INIT_NEW_SCRIPT');
+                return;
+            }
             commit('RESET', scriptName);
 
             axios.get('admin/scripts/' + scriptName)
@@ -48,7 +55,9 @@ export default {
 
             removeEmptyValues(config);
 
-            return axios.put('admin/scripts', {
+            const axiosAction = state.new ? axios.post : axios.put;
+
+            return axiosAction('admin/scripts', {
                 config,
                 filename: state.scriptFilename
             })
@@ -62,6 +71,12 @@ export default {
                             path: `/scripts/${newName}`
                         });
                     }
+                })
+                .catch(e => {
+                    if (e.response.status === 422) {
+                        e.userMessage = e.response.data;
+                    }
+                    throw e;
                 });
         }
     },
@@ -71,18 +86,28 @@ export default {
             state.scriptConfig = null;
             state.scriptFilename = null;
             state.error = null;
+            state.new = false;
         },
 
         SET_SCRIPT_CONFIG(state, {config, filename}) {
             state.error = null;
             state.scriptConfig = config;
             state.scriptFilename = filename;
+            state.new = false;
         },
 
         SET_LOAD_ERROR(state, error) {
             state.error = error;
             state.scriptConfig = null;
             state.scriptFilename = null;
+        },
+
+        INIT_NEW_SCRIPT(state) {
+            state.scriptName = null;
+            state.scriptConfig = {parameters: []};
+            state.new = true;
+            state.scriptFilename = null;
+            state.error = null;
         }
     }
 }