Skip to content

Commit

Permalink
LPD-37064 - removed feature flag from relevant files
Browse files Browse the repository at this point in the history
  • Loading branch information
@brbalazs @brianchandotcom
brbalazs authored and brianchandotcom committed Sep 26, 2024
1 parent 1c6455a commit 3debe04
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 156 deletions.
50 changes: 0 additions & 50 deletions ...ernal/instance/lifecycle/AddCommerceOrderNotificationPortalInstanceLifecycleListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import com.liferay.portal.instance.lifecycle.BasePortalInstanceLifecycleListener;
import com.liferay.portal.instance.lifecycle.PortalInstanceLifecycleListener;
import com.liferay.portal.kernel.exception.NoSuchUserException;
import com.liferay.portal.kernel.feature.flag.FeatureFlagListener;
import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.model.Company;
Expand All @@ -32,7 +30,6 @@
import com.liferay.portal.kernel.service.RoleLocalService;
import com.liferay.portal.kernel.service.UserLocalService;
import com.liferay.portal.kernel.util.LocaleUtil;
import com.liferay.portal.kernel.util.MapUtil;
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
Expand All @@ -43,11 +40,7 @@
import java.util.Collections;
import java.util.List;

import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;

/**
Expand All @@ -62,12 +55,6 @@ public class AddCommerceOrderNotificationPortalInstanceLifecycleListener

@Override
public void portalInstanceRegistered(Company company) throws Exception {
if (!FeatureFlagManagerUtil.isEnabled(
company.getCompanyId(), "LPD-24498")) {

return;
}

try {
_verifyCommerceOrderNotificationTemplate(company.getCompanyId());
_verifyCommerceOrderObjectAction(company.getCompanyId());
Expand All @@ -79,18 +66,6 @@ public void portalInstanceRegistered(Company company) throws Exception {
}
}

@Activate
protected void activate(BundleContext bundleContext) {
_serviceRegistration = bundleContext.registerService(
FeatureFlagListener.class, new FeatureFlagListenerImpl(),
MapUtil.singletonDictionary("featureFlagKey", "LPD-24498"));
}

@Deactivate
protected void deactivate() {
_serviceRegistration.unregister();
}

private User _getAdminUser(long companyId) throws Exception {
Role role = _roleLocalService.getRole(
companyId, RoleConstants.ADMINISTRATOR);
Expand Down Expand Up @@ -226,32 +201,7 @@ private void _verifyCommerceOrderObjectAction(long companyId)
@Reference
private RoleLocalService _roleLocalService;

private ServiceRegistration<FeatureFlagListener> _serviceRegistration;

@Reference
private UserLocalService _userLocalService;

private class FeatureFlagListenerImpl implements FeatureFlagListener {

@Override
public void onValue(
long companyId, String featureFlagKey, boolean enabled) {

if (!enabled) {
return;
}

try {
_verifyCommerceOrderNotificationTemplate(companyId);
_verifyCommerceOrderObjectAction(companyId);
}
catch (Exception exception) {
if (_log.isDebugEnabled()) {
_log.debug(exception);
}
}
}

}

}
2 changes: 0 additions & 2 deletions ...tance/lifecycle/test/AddCommerceOrderNotificationPortalInstanceLifecycleListenerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.liferay.portal.kernel.service.CompanyLocalService;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.util.TestPropsValues;
import com.liferay.portal.test.rule.FeatureFlags;
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

Expand All @@ -30,7 +29,6 @@
/**
* @author Stefano Motta
*/
@FeatureFlags("LPD-24498")
@RunWith(Arquillian.class)
public class AddCommerceOrderNotificationPortalInstanceLifecycleListenerTest {

Expand Down
89 changes: 22 additions & 67 deletions ...erce-product-definitions-web/src/main/resources/META-INF/resources/definition/details.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,73 +183,28 @@ if ((cpDefinition != null) && (cpDefinition.getExpirationDate() != null)) {
</div>

<c:if test="<%= cpDefinition != null %>">
<c:choose>
<c:when test='<%= FeatureFlagManagerUtil.isEnabled("LPD-21636") %>'>
<div class="col-12">
<commerce-ui:panel
bodyClasses="p-0"
title='<%= LanguageUtil.get(request, "specifications") %>'
>
<frontend-data-set:classic-display
contextParams='<%=
HashMapBuilder.<String, String>put(
"cpDefinitionId", String.valueOf(cpDefinitionId)
).build()
%>'
creationMenu="<%= cpDefinitionsDisplayContext.getCPDefinitionSpecificationOptionValueCreationMenu() %>"
dataProviderKey="<%= CommerceProductFDSNames.PRODUCT_DEFINITION_SPECIFICATIONS %>"
formName="fm"
id="<%= CommerceProductFDSNames.PRODUCT_DEFINITION_SPECIFICATIONS %>"
itemsPerPage="<%= 10 %>"
selectedItemsKey="cpdefinitionSpecificationOptionValueId"
showManagementBar="<%= true %>"
showSearch="<%= true %>"
/>
</commerce-ui:panel>
</div>
</c:when>
<c:otherwise>
<div class="col-12">
<div id="item-finder-root"></div>

<liferay-frontend:component
context='<%=
HashMapBuilder.<String, Object>put(
"portletId", portletDisplay.getRootPortletId()
).put(
"productDefinitonSpecifications", CommerceProductFDSNames.PRODUCT_DEFINITION_SPECIFICATIONS
).put(
"productId", cpDefinition.getCProductId()
).put(
"spritemap", themeDisplay.getPathThemeSpritemap()
).build()
%>'
module="{detailsItemFinder} from commerce-product-definitions-web"
/>
</div>

<div class="col-12">
<commerce-ui:panel
bodyClasses="p-0"
title='<%= LanguageUtil.get(request, "specifications") %>'
>
<frontend-data-set:classic-display
contextParams='<%=
HashMapBuilder.<String, String>put(
"cpDefinitionId", String.valueOf(cpDefinitionId)
).build()
%>'
dataProviderKey="<%= CommerceProductFDSNames.PRODUCT_DEFINITION_SPECIFICATIONS %>"
formName="fm"
id="<%= CommerceProductFDSNames.PRODUCT_DEFINITION_SPECIFICATIONS %>"
itemsPerPage="<%= 10 %>"
selectedItemsKey="cpdefinitionSpecificationOptionValueId"
showManagementBar="<%= false %>"
/>
</commerce-ui:panel>
</div>
</c:otherwise>
</c:choose>
<div class="col-12">
<commerce-ui:panel
bodyClasses="p-0"
title='<%= LanguageUtil.get(request, "specifications") %>'
>
<frontend-data-set:classic-display
contextParams='<%=
HashMapBuilder.<String, String>put(
"cpDefinitionId", String.valueOf(cpDefinitionId)
).build()
%>'
creationMenu="<%= cpDefinitionsDisplayContext.getCPDefinitionSpecificationOptionValueCreationMenu() %>"
dataProviderKey="<%= CommerceProductFDSNames.PRODUCT_DEFINITION_SPECIFICATIONS %>"
formName="fm"
id="<%= CommerceProductFDSNames.PRODUCT_DEFINITION_SPECIFICATIONS %>"
itemsPerPage="<%= 10 %>"
selectedItemsKey="cpdefinitionSpecificationOptionValueId"
showManagementBar="<%= true %>"
showSearch="<%= true %>"
/>
</commerce-ui:panel>
</div>
</c:if>
</div>
</aui:form>
Expand Down
1 change: 0 additions & 1 deletion .../commerce/commerce-product-definitions-web/src/main/resources/META-INF/resources/init.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ page import="com.liferay.frontend.taglib.clay.servlet.taglib.util.SelectOption"
page import="com.liferay.info.collection.provider.RelatedInfoItemCollectionProvider" %><%@
page import="com.liferay.petra.string.StringPool" %><%@
page import="com.liferay.portal.kernel.bean.BeanParamUtil" %><%@
page import="com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil" %><%@
page import="com.liferay.portal.kernel.language.LanguageUtil" %><%@
page import="com.liferay.portal.kernel.model.Layout" %><%@
page import="com.liferay.portal.kernel.model.Portlet" %><%@
Expand Down
1 change: 0 additions & 1 deletion ...apps/commerce/commerce-product-options-web/src/main/resources/META-INF/resources/init.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ page import="com.liferay.frontend.taglib.clay.servlet.taglib.util.NavigationItem
page import="com.liferay.petra.string.StringPool" %><%@
page import="com.liferay.portal.kernel.bean.BeanParamUtil" %><%@
page import="com.liferay.portal.kernel.dao.search.ResultRow" %><%@
page import="com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil" %><%@
page import="com.liferay.portal.kernel.language.LanguageUtil" %><%@
page import="com.liferay.portal.kernel.portlet.LiferayWindowState" %><%@
page import="com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder" %><%@
Expand Down
60 changes: 29 additions & 31 deletions ...roduct-options-web/src/main/resources/META-INF/resources/specification_option/details.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,37 +58,35 @@ List<CPOptionCategory> cpOptionCategories = cpSpecificationOptionDisplayContext.
</aui:fieldset>
</commerce-ui:panel>

<c:if test='<%= FeatureFlagManagerUtil.isEnabled("LPD-21636") %>'>
<commerce-ui:panel
elementClasses="mt-4"
title='<%= LanguageUtil.get(request, "picklist") %>'
>
<frontend-data-set:classic-display
additionalProps='<%=
HashMapBuilder.<String, Object>put(
"specificationId", (cpSpecificationOption == null) ? 0 : cpSpecificationOption.getCPSpecificationOptionId()
).build()
%>'
contextParams='<%=
HashMapBuilder.put(
"specificationId", (cpSpecificationOption == null) ? "0" : String.valueOf(cpSpecificationOption.getCPSpecificationOptionId())
).build()
%>'
creationMenu="<%= cpSpecificationOptionDisplayContext.getCreationMenu(cpSpecificationOption) %>"
dataProviderKey="<%= CommerceSpecificationOptionFDSNames.LIST_TYPE_DEFINITIONS %>"
id="<%= CommerceSpecificationOptionFDSNames.LIST_TYPE_DEFINITIONS %>"
itemsPerPage="<%= 10 %>"
propsTransformer="{CPSpecificationOptionListTypeDefinitionPropsTransformer} from commerce-product-options-web"
style="stacked"
/>
</commerce-ui:panel>

<div>
<react:component
module="{ListTypeEntriesModal} from object-web"
/>
</div>
</c:if>
<commerce-ui:panel
elementClasses="mt-4"
title='<%= LanguageUtil.get(request, "picklist") %>'
>
<frontend-data-set:classic-display
additionalProps='<%=
HashMapBuilder.<String, Object>put(
"specificationId", (cpSpecificationOption == null) ? 0 : cpSpecificationOption.getCPSpecificationOptionId()
).build()
%>'
contextParams='<%=
HashMapBuilder.put(
"specificationId", (cpSpecificationOption == null) ? "0" : String.valueOf(cpSpecificationOption.getCPSpecificationOptionId())
).build()
%>'
creationMenu="<%= cpSpecificationOptionDisplayContext.getCreationMenu(cpSpecificationOption) %>"
dataProviderKey="<%= CommerceSpecificationOptionFDSNames.LIST_TYPE_DEFINITIONS %>"
id="<%= CommerceSpecificationOptionFDSNames.LIST_TYPE_DEFINITIONS %>"
itemsPerPage="<%= 10 %>"
propsTransformer="{CPSpecificationOptionListTypeDefinitionPropsTransformer} from commerce-product-options-web"
style="stacked"
/>
</commerce-ui:panel>

<div>
<react:component
module="{ListTypeEntriesModal} from object-web"
/>
</div>

<c:if test="<%= cpSpecificationOption == null %>">
<liferay-frontend:component
Expand Down
4 changes: 0 additions & 4 deletions ...tests/commerce/commerce-product-options-web/commerceProductSpecificationsPicklist.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,13 @@ import {apiHelpersTest} from '../../../fixtures/apiHelpersTest';
import {applicationsMenuPageTest} from '../../../fixtures/applicationsMenuPageTest';
import {commercePagesTest} from '../../../fixtures/commercePagesTest';
import {dataApiHelpersTest} from '../../../fixtures/dataApiHelpersTest';
import {featureFlagsTest} from '../../../fixtures/featureFlagsTest';
import {loginTest} from '../../../fixtures/loginTest';

export const test = mergeTests(
apiHelpersTest,
applicationsMenuPageTest,
commercePagesTest,
dataApiHelpersTest,
featureFlagsTest({
'LPD-21636': true,
}),
loginTest()
);

Expand Down

0 comments on commit 3debe04

Please sign in to comment.