#699 added automatic script groups based on sub-folders

Author: bugy

src/model/script_config.py

@@ -370,7 +370,7 @@ def read_short(file_path, json_object, group_by_folders: bool, script_configs_fo
     allowed_users = json_object.get('allowed_users')
     admin_users = json_object.get('admin_users')
     group = read_str_from_config(json_object, 'group', blank_to_none=True)
-    if not group and group_by_folders:
+    if ('group' not in json_object) and group_by_folders:
         relative_path = file_utils.relative_path(file_path, script_configs_folder)
         while os.path.dirname(relative_path):
             relative_path = os.path.dirname(relative_path)

src/tests/config_service_test.py

@@ -126,8 +126,11 @@ def test_load_config_with_slash_in_name(self):
     def test_list_configs_when_multiple_subfolders_and_symlink(self):
         def create_config_file(name, relative_path, group=None):
             filename = os.path.basename(relative_path)
+            config = {'name': name}
+            if group is not None:
+                config['group'] = group
             test_utils.write_script_config(
-                {'name': name, 'group': group},
+                config,
                 filename,
                 config_folder=os.path.join(test_utils.temp_folder, 'runners', os.path.dirname(relative_path)))
 
@@ -139,6 +142,7 @@ def create_config_file(name, relative_path, group=None):
             create_config_file('conf A', 'conf_a.json')
             create_config_file('conf B', os.path.join('b', 'conf_b.json'))
             create_config_file('conf C', os.path.join('c', 'conf_c.json'), group='test group')
+            create_config_file('conf D', os.path.join('d', 'conf_d.json'), group='')
 
             configs = self.config_service.list_configs(self.user)
             actual_name_group_map = {c.name: c.group for c in configs}
@@ -150,7 +154,8 @@ def create_config_file(name, relative_path, group=None):
                  'conf Z': 'sub',
                  'conf A': None,
                  'conf B': 'b',
-                 'conf C': 'test group'},
+                 'conf C': 'test group',
+                 'conf D': None},
             )
 
     def tearDown(self):