diff --git a/frontend/libs/console/legacy-ce/src/lib/features/Actions/components/OASGenerator/OASGeneratorForm.tsx b/frontend/libs/console/legacy-ce/src/lib/features/Actions/components/OASGenerator/OASGeneratorForm.tsx
index 8c1fb38c242..22fd47f5d6a 100644
--- a/frontend/libs/console/legacy-ce/src/lib/features/Actions/components/OASGenerator/OASGeneratorForm.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/features/Actions/components/OASGenerator/OASGeneratorForm.tsx
@@ -268,7 +268,6 @@ export const OasGeneratorForm = (props: OasGeneratorFormProps) => {
               noErrorPlaceholder
               name="oas"
               placeholder="1. Paste OpenAPI spec in raw text (JSON / YAML) here"
-              tooltip="Enter a sample request in JSON or YAML format to generate the input type"
               editorOptions={editorOptions}
               editorProps={{
                 className: 'rounded`-r-none',
diff --git a/frontend/libs/console/legacy-ce/src/lib/new-components/Form/FieldWrapper.stories.tsx b/frontend/libs/console/legacy-ce/src/lib/new-components/Form/FieldWrapper.stories.tsx
index 6a74f47a817..7748618c72c 100644
--- a/frontend/libs/console/legacy-ce/src/lib/new-components/Form/FieldWrapper.stories.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/new-components/Form/FieldWrapper.stories.tsx
@@ -125,6 +125,26 @@ VariantWithDescriptionAndTooltipAndKnwMoreLink.parameters = {
   },
 };
 
+export const VariantWithDescriptionAndTooltipAndKnowMoreLink: ComponentStory<
+  typeof FieldWrapper
+> = () => (
+  <FieldWrapper
+    label="The field wrapper label"
+    description="The field wrapper description"
+    tooltip="The field wrapper tooltip"
+    knowMoreLink="https://hasura.io/docs"
+  >
+    <ChildrenExample />
+  </FieldWrapper>
+);
+VariantWithDescriptionAndTooltipAndKnowMoreLink.storyName =
+  '🎭 Variant - With description, tooltip, and know more link';
+VariantWithDescriptionAndTooltipAndKnowMoreLink.parameters = {
+  docs: {
+    source: { state: 'open' },
+  },
+};
+
 export const StateLoading: ComponentStory<typeof FieldWrapper> = () => (
   <FieldWrapper
     label="The field wrapper label"
diff --git a/frontend/libs/console/legacy-ce/src/lib/new-components/Form/FieldWrapper.tsx b/frontend/libs/console/legacy-ce/src/lib/new-components/Form/FieldWrapper.tsx
index 91d4d860bc1..19b221f49fe 100644
--- a/frontend/libs/console/legacy-ce/src/lib/new-components/Form/FieldWrapper.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/new-components/Form/FieldWrapper.tsx
@@ -4,39 +4,21 @@ import clsx from 'clsx';
 import Skeleton from 'react-loading-skeleton';
 import { FaExclamationCircle } from 'react-icons/fa';
 
+import type { DiscriminatedTypes } from '@/types';
+
 import { IconTooltip } from '@/new-components/Tooltip';
 import { KnowMoreLink } from '../KnowMoreLink';
 
-type FieldWrapperProps = {
+export type FieldWrapperPassThroughProps = {
   /**
    * The field ID
    */
   id?: string;
-  /**
-   * The field label icon
-   */
-  labelIcon?: React.ReactElement;
-  /**
-   * The field label
-   */
-  label?: string;
-  /**
-   * The field class
-   */
-  className?: string;
   /**
    * The field size (full: the full width of the container , medium: half the
    * width of the container)
    */
   size?: 'full' | 'medium';
-  /**
-   * The field children
-   */
-  children: React.ReactNode;
-  /**
-   * The field error
-   */
-  error?: FieldError | undefined;
   /**
    * The field description
    */
@@ -57,21 +39,43 @@ type FieldWrapperProps = {
    * Render line breaks in the description
    */
   renderDescriptionLineBreaks?: boolean;
-  /**
-   * The field tooltip label
-   */
-  tooltip?: React.ReactNode;
-  /**
-   * The link containing more information about the field
-   */
-  knowMoreLink?: string;
-};
-
-export type FieldWrapperPassThroughProps = Omit<
-  FieldWrapperProps,
-  'className' | 'children' | 'error'
+} & DiscriminatedTypes<
+  {
+    /**
+     * The field label
+     */
+    label: string;
+    /**
+     * The field label icon. Can be set only if label is set.
+     */
+    labelIcon?: React.ReactElement;
+    /**
+     * The field tooltip label. Can be set only if label is set.
+     */
+    tooltip?: React.ReactNode;
+    /**
+     * The link containing more information about the field. Can be set only if label is set.
+     */
+    knowMoreLink?: string;
+  },
+  'label'
 >;
 
+type FieldWrapperProps = FieldWrapperPassThroughProps & {
+  /**
+   * The field class
+   */
+  className?: string;
+  /**
+   * The field children
+   */
+  children: React.ReactNode;
+  /**
+   * The field error
+   */
+  error?: FieldError | undefined;
+};
+
 export const ErrorComponentTemplate = (props: {
   label: React.ReactNode;
   ariaLabel?: string;
diff --git a/frontend/libs/console/legacy-ce/src/lib/new-components/Form/GraphQLSanitizedInputField.tsx b/frontend/libs/console/legacy-ce/src/lib/new-components/Form/GraphQLSanitizedInputField.tsx
index 474ef8d7d45..68aac3cd7bb 100644
--- a/frontend/libs/console/legacy-ce/src/lib/new-components/Form/GraphQLSanitizedInputField.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/new-components/Form/GraphQLSanitizedInputField.tsx
@@ -6,10 +6,10 @@ import React from 'react';
 import { z } from 'zod';
 import { InputField, InputFieldProps, Schema } from './InputField';
 
-export interface GraphQLSanitizedInputFieldProps<T extends z.infer<Schema>>
-  extends InputFieldProps<T> {
-  hideTips?: boolean;
-}
+export type GraphQLSanitizedInputFieldProps<T extends z.infer<Schema>> =
+  InputFieldProps<T> & {
+    hideTips?: boolean;
+  };
 
 export const GraphQLSanitizedInputField = <T extends z.infer<Schema>>({
   hideTips,
diff --git a/frontend/libs/console/legacy-ce/src/lib/types.ts b/frontend/libs/console/legacy-ce/src/lib/types.ts
index 31048f55820..c4e0fa193a1 100644
--- a/frontend/libs/console/legacy-ce/src/lib/types.ts
+++ b/frontend/libs/console/legacy-ce/src/lib/types.ts
@@ -91,3 +91,44 @@ export type NullableProps<T> = { [K in keyof T]: T[K] | null };
 export type DeepNullableProps<T> = {
   [K in keyof T]: DeepNullableProps<T[K]> | null;
 };
+
+/**
+ * Set all keys in an object to Never. Useful for writing custom types.
+ * To grasp it:
+ * Given { a: string; b: number }
+ * called like this MakeNever<MyType>
+ * It will output { a: never; b: never }
+ */
+export type MakeNever<T> = {
+  [P in keyof T]: never;
+};
+
+/**
+ * Makes a discriminated union
+ * Useful if you have part of the object where you need
+ *
+ * To grasp it:
+ * Given { buttonLabel: string, buttonIcon?: string; onClick: () => void }
+ * Called like this DiscriminatedTypes<MyType, 'buttonLabel'>
+ * It will output { buttonLabel?: string; buttonIcon?: never; onClick?: never } | { buttonLabel: string; buttonIcon?: string: onClick: () => void; }
+ * This way :
+ *   If buttonLabel is not set, buttonIcon and onClick cannot be set
+ *   If buttonLabel is set, buttonIcon can be set and onClick is mandatory
+ *
+ * @example <caption>Here you prevent `labelIcon` and `labelColor` to be passed without `label`,
+ * but you can pass just `label` if you want.</caption>
+ * type FieldWrapperProps =
+ *  | {
+ *      id: string;
+ *    } & DiscriminatedTypes<
+ *      {
+ *        label: string;
+ *        labelColor: string;
+ *        labelIcon?: React.ReactElement;
+ *      },
+ *      'label'
+ *    >;
+ */
+export type DiscriminatedTypes<T, K extends keyof T> =
+  | MakeNever<Partial<Pick<T, K>> & Partial<Omit<T, K>>>
+  | (Required<Pick<T, K>> & Omit<T, K>);