Skip to content

Thu/allow all characters in scenario names #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Thu/allow all characters in scenario names #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b67422
fix: remove forbidden characters constraint in scenario names
csm-thu Jan 15, 2025
7bdfdc4
test: update test on scenario name constraints
csm-thu Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/ScenarioUtils/ScenarioUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// Copyright (c) Cosmo Tech.
// Licensed under the MIT license.
import { NAME_VALIDATOR } from './constants';

const scenarioExistsInList = (scenarioName, scenarioList) => {
scenarioName = scenarioName.trim();
return scenarioList.find((scenario) => scenario.name.trim() === scenarioName) !== undefined;
Expand All @@ -21,15 +19,8 @@ const scenarioExistsInTree = (scenarioName, scenarioTree) => {

const scenarioNameIsValid = (scenarioName, scenarioList) => {
scenarioName = scenarioName.trimEnd();
if (scenarioName.length === 0) {
return 'emptyScenarioName';
} else {
if (scenarioName.match(NAME_VALIDATOR) === null) {
return 'forbiddenCharsInScenarioName';
} else if (scenarioExistsInList(scenarioName, scenarioList)) {
return 'existingScenarioName';
}
}
if (scenarioName.length === 0) return 'emptyScenarioName';
if (scenarioExistsInList(scenarioName, scenarioList)) return 'existingScenarioName';
return null;
};

Expand Down
36 changes: 8 additions & 28 deletions src/ScenarioUtils/__test__/ScenarioUtils.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,19 @@ const scenarioList = [
describe('scenarioNameIsValid', () => {
test.each`
dataStr | expectedRes
${' new scenario'} | ${'forbiddenCharsInScenarioName'}
${'new scenario'} | ${null}
${' new scenario '} | ${null}
${'123 scenario'} | ${null}
${'new scenario 132'} | ${null}
${'new scenario *+,_&%§-.'} | ${null}
${'new scenario 🚀'} | ${null}
${'existing scenario'} | ${'existingScenarioName'}
${'existing scenario '} | ${'existingScenarioName'}
${'existing scenario '} | ${'existingScenarioName'}
${'existing scenario '} | ${'existingScenarioName'}
${' existing scenario '} | ${'forbiddenCharsInScenarioName'}
${' existing scenario '} | ${'forbiddenCharsInScenarioName'}
${' existing scenario '} | ${'forbiddenCharsInScenarioName'}
${'new scenario *****'} | ${'forbiddenCharsInScenarioName'}
${'new +scenario'} | ${'forbiddenCharsInScenarioName'}
${'new ,scenario'} | ${'forbiddenCharsInScenarioName'}
${' existing scenario '} | ${'existingScenarioName'}
${'existing scenario 2'} | ${'existingScenarioName'}
${'new.scenario'} | ${null}
${'new_scenario'} | ${null}
${'new & scenario'} | ${'forbiddenCharsInScenarioName'}
${'new % scenario *****'} | ${'forbiddenCharsInScenarioName'}
${'new §scenario *****'} | ${'forbiddenCharsInScenarioName'}
${'new scenario'} | ${null}
${'new-scenario'} | ${null}
${'new---scenario'} | ${null}
${'existing scenario 3'} | ${'existingScenarioName'}
${'---new scenario'} | ${'forbiddenCharsInScenarioName'}
${'_new scenario'} | ${'forbiddenCharsInScenarioName'}
${'.new scenario'} | ${'forbiddenCharsInScenarioName'}
${'new*scenario'} | ${'forbiddenCharsInScenarioName'}
${'new=scenario'} | ${'forbiddenCharsInScenarioName'}
${'new+scenario'} | ${'forbiddenCharsInScenarioName'}
${'new scenario---'} | ${null}
${'existing scenario 4'} | ${'existingScenarioName'}
${'123 scenario'} | ${null}
${' new scenario '} | ${'forbiddenCharsInScenarioName'}
${'new scenario 132'} | ${null}
`('for $dataStr must be $expectedRes', ({ dataStr, expectedRes }) => {
`('for "$dataStr" must be $expectedRes', ({ dataStr, expectedRes }) => {
const res = ScenarioUtils.scenarioNameIsValid(dataStr, scenarioList);
expect(res).toStrictEqual(expectedRes);
});
Expand Down
4 changes: 0 additions & 4 deletions src/ScenarioUtils/constants.js
View file
Open in desktop

This file was deleted.

Loading