has_variants=false: disable Generate Variants button and fix the selection attributes in variant's edit/crete

locale/defaultMessages.json

@@ -1100,10 +1100,6 @@
   "4YJHut": {
     "string": "Clear search"
   },
-  "4YtpqB": {
-    "context": "tooltip when generate variants is disabled due to unsupported required attributes",
-    "string": "Required attributes ({attributes}) are not currently supported by Generator.{newline}{newline}To use the Generator:{newline}1. Make them optional in product type{newline}2. Generate variants{newline}3. Set values manually{newline}4. Restore required setting"
-  },
   "4YyeCx": {
     "context": "label for order total amount",
     "string": "Order total"
@@ -1731,6 +1727,10 @@
     "context": "order refund amount, input button",
     "string": "Refund {currency} {amount}"
   },
+  "8FDx9i": {
+    "context": "tooltip when generate variants is disabled due to product type configuration (hasVariants=false or no selection attributes)",
+    "string": "To use the Generator, this product type needs:{newline}{newline}• 'Product type uses Variant Attributes' enabled{newline}• Selection variant attributes defined"
+  },
   "8GC/ah": {
     "context": "variants section name",
     "string": "Variants"
@@ -1848,6 +1848,10 @@
     "context": "dialog content",
     "string": "{counter,plural,one{Are you sure you want to publish this model?} other{Are you sure you want to publish {displayQuantity} models?}}"
   },
+  "9+iLpf": {
+    "context": "link text to product type settings",
+    "string": "Configure in product type settings"
+  },
   "91vQMc": {
     "string": "order management"
   },
@@ -7725,6 +7729,10 @@
     "context": "tooltip shown when shipping method is selected but no other options exist",
     "string": "No alternative shipping methods available"
   },
+  "gDvd3v": {
+    "context": "tooltip when generate variants is disabled due to unsupported required attributes",
+    "string": "Required attributes with unsupported types:{newline}{attributes}{newline}{newline}To use the Generator:{newline}1. Make them optional in product type{newline}2. Generate variants{newline}3. Set values manually{newline}4. Restore required setting"
+  },
   "gE6aiQ": {
     "context": "PageTypeDeleteWarningDialog single no assigned items description",
     "string": "Are you sure you want to delete <b>{typeName}</b>? If you remove it you won’t be able to assign it to created models."
@@ -8600,10 +8608,6 @@
     "context": "Webhook subscription query card title",
     "string": "Subscription Query"
   },
-  "lEx2zw": {
-    "context": "tooltip when generate variants is disabled due to no selection attributes",
-    "string": "No selection attributes defined for this product type."
-  },
   "lF+VJQ": {
     "context": "Shipment information card header",
     "string": "Shipment information"
@@ -11058,6 +11062,10 @@
     "context": "gift card removed success alert message",
     "string": "{selectedItemsCount,plural,one{Successfully deleted gift card} other{Successfully deleted gift cards}}"
   },
+  "zN0Eub": {
+    "context": "info message when hasVariants is false but variant attributes exist",
+    "string": "This product type has {count, plural, one {# variant attribute} other {# variant attributes}} defined, but 'Product type uses Variant Attributes' is disabled. Edit {productTypeLink} product type to enable variant attributes."
+  },
   "zQvVDJ": {
     "string": "All"
   },

src/components/Datagrid/components/Header.tsx

