Skip to content

TD-5443-Bulk upload - Duplicate flags - existing flag comparison modified. #3278

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 1 commit into from
May 28, 2025
Merged

TD-5443-Bulk upload - Duplicate flags - existing flag comparison modified. #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,9 +583,9 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
if (ModelState.IsValid)
{
var flags = frameworkService.GetCustomFlagsByFrameworkId(frameworkId, null)
.Where(fn => fn.FlagName.ToLower() == model.FlagName.ToLower()).ToList();
.Where(fn => fn.FlagName?.Trim().ToLower() == model.FlagName?.Trim().ToLower()).ToList();

bool nameExists = flags.Any(x => x.FlagName.ToLower() == model.FlagName.ToLower());
bool nameExists = flags.Any(x => x.FlagName?.Trim().ToLower() == model.FlagName?.Trim().ToLower());
bool idExists = flags.Any(x => x.FlagId == flagId);

if (actionname == "Edit")
Expand All @@ -596,7 +596,7 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
return View("Developer/EditCustomFlag", model);
}
else
frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName, model.FlagGroup, model.FlagTagClass);
frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName?.Trim(), model.FlagGroup?.Trim(), model.FlagTagClass);
}
else
{
Expand All @@ -606,7 +606,7 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
return View("Developer/EditCustomFlag", model);
}
else
frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName, model.FlagGroup, model.FlagTagClass);
frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName?.Trim(), model.FlagGroup?.Trim(), model.FlagTagClass);
}

return RedirectToAction("EditFrameworkFlags", "Frameworks", new { frameworkId });
Expand Down
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ CompetencyTableRow competencyRow
{
foreach (var frameworkFlag in frameworkFlags)
{
if (frameworkFlag.FlagName == flag)
if (frameworkFlag.FlagName?.Trim().ToLower() == flag?.Trim().ToLower())
{
flagId = frameworkFlag.FlagId;
break;
Expand All @@ -271,7 +271,7 @@ CompetencyTableRow competencyRow
}
if (flagId == 0)
{
flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag, "Flag", "nhsuk-tag--white");
flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag?.Trim(), "Flag", "nhsuk-tag--white");
}
flagIds.Add(flagId);
}
Expand Down
Loading