LPD-48103

modules/apps/commerce/commerce-initializer-util/src/main/java/com/liferay/commerce/initializer/util/CPDefinitionsImporter.java

@@ -841,7 +841,11 @@ private CPDefinitionOptionValueRel _importCPDefinitionOptionValueRel(
 			addCPDefinitionSpecificationOptionValue(
 				StringPool.BLANK, cpDefinitionId,
 				cpSpecificationOption.getCPSpecificationOptionId(),
-				cpOptionCategoryId, priority, valueMap, serviceContext);
+				cpOptionCategoryId, priority, valueMap,
+				GetterUtil.getBoolean(
+					jsonObject.get("visible"),
+					cpSpecificationOption.isVisible()),
+				serviceContext);
 	}
 
 	private CPInstance _importCPInstance(

modules/apps/commerce/commerce-initializer-util/src/main/java/com/liferay/commerce/initializer/util/CPSpecificationOptionsImporter.java

@@ -16,6 +16,7 @@
 import com.liferay.portal.kernel.model.User;
 import com.liferay.portal.kernel.service.ServiceContext;
 import com.liferay.portal.kernel.service.UserLocalService;
+import com.liferay.portal.kernel.util.GetterUtil;
 import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.Validator;
 
@@ -99,12 +100,17 @@ private CPSpecificationOption _importCPSpecificationOption(
 					cpSpecificationOption.getExternalReferenceCode(),
 					cpSpecificationOption.getCPSpecificationOptionId(),
 					cpOptionCategoryId, null, titleMap, descriptionMap,
-					facetable, key, priority, serviceContext);
+					facetable, key, priority,
+					GetterUtil.getBoolean(
+						jsonObject.get("visible"),
+						cpSpecificationOption.isVisible()),
+					serviceContext);
 		}
 
 		return _cpSpecificationOptionLocalService.addCPSpecificationOption(
 			null, serviceContext.getUserId(), cpOptionCategoryId, null,
-			titleMap, descriptionMap, facetable, key, priority, serviceContext);
+			titleMap, descriptionMap, facetable, key, priority,
+			jsonObject.getBoolean("visible", true), serviceContext);
 	}
 
 	@Reference

modules/apps/commerce/commerce-product-api/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: Liferay Commerce Product API
 Bundle-SymbolicName: com.liferay.commerce.product.api
-Bundle-Version: 88.2.1
+Bundle-Version: 89.0.0
 Export-Package:\
 	com.liferay.commerce.product.availability,\
 	com.liferay.commerce.product.catalog,\

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/constants/CPField.java

@@ -159,4 +159,6 @@ public class CPField {
 
 	public static final String UNSPSC = "unspsc";
 
+	public static final String VISIBLE = "visible";
+
 }

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/model/CPDefinitionSpecificationOptionValueModel.java