@@ -31,11 +31,21 @@ const ButtonFullScreen: FC<PropsWithChildren<ButtonFullScreenProps>> = ({
 
 interface ButtonAddRowProps {
   onAddRow: React.MouseEventHandler<HTMLButtonElement>;
+  disabled?: boolean;
 }
 
-const ButtonAddRow: FC<PropsWithChildren<ButtonAddRowProps>> = ({ onAddRow, children }) => {
+const ButtonAddRow: FC<PropsWithChildren<ButtonAddRowProps>> = ({
+  onAddRow,
+  disabled,
+  children,
+}) => {
   return (
-    <Button data-test-id="button-add-variant" variant="secondary" onClick={onAddRow}>
+    <Button
+      data-test-id="button-add-variant"
+      variant="secondary"
+      onClick={onAddRow}
+      disabled={disabled}
+    >
       <PlusIcon />
       {children}
     </Button>

src/fragments/products.ts

@@ -309,6 +309,7 @@ export const fragmentVariant = gql`
       productType {
         id
         name
+        hasVariants
       }
       channelListings {
         id

src/graphql/hooks.generated.ts

@@ -3010,6 +3010,7 @@ export const ProductVariantFragmentDoc = gql`
     productType {
       id
       name
+      hasVariants
     }
     channelListings {
       id
@@ -15811,6 +15812,8 @@ export const ProductVariantCreateDataDocument = gql`
     name
     productType {
       id
+      name
+      hasVariants
       selectionVariantAttributes: variantAttributes(
         variantSelection: VARIANT_SELECTION
       ) {

src/products/components/ProductUpdatePage/ProductUpdatePage.tsx

@@ -490,6 +490,7 @@ const ProductUpdatePage = ({
                 )}
                 <ProductVariants
                   productId={productId}
+                  productTypeId={product?.productType.id ?? ""}
                   productName={product?.name}
                   errors={variantListErrors}
                   channels={listings}
@@ -498,6 +499,7 @@ const ProductUpdatePage = ({
                   variantAttributes={product?.productType.variantAttributes}
                   selectionVariantAttributes={product?.productType.selectionVariantAttributes}
                   nonSelectionVariantAttributes={product?.productType.nonSelectionVariantAttributes}
+                  hasVariants={hasVariants ?? false}
                   onAttributeValuesSearch={onAttributeValuesSearch}
                   onChange={handlers.changeVariants}
                   onRowClick={onVariantShow}

src/products/components/ProductVariantCreatePage/ProductVariantCreatePage.tsx

@@ -11,10 +11,12 @@ import {
   Attributes,
   VariantAttributeScope,
 } from "@dashboard/components/Attributes";
+import { DashboardCard } from "@dashboard/components/Card";
 import CardSpacer from "@dashboard/components/CardSpacer";
 import { ConfirmButtonTransitionState } from "@dashboard/components/ConfirmButton";
 import Grid from "@dashboard/components/Grid";
 import { DetailPageLayout } from "@dashboard/components/Layouts";
+import Link from "@dashboard/components/Link";
 import { Metadata } from "@dashboard/components/Metadata";
 import { Savebar } from "@dashboard/components/Savebar";
 import {
@@ -31,9 +33,11 @@ import { SubmitPromise } from "@dashboard/hooks/useForm";
 import useNavigator from "@dashboard/hooks/useNavigator";
 import { ProductDetailsChannelsAvailabilityCard } from "@dashboard/products/components/ProductVariantChannels/ChannelsAvailabilityCard";
 import { productUrl } from "@dashboard/products/urls";
+import { productTypeUrl } from "@dashboard/productTypes/urls";
 import { Container, FetchMoreProps, RelayToFlat, ReorderAction } from "@dashboard/types";
 import { mapEdgesToItems } from "@dashboard/utils/maps";
-import { defineMessages, useIntl } from "react-intl";
+import { Box, Text } from "@saleor/macaw-ui-next";
+import { defineMessages, FormattedMessage, useIntl } from "react-intl";
 
 import { ProductShipping } from "../ProductShipping";
 import { ProductStocks } from "../ProductStocks";
@@ -228,51 +232,84 @@ export const ProductVariantCreatePage = ({
                     product={product}
                     onManageClick={toggleManageChannels}
                   />
-                  <Attributes
-                    title={intl.formatMessage(messages.attributesHeader)}
-                    attributes={data.attributes.filter(
-                      attribute =>
-                        attribute.data.variantAttributeScope ===
-                        VariantAttributeScope.NOT_VARIANT_SELECTION,
-                    )}
-                    attributeValues={attributeValues}
-                    loading={disabled}
-                    disabled={disabled}
-                    errors={errors}
-                    onChange={handlers.selectAttribute}
-                    onMultiChange={handlers.selectAttributeMultiple}
-                    onFileChange={handlers.selectAttributeFile}
-                    onReferencesRemove={handlers.selectAttributeReference}
-                    onReferencesAddClick={onAssignReferencesClick}
-                    onReferencesReorder={handlers.reorderAttributeValue}
-                    fetchAttributeValues={fetchAttributeValues}
-                    fetchMoreAttributeValues={fetchMoreAttributeValues}
-                    onAttributeSelectBlur={onAttributeSelectBlur}
-                    richTextGetters={attributeRichTextGetters}
-                  />
                   <CardSpacer />
-                  <Attributes
-                    title={intl.formatMessage(messages.attributesSelectionHeader)}
-                    attributes={data.attributes.filter(
-                      attribute =>
-                        attribute.data.variantAttributeScope ===
-                        VariantAttributeScope.VARIANT_SELECTION,
-                    )}
-                    attributeValues={attributeValues}
-                    loading={disabled}
-                    disabled={disabled}
-                    errors={errors}
-                    onChange={handlers.selectAttribute}
-                    onMultiChange={handlers.selectAttributeMultiple}
-                    onFileChange={handlers.selectAttributeFile}
-                    onReferencesRemove={handlers.selectAttributeReference}
-                    onReferencesAddClick={onAssignReferencesClick}
-                    onReferencesReorder={handlers.reorderAttributeValue}
-                    fetchAttributeValues={fetchAttributeValues}
-                    fetchMoreAttributeValues={fetchMoreAttributeValues}
-                    onAttributeSelectBlur={onAttributeSelectBlur}
-                    richTextGetters={attributeRichTextGetters}
-                  />
+                  {product?.productType?.hasVariants && (
+                    <Attributes
+                      title={intl.formatMessage(messages.attributesHeader)}
+                      attributes={data.attributes.filter(
+                        attribute =>
+                          attribute.data.variantAttributeScope ===
+                          VariantAttributeScope.NOT_VARIANT_SELECTION,
+                      )}
+                      attributeValues={attributeValues}
+                      loading={disabled}
+                      disabled={disabled}
+                      errors={errors}
+                      onChange={handlers.selectAttribute}
+                      onMultiChange={handlers.selectAttributeMultiple}
+                      onFileChange={handlers.selectAttributeFile}
+                      onReferencesRemove={handlers.selectAttributeReference}
+                      onReferencesAddClick={onAssignReferencesClick}
+                      onReferencesReorder={handlers.reorderAttributeValue}
+                      fetchAttributeValues={fetchAttributeValues}
+                      fetchMoreAttributeValues={fetchMoreAttributeValues}
+                      onAttributeSelectBlur={onAttributeSelectBlur}
+                      richTextGetters={attributeRichTextGetters}
+                    />
+                  )}
+                  {product?.productType?.hasVariants && (
+                    <>
+                      <CardSpacer />
+                      <Attributes
+                        title={intl.formatMessage(messages.attributesSelectionHeader)}
+                        attributes={data.attributes.filter(
+                          attribute =>
+                            attribute.data.variantAttributeScope ===
+                            VariantAttributeScope.VARIANT_SELECTION,
+                        )}
+                        attributeValues={attributeValues}
+                        loading={disabled}
+                        disabled={disabled}
+                        errors={errors}
+                        onChange={handlers.selectAttribute}
+                        onMultiChange={handlers.selectAttributeMultiple}
+                        onFileChange={handlers.selectAttributeFile}
+                        onReferencesRemove={handlers.selectAttributeReference}
+                        onReferencesAddClick={onAssignReferencesClick}
+                        onReferencesReorder={handlers.reorderAttributeValue}
+                        fetchAttributeValues={fetchAttributeValues}
+                        fetchMoreAttributeValues={fetchMoreAttributeValues}
+                        onAttributeSelectBlur={onAttributeSelectBlur}
+                        richTextGetters={attributeRichTextGetters}
+                      />
+                    </>
+                  )}
+                  {!product?.productType?.hasVariants && data.attributes.length > 0 && (
+                    <DashboardCard paddingTop={6}>
+                      <DashboardCard.Content>
+                        <Box display="flex" flexDirection="column" gap={4} paddingBottom={4}>
+                          <Text size={5} fontWeight="bold">
+                            {intl.formatMessage(messages.attributesHeader)}
+                          </Text>
+                          <Text size={2} color="default2">
+                            <FormattedMessage
+                              id="zN0Eub"
+                              defaultMessage="This product type has {count, plural, one {# variant attribute} other {# variant attributes}} defined, but 'Product type uses Variant Attributes' is disabled. Edit {productTypeLink} product type to enable variant attributes."
+                              description="info message when hasVariants is false but variant attributes exist"
+                              values={{
+                                count: data.attributes.length,
+                                productTypeLink: product?.productType ? (
+                                  <Link href={productTypeUrl(product.productType.id)} underline>
+                                    {product.productType.name}
+                                  </Link>
+                                ) : null,
+                              }}
+                            />
+                          </Text>
+                        </Box>
+                      </DashboardCard.Content>
+                    </DashboardCard>
+                  )}
                   <CardSpacer />
                   <ProductVariantCheckoutSettings
                     data={data}

src/products/components/ProductVariantPage/ProductVariantPage.test.tsx

@@ -202,6 +202,7 @@ describe("ProductVariantPage - Reference Attribute Caching", () => {
         __typename: "ProductType" as const,
         id: "product-type-1",
         name: "Default Product Type",
+        hasVariants: true,
       },
       channelListings: [
         {
@@ -237,6 +238,7 @@ describe("ProductVariantPage - Reference Attribute Caching", () => {
     defaultVariantId: "default-variant-id",
     defaultWeightUnit: "kg",
     errors: [],
+    hasVariants: true,
     channelErrors: [],
     header: "Edit Variant",
     variant: mockVariant,

src/products/components/ProductVariantPage/ProductVariantPage.tsx

@@ -95,6 +95,8 @@ interface ProductVariantPageProps {
   header: string;
   channels: ChannelPriceData[];
   channelErrors: ProductChannelListingErrorFragment[];
+  /** Whether the product type supports variant attributes */
+  hasVariants: boolean;
   loading?: boolean;
   placeholderImage?: string;
   saveButtonBarState: ConfirmButtonTransitionState;
@@ -136,6 +138,7 @@ export const ProductVariantPage = ({
   defaultVariantId,
   defaultWeightUnit,
   errors: apiErrors,
+  hasVariants,
   header,
   loading,
   placeholderImage,
@@ -288,7 +291,9 @@ export const ProductVariantPage = ({
                       <VariantAttributesSection
                         title={intl.formatMessage(messages.nonSelectionAttributes)}
                         attributes={nonSelectionAttributes}
+                        totalAttributesCount={data.attributes.length}
                         selectionAttributesExist={selectionAttributes.length > 0}
+                        hasVariants={hasVariants}
                         attributeValues={attributeValues}
                         productTypeName={variant.product.productType.name}
                         productTypeUrl={productTypeUrl(variant.product.productType.id)}
@@ -306,7 +311,7 @@ export const ProductVariantPage = ({
                         richTextGetters={attributeRichTextGetters}
                       />
                     )}
-                    {selectionAttributes.length > 0 && (
+                    {hasVariants && selectionAttributes.length > 0 && (
                       <>
                         <CardSpacer />
                         <Attributes

src/products/components/ProductVariantPage/VariantAttributesSection.tsx

@@ -17,7 +17,11 @@ import { FormattedMessage } from "react-intl";
 interface VariantAttributesSectionProps extends AttributeRowHandlers {
   title: ReactNode;
   attributes: AttributeInput[];
+  /** Total count of all variant attributes (selection + non-selection) */
+  totalAttributesCount: number;
   selectionAttributesExist: boolean;
+  /** Whether the product type supports variant attributes */
+  hasVariants: boolean;
   attributeValues: AttributeValueFragment[];
   productTypeName: string;
   productTypeUrl: string;
@@ -30,7 +34,9 @@ interface VariantAttributesSectionProps extends AttributeRowHandlers {
 export const VariantAttributesSection = ({
   title,
   attributes,
+  totalAttributesCount,
   selectionAttributesExist,
+  hasVariants,
   attributeValues,
   productTypeName,
   productTypeUrl,
@@ -89,6 +95,37 @@ export const VariantAttributesSection = ({
     </Box>
   );
 
+  // When hasVariants is false but attributes exist, show info message instead of attribute fields
+  if (!hasVariants && totalAttributesCount > 0) {
+    return (
+      <>
+        <CardSpacer />
+        <DashboardCard paddingTop={6}>
+          <DashboardCard.Content>
+            <Box display="flex" flexDirection="column" gap={4} paddingBottom={4}>
+              {titleWithTooltip}
+              <Text size={2} color="default2">
+                <FormattedMessage
+                  id="zN0Eub"
+                  defaultMessage="This product type has {count, plural, one {# variant attribute} other {# variant attributes}} defined, but 'Product type uses Variant Attributes' is disabled. Edit {productTypeLink} product type to enable variant attributes."
+                  description="info message when hasVariants is false but variant attributes exist"
+                  values={{
+                    count: totalAttributesCount,
+                    productTypeLink: (
+                      <Link href={productTypeUrl} underline>
+                        {productTypeName}
+                      </Link>
+                    ),
+                  }}
+                />
+              </Text>
+            </Box>
+          </DashboardCard.Content>
+        </DashboardCard>
+      </>
+    );
+  }
+
   // Only show empty state when both non-selection and selection attributes are empty
   if (attributes.length === 0) {
     if (selectionAttributesExist) {