LPS-198165 Remove Release FF for import maps and Theme SVG client ext…

…ensions
brianchandotcom · Oct 21, 2023 · 3fcfdce · 3fcfdce
1 parent e8f6017
commit 3fcfdce
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 92 deletions.
diff --git a/...xtension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETFactory.java b/...xtension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETFactory.java
@@ -56,16 +56,6 @@ public void validate(
 		ClientExtensionEntryConstants.TYPE_FDS_FILTER, "LPS-164563"
 	).put(
 
-		// feature.flag.LPS-166479
-
-		ClientExtensionEntryConstants.TYPE_THEME_SPRITEMAP, "LPS-166479"
-	).put(
-
-		// feature.flag.LPS-172903
-
-		ClientExtensionEntryConstants.TYPE_JS_IMPORT_MAPS_ENTRY, "LPS-172903"
-	).put(
-
 		// feature.flag.LPS-177027
 
 		ClientExtensionEntryConstants.TYPE_STATIC_CONTENT, "LPS-177027"

diff --git a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout/css.jsp b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout/css.jsp
@@ -35,18 +35,16 @@ LayoutLookAndFeelDisplayContext layoutLookAndFeelDisplayContext = new LayoutLook
 	/>
 </liferay-frontend:fieldset>
 
-<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPS-166479") %>'>
-	<liferay-frontend:fieldset
-		collapsed="<%= false %>"
-		collapsible="<%= true %>"
-		label="theme-spritemap-client-extension"
-	>
-		<react:component
-			module="js/layout/look_and_feel/ThemeSpritemapCETsConfiguration"
-			props="<%= layoutLookAndFeelDisplayContext.getThemeSpritemapCETConfigurationProps(Layout.class.getName(), selLayout.getPlid()) %>"
-		/>
-	</liferay-frontend:fieldset>
-</c:if>
+<liferay-frontend:fieldset
+	collapsed="<%= false %>"
+	collapsible="<%= true %>"
+	label="theme-spritemap-client-extension"
+>
+	<react:component
+		module="js/layout/look_and_feel/ThemeSpritemapCETsConfiguration"
+		props="<%= layoutLookAndFeelDisplayContext.getThemeSpritemapCETConfigurationProps(Layout.class.getName(), selLayout.getPlid()) %>"
+	/>
+</liferay-frontend:fieldset>
 
 <liferay-frontend:fieldset
 	collapsed="<%= false %>"

diff --git a/...les/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout_set/css.jsp b/...les/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout_set/css.jsp
@@ -35,18 +35,16 @@ LayoutSet selLayoutSet = layoutsAdminDisplayContext.getSelLayoutSet();
 	/>
 </liferay-frontend:fieldset>
 
-<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPS-166479") %>'>
-	<liferay-frontend:fieldset
-		collapsed="<%= false %>"
-		collapsible="<%= true %>"
-		label="theme-spritemap-client-extension"
-	>
-		<react:component
-			module="js/layout/look_and_feel/ThemeSpritemapCETsConfiguration"
-			props="<%= layoutLookAndFeelDisplayContext.getThemeSpritemapCETConfigurationProps(LayoutSet.class.getName(), selLayoutSet.getLayoutSetId()) %>"
-		/>
-	</liferay-frontend:fieldset>
-</c:if>
+<liferay-frontend:fieldset
+	collapsed="<%= false %>"
+	collapsible="<%= true %>"
+	label="theme-spritemap-client-extension"
+>
+	<react:component
+		module="js/layout/look_and_feel/ThemeSpritemapCETsConfiguration"
+		props="<%= layoutLookAndFeelDisplayContext.getThemeSpritemapCETConfigurationProps(LayoutSet.class.getName(), selLayoutSet.getLayoutSetId()) %>"
+	/>
+</liferay-frontend:fieldset>
 
 <liferay-frontend:fieldset
 	collapsed="<%= false %>"

diff --git a/portal-impl/src/portal.properties b/portal-impl/src/portal.properties
@@ -6488,11 +6488,6 @@
     #
     feature.flag.LPS-166126=false
 
-    #
-    # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER6__NUMBER6__NUMBER4__NUMBER7__NUMBER9_
-    #
-    feature.flag.LPS-166479=false
-
     #
     # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER6__NUMBER9__NUMBER8__NUMBER3__NUMBER7_
     #
@@ -6528,11 +6523,6 @@
     #
     feature.flag.LPS-172416=false
 
-    #
-    # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER7__NUMBER2__NUMBER9__NUMBER0__NUMBER3_
-    #
-    feature.flag.LPS-172903=false
-
     #
     # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER7__NUMBER3__NUMBER1__NUMBER3__NUMBER5_
     #
@@ -6912,16 +6902,6 @@
     #
     feature.flag.LPS-148856.title=Object Model Builder
 
-    #
-    # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER6__NUMBER6__NUMBER4__NUMBER7__NUMBER9__PERIOD_DESCRIPTION
-    #
-    feature.flag.LPS-166479.description=Developers will able to use theme spritemap client extensions.
-
-    #
-    # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER6__NUMBER6__NUMBER4__NUMBER7__NUMBER9__PERIOD_TYPE
-    #
-    feature.flag.LPS-166479.type=release
-
     #
     # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER6__NUMBER4__NUMBER5__NUMBER6__NUMBER3__PERIOD_TITLE
     #
@@ -6937,11 +6917,6 @@
     #
     feature.flag.LPS-164563.type=beta
 
-    #
-    # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER6__NUMBER6__NUMBER4__NUMBER7__NUMBER9__PERIOD_TITLE
-    #
-    feature.flag.LPS-166479.title=Theme Spritemap Client Extension
-
     #
     # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER7__NUMBER1__NUMBER3__NUMBER6__NUMBER4__PERIOD_DESCRIPTION
     #
@@ -6957,21 +6932,6 @@
     #
     feature.flag.LPS-171364.type=beta
 
-    #
-    # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER7__NUMBER2__NUMBER9__NUMBER0__NUMBER3__PERIOD_DESCRIPTION
-    #
-    feature.flag.LPS-172903.description=Developers will able to use JS import maps entry client extensions.
-
-    #
-    # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER7__NUMBER2__NUMBER9__NUMBER0__NUMBER3__PERIOD_TYPE
-    #
-    feature.flag.LPS-172903.type=release
-
-    #
-    # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER7__NUMBER2__NUMBER9__NUMBER0__NUMBER3__PERIOD_TITLE
-    #
-    feature.flag.LPS-172903.title=JS Import Maps Entry Client Extension
-
     #
     # Env: LIFERAY_FEATURE_PERIOD_FLAG_PERIOD__UPPERCASEL__UPPERCASEP__UPPERCASES__MINUS__NUMBER1__NUMBER7__NUMBER4__NUMBER4__NUMBER1__NUMBER7__PERIOD_DESCRIPTION
     #

diff --git a/...ts/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtension.testcase b/...ts/enduser/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtension.testcase
@@ -1197,8 +1197,6 @@ definition {
 	@description = "LPS-166479. Created (theme SVG extensions), the theme SVG extensions admin page lists the name and type"
 	@priority = 4
 	test ThemeSvgTypeCanBeCreated {
-		property custom.properties = "feature.flag.LPS-166479=true";
-
 		task ("Given a created Client Extension") {
 			ClientExtensionGeneral.goToRemoteAppsPortlet();
 		}

diff --git a/...er/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionThemeSvg.testcase b/...er/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionThemeSvg.testcase
@@ -39,7 +39,6 @@ definition {
 	@description = "LPS-166479. Verify that new SVG spritemap is applied on the page"
 	@priority = 3
 	test CanExtendSvgFileFromDM {
-		property custom.properties = "feature.flag.LPS-166479=true";
 		property portal.acceptance = "true";
 
 		var portalURL = PropsUtil.get("portal.url");
@@ -82,7 +81,6 @@ definition {
 	@description = "LPS-173318. Verify that new SVG spritemap file from external site is applied on the page"
 	@priority = 3
 	test CanExtendSvgFileFromExternalSite {
-		property custom.properties = "feature.flag.LPS-166479=true";
 		property portal.acceptance = "true";
 
 		task ("A created Theme svg extensions using the external URL") {

diff --git a/...er/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionsSamples.testcase b/...er/frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionsSamples.testcase
@@ -1,7 +1,6 @@
 @component-name = "liferay-sample-workspace"
 definition {
 
-	property custom.properties = "feature.flag.LPS-166479=true";
 	property portal.release = "true";
 	property portal.upstream = "true";
 	property test.liferay.virtual.instance = "false";

diff --git a/.../frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionsSamplesVI.testcase b/.../frontendinfrastructure/uiinfrastructure/remotewebapps/ClientExtensionsSamplesVI.testcase
@@ -1,7 +1,6 @@
 @component-name = "liferay-sample-workspace"
 definition {
 
-	property custom.properties = "feature.flag.LPS-166479=true";
 	property portal.release = "true";
 	property portal.upstream = "true";
 	property test.liferay.virtual.instance = "true";

diff --git a/workspaces/liferay-clarity-workspace/configs/local/portal-ext.properties b/workspaces/liferay-clarity-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-customer-workspace/configs/local/portal-ext.properties b/workspaces/liferay-customer-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-dotcom-workspace/configs/local/portal-ext.properties b/workspaces/liferay-dotcom-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-jethr0-workspace/configs/local/portal-ext.properties b/workspaces/liferay-jethr0-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-learn-workspace/configs/local/portal-ext.properties b/workspaces/liferay-learn-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-marketplace-workspace/configs/local/portal-ext.properties b/workspaces/liferay-marketplace-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-partner-workspace/configs/local/portal-ext.properties b/workspaces/liferay-partner-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-sample-workspace/configs/local/portal-ext.properties b/workspaces/liferay-sample-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-testray-workspace/configs/local/portal-ext.properties b/workspaces/liferay-testray-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-ticket-workspace/configs/local/portal-ext.properties b/workspaces/liferay-ticket-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/liferay-tryitnow-workspace/configs/local/portal-ext.properties b/workspaces/liferay-tryitnow-workspace/configs/local/portal-ext.properties
@@ -7,6 +7,5 @@
 #jdbc.default.password=
 
 feature.flag.LPS-164563=true
-feature.flag.LPS-166479=true
 feature.flag.LPS-172903=true
 feature.flag.LPS-177027=true
diff --git a/workspaces/refresh_liferay_sample_workspace.sh b/workspaces/refresh_liferay_sample_workspace.sh
@@ -50,7 +50,7 @@ function refresh_liferay_sample_workspace {
 
 	echo -en "\n**/dist\n**/node_modules_cache\n.DS_Store" >> .gitignore
 
-	echo -en "\n\nfeature.flag.LPS-166479=true\nfeature.flag.LPS-172903=true\nfeature.flag.LPS-164563=true\nfeature.flag.LPS-177027=true" >> configs/local/portal-ext.properties
+	echo -en "\n\nfeature.flag.LPS-172903=true\nfeature.flag.LPS-164563=true\nfeature.flag.LPS-177027=true" >> configs/local/portal-ext.properties
 
 	#echo -en "\nliferay.workspace.docker.image.liferay=liferay/dxp:7.4.13-u54-d5.0.5-20221208173455" >> gradle.properties
 	echo -en "\nliferay.workspace.node.package.manager=yarn" >> gradle.properties