Merge pull request #870 from fractal-analytics-platform/default-group-configurable

Handled FRACTAL_DEFAULT_GROUP_NAME environment variable

Author: tcompa

.env

@@ -23,3 +23,5 @@ FRACTAL_RUNNER_BACKEND=local
 #NEWS_INFO_PATH=/path/to/news.md
 
 BODY_SIZE_LIMIT=5000000
+
+FRACTAL_DEFAULT_GROUP_NAME=All

.env.development

@@ -20,3 +20,5 @@ LOG_LEVEL_CONSOLE=info
 FRACTAL_RUNNER_BACKEND=local
 #WARNING_BANNER_PATH=/path/to/banner.txt
 #NEWS_INFO_PATH=/path/to/news.md
+
+FRACTAL_DEFAULT_GROUP_NAME=All

.github/workflows/end_to_end_tests.yaml

@@ -73,6 +73,7 @@ jobs:
         run: npx playwright test
         env:
           FRACTAL_RUNNER_BACKEND: local
+          FRACTAL_DEFAULT_GROUP_NAME: All
 
       - name: Archive test results
         if: always()

CHANGELOG.md

@@ -16,6 +16,7 @@
 * Handled user without profile as not verified users (\#862);
 * Added support for oneOf and discriminator (\#867);
 * Added resource filter on admin task and task-group pages (\#867);
+* Handled `FRACTAL_DEFAULT_GROUP_NAME` environment variable, to specify if a default group is used (\#870);
 
 # 1.20.0
 

__tests__/user_utilities.test.js

@@ -1,7 +1,7 @@
 import { it, expect } from 'vitest';
 import {
 	sortUsers,
-	sortGroupByNameAllFirstComparator,
+	getSortGroupByNameAllFirstComparator,
 	sortUserToImportSettings
 } from '$lib/components/admin/user_utilities';
 import { mockGroup, mockUser } from './mock/mock-types';
@@ -43,7 +43,7 @@ it('should sort groups by name, but keeping the All group first', () => {
 		mockGroup({ id: 3, name: 'g3' })
 	];
 
-	groups.sort(sortGroupByNameAllFirstComparator);
+	groups.sort(getSortGroupByNameAllFirstComparator('All'));
 
 	expect(groups[0].name).eq('All');
 	expect(groups[1].name).eq('g2');

__tests__/v2/AddSingleTask.test.js

@@ -33,7 +33,8 @@ describe('AddSingleTask', () => {
 		render(AddSingleTask, {
 			props: {
 				user: mockedUser,
-				addNewTasks: vi.fn()
+				addNewTasks: vi.fn(),
+				defaultGroupName: 'All'
 			}
 		});
 
@@ -68,7 +69,8 @@ describe('AddSingleTask', () => {
 		render(AddSingleTask, {
 			props: {
 				user: mockedUser,
-				addNewTasks: vi.fn()
+				addNewTasks: vi.fn(),
+				defaultGroupName: 'All'
 			}
 		});
 

__tests__/v2/TaskCollection.test.js

@@ -62,7 +62,7 @@ describe('TaskCollection', () => {
 			});
 
 		render(TaskCollection, {
-			props: { user: mockedUser }
+			props: { user: mockedUser, defaultGroupName: 'All' }
 		});
 
 		await user.type(screen.getByRole('textbox', { name: 'Package' }), 'test-task');
@@ -94,7 +94,7 @@ describe('TaskCollection', () => {
 			});
 
 		render(TaskCollection, {
-			props: { user: mockedUser }
+			props: { user: mockedUser, defaultGroupName: 'All' }
 		});
 
 		await user.type(screen.getByRole('textbox', { name: 'Package' }), 'test-task');
@@ -124,7 +124,7 @@ describe('TaskCollection', () => {
 			});
 
 		render(TaskCollection, {
-			props: { user: mockedUser }
+			props: { user: mockedUser, defaultGroupName: 'All' }
 		});
 
 		const addPpvBtn = screen.getByRole('button', { name: 'Add pinned package version' });

__tests__/v2/TaskGroupSelector.test.js

@@ -0,0 +1,45 @@
+import { describe, it, expect } from 'vitest';
+import { render, screen } from '@testing-library/svelte';
+
+import TaskGroupSelector from '../../src/lib/components/v2/tasks/TaskGroupSelector.svelte';
+
+describe('TaskGroupSelector', () => {
+	it('Default group is selected', async () => {
+		render(TaskGroupSelector, {
+			props: {
+				id: 'test',
+				groupIdsNames: [
+					[2, 'group2'],
+					[1, 'All']
+				],
+				defaultGroupName: 'All'
+			}
+		});
+		expect(screen.getByRole('combobox')).toHaveValue('1');
+	});
+
+	it('Validate required group', async () => {
+		const { component } = render(TaskGroupSelector, {
+			props: {
+				id: 'test',
+				groupIdsNames: [],
+				defaultGroupName: null
+			}
+		});
+
+		component.validate();
+
+		expect(await screen.findByText('Shared tasks must be associated with a group')).toBeVisible();
+	});
+
+	it('The only present group is selected', async () => {
+		render(TaskGroupSelector, {
+			props: {
+				id: 'test',
+				groupIdsNames: [[1, 'group1']],
+				defaultGroupName: null
+			}
+		});
+		expect(screen.getByRole('combobox')).toHaveValue('1');
+	});
+});

__tests__/v2/UserEditor.test.js

@@ -63,7 +63,8 @@ describe('UserEditor', () => {
 					slurm_accounts: [],
 					project_dir: null
 				},
-				saveUser: mockSaveUser
+				saveUser: mockSaveUser,
+				defaultGroupName: 'All'
 			}
 		});
 
@@ -109,7 +110,8 @@ describe('UserEditor', () => {
 					slurm_accounts: [],
 					project_dir: null
 				},
-				saveUser: mockSaveUser
+				saveUser: mockSaveUser,
+				defaultGroupName: 'All'
 			}
 		});
 
@@ -144,7 +146,8 @@ describe('UserEditor', () => {
 					slurm_accounts: [],
 					project_dir: '/path/to/project/dir'
 				},
-				saveUser: mockSaveUser
+				saveUser: mockSaveUser,
+				defaultGroupName: 'All'
 			}
 		});
 
@@ -185,7 +188,8 @@ describe('UserEditor', () => {
 					slurm_accounts: ['foo', 'bar'],
 					project_dir: '/path/to/project/dir'
 				},
-				saveUser: mockSaveUser
+				saveUser: mockSaveUser,
+				defaultGroupName: 'All'
 			}
 		});
 

components/__tests__/jschema/jschema_adapter.test.js

@@ -278,67 +278,97 @@ describe('jschema_adapter', () => {
 			title: 'ProcessTask'
 		});
 
-		expect(JSON.stringify(cleanJschema)).eq(
-			JSON.stringify({
-				$defs: {
-					ProcessAModel: {
-						description: 'A process model with the same parameter name as ProcessBModel.',
-						properties: {
-							step: {
-								const: 'ProcessA',
-								title: 'Step',
-								type: 'string',
-								description: 'A literal to identify the process type.'
-							},
-							parameter1: {
-								title: 'Parameter1',
-								type: 'number',
-								description: 'An integer parameter in A.'
-							}
+		expect(cleanJschema).deep.eq({
+			$defs: {
+				ProcessAModel: {
+					description: 'A process model with the same parameter name as ProcessBModel.',
+					properties: {
+						step: {
+							const: 'ProcessA',
+							title: 'Step',
+							type: 'string',
+							description: 'A literal to identify the process type.'
 						},
-						required: ['step', 'parameter1'],
-						title: 'ProcessAModel',
-						type: 'object'
+						parameter1: {
+							title: 'Parameter1',
+							type: 'number',
+							description: 'An integer parameter in A.'
+						}
 					},
-					ProcessBModel: {
-						description: 'B process model with the same parameter name as ProcessAModel.',
-						properties: {
-							step: {
-								const: 'ProcessB',
-								title: 'Step',
-								type: 'string',
-								description: 'A literal to identify the process type.'
-							},
-							parameter1: {
-								title: 'Parameter1',
-								type: 'number',
-								description: 'An integer parameter in B.'
-							}
+					required: ['step', 'parameter1'],
+					title: 'ProcessAModel',
+					type: 'object'
+				},
+				ProcessBModel: {
+					description: 'B process model with the same parameter name as ProcessAModel.',
+					properties: {
+						step: {
+							const: 'ProcessB',
+							title: 'Step',
+							type: 'string',
+							description: 'A literal to identify the process type.'
+						},
+						parameter1: {
+							title: 'Parameter1',
+							type: 'number',
+							description: 'An integer parameter in B.'
+						}
+					},
+					required: ['step', 'parameter1'],
+					title: 'ProcessBModel',
+					type: 'object'
+				}
+			},
+			additionalProperties: false,
+			properties: {
+				proc_step: {
+					oneOf: [
+						{
+							$ref: '#/$defs/ProcessAModel'
 						},
-						required: ['step', 'parameter1'],
-						title: 'ProcessBModel',
-						type: 'object'
+						{
+							$ref: '#/$defs/ProcessBModel'
+						}
+					],
+					title: 'Proc Step',
+					description: 'The processing step to apply.'
+				}
+			},
+			required: ['proc_step'],
+			type: 'object',
+			title: 'ProcessTask'
+		});
+	});
+
+	it('Strip discriminator, schema with default null value (ref #871)', () => {
+		const schema = stripDiscriminator({
+			properties: {
+				advanced_options: {
+					type: 'object',
+					properties: {
+						position_scale: { type: 'number' }
+					},
+					default: {
+						position_scale: null
 					}
-				},
-				additionalProperties: false,
-				properties: {
-					proc_step: {
-						oneOf: [
-							{
-								$ref: '#/$defs/ProcessAModel'
-							},
-							{
-								$ref: '#/$defs/ProcessBModel'
-							}
-						],
-						title: 'Proc Step',
-						description: 'The processing step to apply.'
+				}
+			},
+			type: 'object'
+		});
+
+		expect(schema).deep.eq({
+			properties: {
+				advanced_options: {
+					type: 'object',
+					properties: {
+						position_scale: { type: 'number' }
+					},
+					default: {
+						position_scale: null
 					}
-				},
-				required: ['proc_step'],
-				type: 'object',
-				title: 'ProcessTask'
-			})
-		);
+				}
+			},
+			type: 'object'
+		});
 	});
 });