fix: remove current code list name from list before passing to findFi…

…leNameError (#14310) Co-authored-by: Tomas Engebretsen <[email protected]>
Altinn · Dec 20, 2024 · d3590da · d3590da
1 parent a578aab
commit d3590da
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...nt-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.test.tsx b/...nt-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.test.tsx
@@ -81,6 +81,14 @@ describe('CodeLists', () => {
     expect(errorMessage).toBeInTheDocument();
   });
 
+  it('does not show error message when reassigning the original name ', async () => {
+    const user = userEvent.setup();
+    renderCodeLists({ codeListNames: [codeListName] });
+    await changeCodeListId(user, codeListName, codeListName);
+    const errorMessage = screen.queryByText(textMock('validation_errors.file_name_occupied'));
+    expect(errorMessage).not.toBeInTheDocument();
+  });
+
   it('does not call onUpdateCodeListId when assigning an invalid id to the code list', async () => {
     const user = userEvent.setup();
     const invalidCodeListName = 'invalidCodeListName';

diff --git a/...src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/EditCodeList/EditCodeList.tsx b/...src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/EditCodeList/EditCodeList.tsx
@@ -6,7 +6,7 @@ import type { CodeListWithMetadata } from '../../CodeListPage';
 import { useOptionListEditorTexts } from '../../hooks/useCodeListEditorTexts';
 import { KeyVerticalIcon } from '@studio/icons';
 import { updateCodeListWithMetadata } from '../CodeLists';
-import { FileNameUtils } from '@studio/pure-functions';
+import { ArrayUtils, FileNameUtils } from '@studio/pure-functions';
 import { useInputCodeListNameErrorMessage } from '../../hooks/useInputCodeListNameErrorMessage';
 import classes from './EditCodeList.module.css';
 
@@ -37,7 +37,8 @@ export function EditCodeList({
   };
 
   const handleValidateCodeListId = (newCodeListId: string) => {
-    const fileNameError = FileNameUtils.findFileNameError(newCodeListId, codeListNames);
+    const invalidCodeListNames = ArrayUtils.removeItemByValue(codeListNames, codeList.title);
+    const fileNameError = FileNameUtils.findFileNameError(newCodeListId, invalidCodeListNames);
     return getInvalidInputFileNameErrorMessage(fileNameError);
   };