Updating content due to UX feedback from users

src/components/inputs/PrefixedName/index.tsx

@@ -11,13 +11,16 @@ import {
 } from '@mui/material';
 import useValidatePrefix from 'components/inputs/PrefixedName/useValidatePrefix';
 import AlertBox from 'components/shared/AlertBox';
+import { capitalize } from 'lodash';
+import { useMemo } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { useMount } from 'react-use';
 import { hasLength } from 'utils/misc-utils';
 import { PrefixedName_Change } from './types';
 
 export interface Props {
     label: string | null;
+    entityType?: string;
     allowBlankName?: boolean;
     allowEndSlash?: boolean;
     defaultPrefix?: boolean;
@@ -39,11 +42,13 @@ export interface Props {
 const DESCRIPTION_ID = 'prefixed-name-description';
 const INPUT_ID = 'prefixed-name-input';
 
+// eslint-disable-next-line complexity
 function PrefixedName({
     allowBlankName,
     allowEndSlash,
     defaultPrefix,
     disabled,
+    entityType,
     hideErrorMessage,
     label,
     onChange,
@@ -86,13 +91,33 @@ function PrefixedName({
     const variantString = standardVariant ? 'standard' : 'outlined';
 
     // For rendering help and errors - based on JSONForms approach
-    const description = showDescription
-        ? intl.formatMessage({
-              id: singleOption
-                  ? 'prefixedName.description.singlePrefix'
-                  : 'prefixedName.description',
-          })
-        : null;
+    const description = useMemo(() => {
+        if (!showDescription) {
+            return null;
+        }
+
+        const messageKey =
+            singleOption || prefix.length > 0
+                ? entityType
+                    ? 'prefixedName.description.singlePrefix'
+                    : 'prefixedName.description.singlePrefix.noEntityType'
+                : name.length > 0
+                ? 'prefixedName.description.noPrefix'
+                : 'prefixedName.description';
+
+        return intl.formatMessage(
+            { id: messageKey },
+            { entityType: entityType ? capitalize(entityType) : null }
+        );
+    }, [
+        entityType,
+        intl,
+        name.length,
+        prefix.length,
+        showDescription,
+        singleOption,
+    ]);
+
     const firstFormHelperText = description
         ? description
         : showErrors

src/forms/renderers/CatalogName/index.tsx

@@ -34,6 +34,7 @@ import { WithOptionLabel } from '@jsonforms/material-renderers/lib/mui-controls/
 import { withJsonFormsOneOfEnumProps } from '@jsonforms/react';
 import PrefixedName from 'components/inputs/PrefixedName';
 import { PrefixedName_Change } from 'components/inputs/PrefixedName/types';
+import { useEntityType } from 'context/EntityContext';
 import { useEntityWorkflow_Editing } from 'context/Workflow';
 import { useCallback } from 'react';
 
@@ -53,6 +54,7 @@ const CatalogNameTypeRenderer = ({
     uischema,
 }: ControlProps & OwnPropsOfEnum & WithOptionLabel) => {
     const isEdit = useEntityWorkflow_Editing();
+    const entityType = useEntityType();
 
     const updateFunction = useCallback<PrefixedName_Change>(
         (prefixedName) => {
@@ -65,6 +67,7 @@ const CatalogNameTypeRenderer = ({
         <PrefixedName
             disabled={!enabled}
             label={`${uischema.label}`}
+            entityType={entityType}
             onChange={updateFunction}
             required={required}
             showDescription

src/lang/en-US.ts

@@ -42,6 +42,7 @@ const CommonMessages: ResolvedIntlConfig['messages'] = {
     'common.readOnly': `Read-Only`,
     'common.failedFetch': `Unable to reach server`,
     'common.missingError': `Something went wrong`,
+    'common.exampleName': `marketing_data`,
 
     // Aria
     'aria.openExpand': `show more`,
@@ -1006,9 +1007,9 @@ const Workflows: ResolvedIntlConfig['messages'] = {
     'workflows.autoDiscovery.update.failed': `Schema evolution update failed`,
 
     'workflows.sourceCapture.header': `Link Capture`,
-    'workflows.sourceCapture.cta': `link capture`,
+    'workflows.sourceCapture.cta': `Source From Capture`,
+    'workflows.sourceCapture.cta.edit': `Edit Source Capture`,
     'workflows.sourceCapture.cta.loading': `${CommonMessages['common.loading']}`,
-    'workflows.sourceCapture.cta.edit': `edit capture`,
     'workflows.sourceCapture.selected.none': `no linked capture`,
     'workflows.sourceCapture.optin.message': `Select a capture to link to your materialization.  Collections added to your capture will automatically be added to your materialization.`,
     'workflows.sourceCapture.optin.message2': `Removing this will not remove associated collections.`,
@@ -1284,8 +1285,10 @@ const UpdateEntity: ResolvedIntlConfig['messages'] = {
 };
 
 const PrefixedName: ResolvedIntlConfig['messages'] = {
-    'prefixedName.description': `Select a prefix from the drop-down and add a unique name. (ex: acmeCo/marketing_data)`,
-    'prefixedName.description.singlePrefix': `Prefix already selected. Please add a unique name. (ex: marketing_data)`,
+    'prefixedName.description': `Select a prefix from the drop-down and add a unique name. (ex: ${CommonMessages['common.exampleName']})`,
+    'prefixedName.description.noPrefix': `Please select a prefix from the drop-down.`,
+    'prefixedName.description.singlePrefix': `Give your {entityType} a unique name. (ex: ${CommonMessages['common.exampleName']})`,
+    'prefixedName.description.singlePrefix.noEntityType': `Please add a unique name. (ex: ${CommonMessages['common.exampleName']})`,
 };
 
 const CustomErrors: ResolvedIntlConfig['messages'] = {