LPD-9465 - Allow users to save Custom Views

modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/fragment/renderer/FDSAdminFragmentRenderer.java

@@ -52,6 +52,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -183,13 +184,17 @@ public void render(
 				return;
 			}
 
+			Map<String, Object> properties = dataSetObjectEntry.getProperties();
+
 			if (!FeatureFlagManagerUtil.isEnabled(
 					_portal.getCompanyId(httpServletRequest), "LPD-38564")) {
 
 				_fdsRenderer.render(
 					HashMapBuilder.<String, Object>put(
 						"namespace",
 						fragmentRendererContext.getFragmentElementId()
+					).put(
+						"snapshotsEnabled", properties.get("snapshotsEnabled")
 					).put(
 						"style", "fluid"
 					).build(),
@@ -230,6 +235,8 @@ public void render(
 					HashMapBuilder.<String, Object>put(
 						"namespace",
 						fragmentRendererContext.getFragmentElementId()
+					).put(
+						"snapshotsEnabled", properties.get("snapshotsEnabled")
 					).put(
 						"style", "fluid"
 					).put(

modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/resources/META-INF/resources/js/data_set/settings/Settings.tsx

@@ -38,6 +38,9 @@ const Settings = ({
 	onDataSetUpdate,
 	spritemap,
 }: IDataSetSectionProps) => {
+	const [snapshotsEnabled, setSnapshotsEnabled] = useState<boolean>(
+		dataSet.snapshotsEnabled
+	);
 	const [defaultVisualizationMode, setDefaultVisualizationMode] = useState<
 		string | undefined
 	>(NOT_CONFIGURED_VISUALIZATION_MODE.type);
@@ -57,6 +60,7 @@ const Settings = ({
 		const body = {
 			defaultVisualizationMode,
 			hideManagementBarInEmptyState,
+			snapshotsEnabled,
 		};
 
 		const url = getDataSetResourceURL({
@@ -350,8 +354,8 @@ const Settings = ({
 						{Liferay.Language.get('user-customization')}
 					</h3>
 
-					<ClayLayout.Row className="align-items-center justify-content-between">
-						<ClayLayout.Col size={8}>
+					<ClayLayout.Row className="align-items-center justify-content-between mb-4">
+						<ClayLayout.Col size={11}>
 							<div>
 								<label
 									htmlFor="hide-management-bar-in-empty-state"
@@ -370,7 +374,7 @@ const Settings = ({
 							</div>
 						</ClayLayout.Col>
 
-						<ClayLayout.Col size={4}>
+						<ClayLayout.Col size={1}>
 							<div className="d-flex form-group justify-content-end mr-2">
 								<ClayToggle
 									disabled={loading}
@@ -380,6 +384,35 @@ const Settings = ({
 							</div>
 						</ClayLayout.Col>
 					</ClayLayout.Row>
+
+					{Liferay.FeatureFlags['LPD-10683'] && (
+						<ClayLayout.Row className="align-items-center justify-content-between mb-4">
+							<ClayLayout.Col size={11}>
+								<div>
+									<label htmlFor="user-views-toggle">
+										{Liferay.Language.get(
+											'enable-user-views'
+										)}
+									</label>
+								</div>
+
+								<div>
+									{Liferay.Language.get('user-views-help')}
+								</div>
+							</ClayLayout.Col>
+
+							<ClayLayout.Col
+								className="align-self-start"
+								size={1}
+							>
+								<ClayToggle
+									id="user-views-toggle"
+									onToggle={setSnapshotsEnabled}
+									toggled={snapshotsEnabled}
+								/>
+							</ClayLayout.Col>
+						</ClayLayout.Row>
+					)}
 				</ClayLayout.SheetSection>
 
 				<ClayLayout.SheetFooter>

modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/resources/META-INF/resources/js/utils/types.ts

@@ -71,6 +71,7 @@ export interface IDataSet {
 	restApplication: string;
 	restEndpoint: string;
 	restSchema: string;
+	snapshotsEnabled: boolean;
 	sortsOrder?: string;
 	tableSectionsOrder?: string;
 }

modules/apps/frontend-data-set/frontend-data-set-api/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: Liferay Frontend Data Set API
 Bundle-SymbolicName: com.liferay.frontend.data.set.api
-Bundle-Version: 24.0.1
+Bundle-Version: 24.1.0
 Export-Package:\
 	com.liferay.frontend.data.set,\
 	com.liferay.frontend.data.set.action,\

modules/apps/frontend-data-set/frontend-data-set-api/src/main/java/com/liferay/frontend/data/set/serializer/FDSSerializer.java

@@ -78,6 +78,9 @@ public JSONObject serializePagination(
 	public String serializePropsTransformer(
 		String fdsName, HttpServletRequest httpServletRequest);
 
+	public JSONArray serializeSnapshots(
+		String fdsName, HttpServletRequest httpServletRequest);
+
 	public List<FDSSortItem> serializeSorts(
 		String fdsName, HttpServletRequest httpServletRequest);
 

modules/apps/frontend-data-set/frontend-data-set-api/src/main/resources/com/liferay/frontend/data/set/serializer/packageinfo

@@ -1 +1 @@
-version 4.2.0
+version 4.3.0

modules/apps/frontend-data-set/frontend-data-set-impl/src/main/java/com/liferay/frontend/data/set/internal/renderer/FDSRendererImpl.java

@@ -18,10 +18,12 @@
 import com.liferay.portal.kernel.json.JSONUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.theme.ThemeDisplay;
 import com.liferay.portal.kernel.util.HashMapBuilder;
 import com.liferay.portal.kernel.util.ListUtil;
 import com.liferay.portal.kernel.util.Portal;
 import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.kernel.util.WebKeys;
 import com.liferay.portal.template.react.renderer.ComponentDescriptor;
 import com.liferay.portal.template.react.renderer.ReactRenderer;
 
@@ -110,6 +112,21 @@ public void render(
 			}
 		}
 		else {
+			Boolean snapshotsEnabled;
+
+			ThemeDisplay themeDisplay =
+				(ThemeDisplay)httpServletRequest.getAttribute(
+					WebKeys.THEME_DISPLAY);
+
+			if (Validator.isNull(props.get("snapshotsEnabled")) ||
+				!themeDisplay.isSignedIn()) {
+
+				snapshotsEnabled = false;
+			}
+			else {
+				snapshotsEnabled = (boolean)props.get("snapshotsEnabled");
+			}
+
 			props.putAll(
 				HashMapBuilder.<String, Object>put(
 					"additionalAPIURLParameters",
@@ -211,6 +228,25 @@ public void render(
 
 						return paginationJSONObject;
 					}
+				).put(
+					"snapshots",
+					() -> {
+						if (!snapshotsEnabled) {
+							return null;
+						}
+
+						JSONArray snapshotsJSONArray =
+							fdsSerializer.serializeSnapshots(
+								fdsName, httpServletRequest);
+
+						if (JSONUtil.isEmpty(snapshotsJSONArray)) {
+							return null;
+						}
+
+						return snapshotsJSONArray;
+					}
+				).put(
+					"snapshotsEnabled", snapshotsEnabled
 				).put(
 					"sorts",
 					() -> {

modules/apps/frontend-data-set/frontend-data-set-impl/src/main/java/com/liferay/frontend/data/set/internal/serializer/BaseFDSSerializer.java

@@ -7,9 +7,30 @@
 
 import com.liferay.frontend.data.set.internal.url.FDSAPIURLBuilder;
 import com.liferay.frontend.data.set.url.FDSAPIURLResolverRegistry;
+import com.liferay.object.entry.util.ObjectEntryThreadLocal;
+import com.liferay.object.model.ObjectDefinition;
+import com.liferay.object.rest.dto.v1_0.ObjectEntry;
+import com.liferay.object.rest.manager.v1_0.DefaultObjectEntryManagerProvider;
+import com.liferay.object.rest.manager.v1_0.ObjectEntryManager;
+import com.liferay.object.rest.manager.v1_0.ObjectEntryManagerRegistry;
+import com.liferay.object.service.ObjectDefinitionLocalService;
+import com.liferay.petra.string.StringBundler;
+import com.liferay.portal.kernel.json.JSONArray;
+import com.liferay.portal.kernel.json.JSONUtil;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.theme.ThemeDisplay;
+import com.liferay.portal.kernel.util.LocaleUtil;
+import com.liferay.portal.kernel.util.PortalUtil;
+import com.liferay.portal.kernel.util.WebKeys;
+import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import com.liferay.portal.vulcan.pagination.Page;
 
 import jakarta.servlet.http.HttpServletRequest;
 
+import java.util.Collection;
+import java.util.Map;
+
 import org.osgi.service.component.annotations.Reference;
 
 /**
@@ -26,7 +47,79 @@ public FDSAPIURLBuilder createFDSAPIURLBuilder(
 			restEndpoint, restSchema);
 	}
 
+	protected JSONArray serializeSnapshots(
+			String fdsName, HttpServletRequest httpServletRequest,
+			ObjectDefinitionLocalService objectDefinitionLocalService,
+			ObjectEntryManagerRegistry objectEntryManagerRegistry)
+		throws Exception {
+
+		ThemeDisplay themeDisplay =
+			(ThemeDisplay)httpServletRequest.getAttribute(
+				WebKeys.THEME_DISPLAY);
+
+		String filterExpression = StringBundler.concat(
+			"(fdsName eq '", fdsName, "' and creatorId eq ",
+			themeDisplay.getUserId(), ")");
+
+		ObjectEntryThreadLocal.setSkipObjectEntryResourcePermission(true);
+
+		JSONArray jsonArray = JSONUtil.putAll();
+
+		try {
+			ObjectDefinition objectDefinition =
+				objectDefinitionLocalService.fetchObjectDefinition(
+					PortalUtil.getCompanyId(httpServletRequest),
+					"DataSetSnapshot");
+
+			ObjectEntryManager objectEntryManager =
+				DefaultObjectEntryManagerProvider.provide(
+					objectEntryManagerRegistry.getObjectEntryManager(
+						objectDefinition.getCompanyId(),
+						objectDefinition.getStorageType()));
+
+			Page<ObjectEntry> page = objectEntryManager.getObjectEntries(
+				PortalUtil.getCompanyId(httpServletRequest), objectDefinition,
+				null, null,
+				new DefaultDTOConverterContext(
+					false, null, null, null, null,
+					LocaleUtil.getMostRelevantLocale(), null, null),
+				filterExpression, null, null, null);
+
+			Collection<ObjectEntry> objectEntries = page.getItems();
+
+			jsonArray = JSONUtil.toJSONArray(
+				objectEntries,
+				(ObjectEntry objectEntry) -> {
+					Map<String, Object> properties =
+						objectEntry.getProperties();
+
+					return JSONUtil.put(
+						"configuration", properties.get("viewConfig")
+					).put(
+						"erc", objectEntry.getExternalReferenceCode()
+					).put(
+						"label", String.valueOf(properties.get("label"))
+					);
+				});
+		}
+		catch (Exception exception) {
+			if (_log.isWarnEnabled()) {
+				_log.warn(
+					"Unable to get snapshot FDS config object entries",
+					exception);
+			}
+		}
+		finally {
+			ObjectEntryThreadLocal.setSkipObjectEntryResourcePermission(false);
+		}
+
+		return jsonArray;
+	}
+
 	@Reference
 	protected FDSAPIURLResolverRegistry fdsAPIURLResolverRegistry;
 
+	private static final Log _log = LogFactoryUtil.getLog(
+		BaseFDSSerializer.class);
+
 }

modules/apps/frontend-data-set/frontend-data-set-impl/src/main/java/com/liferay/frontend/data/set/internal/serializer/CustomFDSSerializer.java

@@ -474,6 +474,22 @@ public String serializePropsTransformer(
 		return String.valueOf(properties.get("propsTransformer"));
 	}
 
+	@Override
+	public JSONArray serializeSnapshots(
+		String fdsName, HttpServletRequest httpServletRequest) {
+
+		try {
+			return serializeSnapshots(
+				fdsName, httpServletRequest, _objectDefinitionLocalService,
+				_objectEntryManagerRegistry);
+		}
+		catch (Exception exception) {
+			_log.error("Unable to serialize snapshots", exception);
+
+			return _jsonFactory.createJSONArray();
+		}
+	}
+
 	@Override
 	public List<FDSSortItem> serializeSorts(
 		String fdsName, HttpServletRequest httpServletRequest) {

modules/apps/frontend-data-set/frontend-data-set-impl/src/main/java/com/liferay/frontend/data/set/internal/serializer/SystemFDSSerializer.java

@@ -27,10 +27,14 @@
 import com.liferay.frontend.data.set.view.FDSViewContextContributorRegistry;
 import com.liferay.frontend.data.set.view.FDSViewRegistry;
 import com.liferay.frontend.taglib.clay.servlet.taglib.util.CreationMenu;
+import com.liferay.object.rest.manager.v1_0.ObjectEntryManagerRegistry;
+import com.liferay.object.service.ObjectDefinitionLocalService;
 import com.liferay.portal.kernel.json.JSONArray;
 import com.liferay.portal.kernel.json.JSONObject;
 import com.liferay.portal.kernel.json.JSONUtil;
 import com.liferay.portal.kernel.language.LanguageUtil;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.util.ArrayUtil;
 import com.liferay.portal.kernel.util.ListUtil;
 import com.liferay.portal.kernel.util.PortalUtil;
@@ -254,6 +258,22 @@ public String serializePropsTransformer(
 		return systemFDSEntry.getPropsTransformer();
 	}
 
+	@Override
+	public JSONArray serializeSnapshots(
+		String fdsName, HttpServletRequest httpServletRequest) {
+
+		try {
+			return serializeSnapshots(
+				fdsName, httpServletRequest, _objectDefinitionLocalService,
+				_objectEntryManagerRegistry);
+		}
+		catch (Exception exception) {
+			_log.error("Unable to serialize snapshots", exception);
+
+			return JSONUtil.putAll();
+		}
+	}
+
 	@Override
 	public List<FDSSortItem> serializeSorts(
 		String fdsName, HttpServletRequest httpServletRequest) {
@@ -400,6 +420,9 @@ private void _serializeFilters(
 		}
 	}
 
+	private static final Log _log = LogFactoryUtil.getLog(
+		SystemFDSSerializer.class);
+
 	private static final SystemFDSEntry _systemFDSEntry = new SystemFDSEntry() {
 
 		public int getDefaultItemsPerPage() {
@@ -442,4 +465,10 @@ public String getTitle() {
 
 	};
 
+	@Reference
+	private ObjectDefinitionLocalService _objectDefinitionLocalService;
+
+	@Reference
+	private ObjectEntryManagerRegistry _objectEntryManagerRegistry;
+
 }