fix changes requested

Signed-off-by: Philip Colares Carneiro <philip.colares@gmail.com>

Author: Philip-Carneiro

clients/ui/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx

@@ -110,6 +110,19 @@ const YamlSection: React.FC<YamlSectionProps> = ({
       </FormHelperText>
     );
 
+  const expectedFormatButton = onToggleExpectedFormatDrawer ? (
+    <Button
+      variant="link"
+      isInline
+      onClick={onToggleExpectedFormatDrawer}
+      data-testid="view-expected-yaml-format-link"
+      icon={<OpenDrawerRightIcon />}
+      iconPosition="end"
+    >
+      {EXPECTED_YAML_FORMAT_LABEL}
+    </Button>
+  ) : null;
+
   return (
     <FormSection data-testid="yaml-section">
       {fileUploadError && (
@@ -129,60 +142,14 @@ const YamlSection: React.FC<YamlSectionProps> = ({
           alignItems={{ default: 'alignItemsCenter' }}
           className="pf-v6-u-mb-sm"
         >
-          <FlexItem>
-            {FORM_LABELS.YAML_CONTENT}
-            <span className="pf-v6-c-form__label-required" aria-hidden="true">
-              {' '}
-              *
-            </span>
-          </FlexItem>
-          {onToggleExpectedFormatDrawer && (
-            <FlexItem>
-              <Button
-                variant="link"
-                isInline
-                onClick={onToggleExpectedFormatDrawer}
-                data-testid="view-expected-yaml-format-link"
-                icon={<OpenDrawerRightIcon />}
-                iconPosition="end"
-              >
-                {EXPECTED_YAML_FORMAT_LABEL}
-              </Button>
-            </FlexItem>
-          )}
+          <FlexItem>{FORM_LABELS.YAML_CONTENT}</FlexItem>
+          <FlexItem>{expectedFormatButton}</FlexItem>
         </Flex>
       )}
       <FormGroup
-        label={
-          !isMUITheme ? (
-            <Flex
-              justifyContent={{ default: 'justifyContentSpaceBetween' }}
-              alignItems={{ default: 'alignItemsCenter' }}
-            >
-              <FlexItem>
-                {FORM_LABELS.YAML_CONTENT}
-                <span className="pf-v6-c-form__label-required" aria-hidden="true">
-                  {' '}
-                  *
-                </span>
-              </FlexItem>
-              {onToggleExpectedFormatDrawer && (
-                <FlexItem>
-                  <Button
-                    variant="link"
-                    isInline
-                    onClick={onToggleExpectedFormatDrawer}
-                    data-testid="view-expected-yaml-format-link"
-                    icon={<OpenDrawerRightIcon />}
-                    iconPosition="end"
-                  >
-                    {EXPECTED_YAML_FORMAT_LABEL}
-                  </Button>
-                </FlexItem>
-              )}
-            </Flex>
-          ) : undefined
-        }
+        label={!isMUITheme ? FORM_LABELS.YAML_CONTENT : undefined}
+        labelInfo={!isMUITheme ? expectedFormatButton : undefined}
+        isRequired
         fieldId="yaml-content"
       >
         <FormFieldset component={yamlInput} field="YAML" />

clients/ui/frontend/src/app/pages/modelCatalogSettings/constants.tsx

@@ -69,8 +69,7 @@ export const ERROR_MESSAGES = {
   FILE_UPLOAD_FAILED_BODY:
     "The YAML file couldn't be uploaded. Check its syntax and structure, then try again.",
   VALIDATION_FAILED: 'Validation failed',
-  VALIDATION_FAILED_BODY:
-    'The system cannot establish a connection to the source. Ensure that the organization is accurate, then try again.',
+  VALIDATION_FAILED_BODY: 'The system cannot establish a connection to the source.',
 } as const;
 
 export const SUCCESS_MESSAGES = {
@@ -89,7 +88,7 @@ export const TABLE_COLUMN_LABELS = {
 
 export const TABLE_COLUMN_POPOVERS = {
   ORGANIZATION:
-    'Applies only to Hugging Face sources. Shows the organization the source syncs models from (for example, Google). Only models within this organization are included in the catalog.',
+    'Applies only to Hugging Face sources. Shows the organization the source syncs models from (for example, meta-llama). Only models within this organization are included in the catalog.',
   ENABLE:
     'Enable a source to make its models available to users in your organization from the model catalog.',
 } as const;