@@ -425,6 +425,27 @@ public void setCPDefinitionSpecificationOptionValueId(
 	 */
 	public void setValueMap(Map<Locale, String> valueMap, Locale defaultLocale);
 
+	/**
+	 * Returns the visible of this cp definition specification option value.
+	 *
+	 * @return the visible of this cp definition specification option value
+	 */
+	public boolean getVisible();
+
+	/**
+	 * Returns <code>true</code> if this cp definition specification option value is visible.
+	 *
+	 * @return <code>true</code> if this cp definition specification option value is visible; <code>false</code> otherwise
+	 */
+	public boolean isVisible();
+
+	/**
+	 * Sets whether this cp definition specification option value is visible.
+	 *
+	 * @param visible the visible of this cp definition specification option value
+	 */
+	public void setVisible(boolean visible);
+
 	/**
 	 * Returns the last publish date of this cp definition specification option value.
 	 *

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/model/CPDefinitionSpecificationOptionValueTable.java

@@ -79,6 +79,9 @@ public class CPDefinitionSpecificationOptionValueTable
 	public final Column<CPDefinitionSpecificationOptionValueTable, String>
 		value = createColumn(
 			"value", String.class, Types.VARCHAR, Column.FLAG_DEFAULT);
+	public final Column<CPDefinitionSpecificationOptionValueTable, Boolean>
+		visible = createColumn(
+			"visible", Boolean.class, Types.BOOLEAN, Column.FLAG_DEFAULT);
 	public final Column<CPDefinitionSpecificationOptionValueTable, Date>
 		lastPublishDate = createColumn(
 			"lastPublishDate", Date.class, Types.TIMESTAMP,

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/model/CPDefinitionSpecificationOptionValueWrapper.java

@@ -59,6 +59,7 @@ public Map<String, Object> getModelAttributes() {
 		attributes.put("key", getKey());
 		attributes.put("priority", getPriority());
 		attributes.put("value", getValue());
+		attributes.put("visible", isVisible());
 		attributes.put("lastPublishDate", getLastPublishDate());
 
 		return attributes;
@@ -172,6 +173,12 @@ public void setModelAttributes(Map<String, Object> attributes) {
 			setValue(value);
 		}
 
+		Boolean visible = (Boolean)attributes.get("visible");
+
+		if (visible != null) {
+			setVisible(visible);
+		}
+
 		Date lastPublishDate = (Date)attributes.get("lastPublishDate");
 
 		if (lastPublishDate != null) {
@@ -481,6 +488,26 @@ public Map<java.util.Locale, String> getValueMap() {
 		return model.getValueMap();
 	}
 
+	/**
+	 * Returns the visible of this cp definition specification option value.
+	 *
+	 * @return the visible of this cp definition specification option value
+	 */
+	@Override
+	public boolean getVisible() {
+		return model.getVisible();
+	}
+
+	/**
+	 * Returns <code>true</code> if this cp definition specification option value is visible.
+	 *
+	 * @return <code>true</code> if this cp definition specification option value is visible; <code>false</code> otherwise
+	 */
+	@Override
+	public boolean isVisible() {
+		return model.isVisible();
+	}
+
 	@Override
 	public void persist() {
 		model.persist();
@@ -758,6 +785,16 @@ public void setValueMap(
 		model.setValueMap(valueMap, defaultLocale);
 	}
 
+	/**
+	 * Sets whether this cp definition specification option value is visible.
+	 *
+	 * @param visible the visible of this cp definition specification option value
+	 */
+	@Override
+	public void setVisible(boolean visible) {
+		model.setVisible(visible);
+	}
+
 	@Override
 	public String toXmlString() {
 		return model.toXmlString();

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/model/CPSpecificationOptionModel.java

@@ -501,6 +501,27 @@ public void setDescriptionMap(
 	 */
 	public void setPriority(double priority);
 
+	/**
+	 * Returns the visible of this cp specification option.
+	 *
+	 * @return the visible of this cp specification option
+	 */
+	public boolean getVisible();
+
+	/**
+	 * Returns <code>true</code> if this cp specification option is visible.
+	 *
+	 * @return <code>true</code> if this cp specification option is visible; <code>false</code> otherwise
+	 */
+	public boolean isVisible();
+
+	/**
+	 * Sets whether this cp specification option is visible.
+	 *
+	 * @param visible the visible of this cp specification option
+	 */
+	public void setVisible(boolean visible);
+
 	/**
 	 * Returns the last publish date of this cp specification option.
 	 *

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/model/CPSpecificationOptionTable.java

@@ -72,6 +72,9 @@ public class CPSpecificationOptionTable
 	public final Column<CPSpecificationOptionTable, Double> priority =
 		createColumn(
 			"priority", Double.class, Types.DOUBLE, Column.FLAG_DEFAULT);
+	public final Column<CPSpecificationOptionTable, Boolean> visible =
+		createColumn(
+			"visible", Boolean.class, Types.BOOLEAN, Column.FLAG_DEFAULT);
 	public final Column<CPSpecificationOptionTable, Date> lastPublishDate =
 		createColumn(
 			"lastPublishDate", Date.class, Types.TIMESTAMP,

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/model/CPSpecificationOptionWrapper.java

@@ -54,6 +54,7 @@ public Map<String, Object> getModelAttributes() {
 		attributes.put("facetable", isFacetable());
 		attributes.put("key", getKey());
 		attributes.put("priority", getPriority());
+		attributes.put("visible", isVisible());
 		attributes.put("lastPublishDate", getLastPublishDate());
 
 		return attributes;
@@ -159,6 +160,12 @@ public void setModelAttributes(Map<String, Object> attributes) {
 			setPriority(priority);
 		}
 
+		Boolean visible = (Boolean)attributes.get("visible");
+
+		if (visible != null) {
+			setVisible(visible);
+		}
+
 		Date lastPublishDate = (Date)attributes.get("lastPublishDate");
 
 		if (lastPublishDate != null) {
@@ -532,6 +539,16 @@ public String getUuid() {
 		return model.getUuid();
 	}
 
+	/**
+	 * Returns the visible of this cp specification option.
+	 *
+	 * @return the visible of this cp specification option
+	 */
+	@Override
+	public boolean getVisible() {
+		return model.getVisible();
+	}
+
 	/**
 	 * Returns <code>true</code> if this cp specification option is facetable.
 	 *
@@ -542,6 +559,16 @@ public boolean isFacetable() {
 		return model.isFacetable();
 	}
 
+	/**
+	 * Returns <code>true</code> if this cp specification option is visible.
+	 *
+	 * @return <code>true</code> if this cp specification option is visible; <code>false</code> otherwise
+	 */
+	@Override
+	public boolean isVisible() {
+		return model.isVisible();
+	}
+
 	@Override
 	public void persist() {
 		model.persist();
@@ -863,6 +890,16 @@ public void setUuid(String uuid) {
 		model.setUuid(uuid);
 	}
 
+	/**
+	 * Sets whether this cp specification option is visible.
+	 *
+	 * @param visible the visible of this cp specification option
+	 */
+	@Override
+	public void setVisible(boolean visible) {
+		model.setVisible(visible);
+	}
+
 	@Override
 	public String toXmlString() {
 		return model.toXmlString();

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionSpecificationOptionValueLocalService.java

@@ -86,7 +86,7 @@ public interface CPDefinitionSpecificationOptionValueLocalService
 			addCPDefinitionSpecificationOptionValue(
 				String externalReferenceCode, long cpDefinitionId,
 				long cpSpecificationOptionId, long cpOptionCategoryId,
-				double priority, Map<Locale, String> valueMap,
+				double priority, Map<Locale, String> valueMap, boolean visible,
 				ServiceContext serviceContext)
 		throws PortalException;
 
@@ -331,19 +331,19 @@ public long dynamicQueryCount(
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public List<CPDefinitionSpecificationOptionValue>
 		getCPDefinitionSpecificationOptionValues(
-			long cpSpecificationOptionId, int start, int end);
+			long cpDefinitionId, Boolean visible, int start, int end,
+			OrderByComparator<CPDefinitionSpecificationOptionValue>
+				orderByComparator);
 
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public List<CPDefinitionSpecificationOptionValue>
 		getCPDefinitionSpecificationOptionValues(
-			long cpDefinitionId, int start, int end,
-			OrderByComparator<CPDefinitionSpecificationOptionValue>
-				orderByComparator);
+			long cpSpecificationOptionId, int start, int end);
 
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public List<CPDefinitionSpecificationOptionValue>
 		getCPDefinitionSpecificationOptionValues(
-			long cpDefinitionId, long cpOptionCategoryId);
+			long cpDefinitionId, long cpOptionCategoryId, Boolean visible);
 
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public List<CPDefinitionSpecificationOptionValue>
@@ -389,7 +389,7 @@ public long dynamicQueryCount(
 
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getCPDefinitionSpecificationOptionValuesCount(
-		long cpDefinitionId);
+		long cpDefinitionId, Boolean visible);
 
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getCPSpecificationOptionDefinitionValuesCount(
@@ -438,7 +438,8 @@ public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 				String externalReferenceCode,
 				long cpDefinitionSpecificationOptionValueId,
 				long cpOptionCategoryId, String key, double priority,
-				Map<Locale, String> valueMap, ServiceContext serviceContext)
+				Map<Locale, String> valueMap, boolean visible,
+				ServiceContext serviceContext)
 		throws PortalException;
 
 	public CPDefinitionSpecificationOptionValue updateCPOptionCategoryId(