Merge branch 'main' into visualize-code-list-usage-in-library

Altinn · Jan 6, 2025 · 52bb156 · 52bb156
2 parents b59bd2b + 1545c2d
commit 52bb156
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/frontend/packages/ux-editor/src/hooks/useValidateComponent.test.ts b/frontend/packages/ux-editor/src/hooks/useValidateComponent.test.ts
@@ -144,10 +144,5 @@ describe('useValidateComponent', () => {
 });
 
 const render = (component: FormComponent) => {
-  const queries = {
-    getOptionListIds: jest
-      .fn()
-      .mockImplementation(() => Promise.resolve<string[]>(optionListIdsMock)),
-  };
-  return renderHookWithProviders(() => useValidateComponent(component), { queries }).result.current;
+  return renderHookWithProviders(() => useValidateComponent(component)).result.current;
 };
diff --git a/frontend/packages/ux-editor/src/hooks/useValidateComponent.ts b/frontend/packages/ux-editor/src/hooks/useValidateComponent.ts
@@ -5,8 +5,6 @@ import type {
   FormComponent,
   FormRadioButtonsComponent,
 } from '../types/FormComponent';
-import { useOptionListIdsQuery } from './queries/useOptionListIdsQuery';
-import { useStudioEnvironmentParams } from 'app-shared/hooks/useStudioEnvironmentParams';
 
 export enum ErrorCode {
   NoOptions = 'NoOptions',
@@ -20,17 +18,8 @@ export type ComponentValidationResult = {
 
 const validateOptionGroup = (
   component: FormCheckboxesComponent | FormRadioButtonsComponent,
-  optionListIds: string[],
 ): ComponentValidationResult => {
-  if (component.optionsId) {
-    const isExistingOptionId = optionListIds?.includes(component.optionsId);
-    if (!isExistingOptionId) {
-      return {
-        isValid: false,
-        error: ErrorCode.NoOptions,
-      };
-    }
-  } else {
+  if (!component.optionsId) {
     if (!component.options || component.options.length === 0) {
       return {
         isValid: false,
@@ -48,13 +37,10 @@ const validateOptionGroup = (
 };
 
 export const useValidateComponent = (component: FormComponent): ComponentValidationResult => {
-  const { org, app } = useStudioEnvironmentParams();
-  const { data: optionListIds } = useOptionListIdsQuery(org, app);
-
   switch (component.type) {
     case ComponentType.Checkboxes:
     case ComponentType.RadioButtons:
-      return validateOptionGroup(component, optionListIds);
+      return validateOptionGroup(component);
     default:
       return { isValid: true };
   }