#32238 content type content palette

dotCMS/src/main/java/com/dotcms/contenttype/business/ContentTypeAPIImpl.java

@@ -389,7 +389,7 @@ public Optional<List<ContentType>> find(final List<String> varNames, final Strin
       contentTypeList = this.contentTypeFactory.find(lowercaseVarNames, filter.toLowerCase(), offset, limit, orderBy);
     } else if (offset > 0 || limit > 0) {
       int adjustedLimit = offset + limit;
-      adjustedLimit = adjustedLimit > lowercaseVarNames.size() ? lowercaseVarNames.size() : limit;
+      adjustedLimit = adjustedLimit > lowercaseVarNames.size() ? lowercaseVarNames.size() : adjustedLimit;
       final List<String> varNamesSubList = lowercaseVarNames.subList(offset, adjustedLimit);
       contentTypeList = this.contentTypeFactory.find(varNamesSubList, null, internalOffset, internalLimit, orderBy);
     } else {

dotCMS/src/main/java/com/dotcms/contenttype/business/ContentTypeFactoryImpl.java

@@ -178,7 +178,7 @@ public List<ContentType> find(final Collection<String> varNames, final String fi
       final DotConnect dc = new DotConnect();
       String sql = UtilMethods.isSet(filter) ? ContentTypeSql.SELECT_BY_VAR_NAMES_FILTERED : ContentTypeSql.SELECT_BY_VAR_NAMES;
       sql = String.format(sql, String.join(COMMA, Collections.nCopies(varNames.size(), "?")));
-      if (UtilMethods.isSet(orderBy)) {
+      if (UtilMethods.isSet(orderBy) && !orderBy.contains(SQLUtil.DOT_NOT_SORT)) { // DOT_NOT_SORT is used to indicate no order by wanted
           sql = UtilMethods.isSet(orderBy) ? sql + ContentTypeSql.ORDER_BY : sql;
           final String sanitizedOrderBy = SQLUtil.sanitizeSortBy(orderBy);
           sql = String.format(sql, sanitizedOrderBy);

dotCMS/src/main/java/com/dotcms/util/pagination/ContentTypesPaginator.java

@@ -19,12 +19,15 @@
 import com.dotmarketing.util.PaginatedArrayList;
 import com.dotmarketing.util.UtilMethods;
 import com.liferay.portal.model.User;
+import com.liferay.util.StringPool;
 import com.rainerhahnekamp.sneakythrow.Sneaky;
 import io.vavr.control.Try;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -39,11 +42,17 @@
  */
 public class ContentTypesPaginator implements PaginatorOrdered<Map<String, Object>>{
 
-    private static final String N_ENTRIES_FIELD_NAME = "nEntries";
+    public static final String N_ENTRIES_FIELD_NAME = "nEntries";
     public  static final String TYPE_PARAMETER_NAME  = "type";
     public static final String TYPES_PARAMETER_NAME  = "types";
     public static final String HOST_PARAMETER_ID = "host";
     public static final String SITES_PARAMETER_NAME = "sites";
+    public static final String COMPARATOR = "comparator";
+    public static final String ENTRIES_BY_CONTENT_TYPES = "entriesByContentTypes";
+    public static final String VARIABLE = "variable";
+    public static final String WORKFLOWS = "workflows";
+    public static final String SYSTEM_ACTION_MAPPINGS = "systemActionMappings";
+
 
     private final ContentTypeAPI contentTypeAPI;
     private final WorkflowAPI    workflowAPI;
@@ -102,8 +111,12 @@ public PaginatedArrayList<Map<String, Object>> getItems(final User user, final S
             final List<Map<String, Object>> contentTypesTransform = transformContentTypesToMap(contentTypes);
             setEntriesAttribute(user, contentTypesTransform,
                     this.workflowAPI.findSchemesMapForContentType(contentTypes),
-                    this.workflowAPI.findSystemActionsMapByContentType(contentTypes, user));
-            result.addAll(contentTypesTransform);
+                    this.workflowAPI.findSystemActionsMapByContentType(contentTypes, user),
+                    extraParams);
+
+            result.addAll(Objects.nonNull(extraParams) && extraParams.containsKey(COMPARATOR)?
+                    contentTypesTransform.stream().sorted((Comparator<Map<String, Object>>) extraParams.get(COMPARATOR)).collect(Collectors.toList())
+                    :contentTypesTransform);
             return result;
         } catch (final DotDataException | DotSecurityException e) {
             final String errorMsg = String.format("An error occurred when retrieving paginated Content Types: " +
@@ -127,13 +140,15 @@ public PaginatedArrayList<Map<String, Object>> getItems(final User user, final S
      */
     private void setEntriesAttribute(final User user, final List<Map<String, Object>> contentTypesTransform,
                                      final Map<String, List<WorkflowScheme>> workflowSchemes,
-                                     final Map<String, List<SystemActionWorkflowActionMapping>> systemActionMappings)  {
+                                     final Map<String, List<SystemActionWorkflowActionMapping>> systemActionMappings,
+                                     final Map<String, Object> extraParams)  {
 
         Map<String, Long> entriesByContentTypes = null;
 
         try {
-            entriesByContentTypes = APILocator.getContentTypeAPI
-                    (user, true).getEntriesByContentTypes();
+            entriesByContentTypes = Objects.nonNull(extraParams) && extraParams.containsKey(ENTRIES_BY_CONTENT_TYPES)?
+                    (Map<String, Long>)extraParams.get(ENTRIES_BY_CONTENT_TYPES):
+                    APILocator.getContentTypeAPI(user, true).getEntriesByContentTypes();
         } catch (final DotStateException | DotDataException e) {
             final String errorMsg = String.format("Error trying to retrieve total entries by Content Type: %s", e.getMessage());
             Logger.error(ContentTypesPaginator.class, errorMsg, e);
@@ -142,25 +157,25 @@ private void setEntriesAttribute(final User user, final List<Map<String, Object>
 
         for (final Map<String, Object> contentTypeEntry : contentTypesTransform) {
 
-            final String variable = (String) contentTypeEntry.get("variable");
+            final String variable = (String) contentTypeEntry.get(VARIABLE);
             if (entriesByContentTypes != null) {
 
                 final String key = variable.toLowerCase();
                 final Long contentTypeEntriesNumber = entriesByContentTypes.get(key) == null ? 0l :
                         entriesByContentTypes.get(key);
                 contentTypeEntry.put(N_ENTRIES_FIELD_NAME, contentTypeEntriesNumber);
             } else {
-                contentTypeEntry.put(N_ENTRIES_FIELD_NAME, "N/A");
+                contentTypeEntry.put(N_ENTRIES_FIELD_NAME, StringPool.NA);
             }
 
             if (workflowSchemes.containsKey(variable)) {
 
-                contentTypeEntry.put("workflows", workflowSchemes.get(variable));
+                contentTypeEntry.put(WORKFLOWS, workflowSchemes.get(variable));
             }
 
             if (systemActionMappings.containsKey(variable)) {
 
-                contentTypeEntry.put("systemActionMappings", workflowSchemes.get(variable));
+                contentTypeEntry.put(SYSTEM_ACTION_MAPPINGS, systemActionMappings.get(variable));
             }
         }
     }

dotCMS/src/main/java/com/dotcms/util/pagination/PaginatorOrdered.java

@@ -3,6 +3,7 @@
 import com.dotmarketing.util.PaginatedArrayList;
 import com.liferay.portal.model.User;
 
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -102,7 +103,7 @@ default PaginatedArrayList<T> getItems(final User user, final String filter, fin
      * @return A {@link PaginatedArrayList} of items matching the specified search criteria.
      */
     default PaginatedArrayList<T> getItems(final User user, final String filter, final int limit, final int offset, final String orderBy, final OrderDirection direction) {
-        return getItems(user, filter,  limit,  offset, orderBy, direction, null);
+        return getItems(user, filter,  limit,  offset, orderBy, direction, Collections.emptyMap());
     }
 
 }

dotCMS/src/main/java/com/dotmarketing/common/util/SQLUtil.java

@@ -53,6 +53,8 @@ public class SQLUtil {
 	private static final SecurityLoggerServiceAPI securityLoggerServiceAPI =
 			APILocator.getSecurityLogger();
 
+	// When you need to send a sort but do not want to actually sort by anything
+	public static final String DOT_NOT_SORT  = "dotnosort";
 	public static final String ASC  = "asc";
 	public static final String DESC  = "desc";
 	public static final String _ASC  = " " + ASC ;

dotCMS/src/main/java/com/liferay/util/StringPool.java

@@ -93,5 +93,5 @@ public class StringPool {
 
 	public static final String UNKNOWN = "UNKNOWN";
 
-
+	public static final String NA = "N/A";
 }

dotCMS/src/main/webapp/WEB-INF/openapi/openapi.yaml

@@ -42,6 +42,9 @@ tags:
   name: Containers
 - description: Endpoints for managing content and contentlets
   name: Content
+- description: Returns the content types valid for a page based on the container/types
+    on the layout
+  name: getPagesContentTypes
 - description: Endpoints for managing folder structure and organization
   name: Folders
 - description: Form management and processing
@@ -6713,6 +6716,122 @@ paths:
       summary: Updates a content type
       tags:
       - Content Type
+  /v1/contenttype/page:
+    get:
+      description: Returns a list of content type objects based on the filtering criteria.
+      operationId: getPagesContentTypes
+      parameters:
+      - description: The URL or Identifier of the page to filter content types for
+          the palette
+        in: query
+        name: pagePathOrId
+        schema:
+          type: string
+      - description: Optional Language id
+        in: query
+        name: language
+        schema:
+          type: string
+          default: "-1"
+      - description: String to filter/search for specific content types; leave blank
+          to return all.
+        in: query
+        name: filter
+        schema:
+          type: string
+      - description: |-
+          Page number in response pagination.
+
+          Default: `1`
+        in: query
+        name: page
+        schema:
+          type: integer
+          format: int64
+          default: 1
+      - description: |-
+          Number of results per page for pagination.
+
+          Default: `10`
+        in: query
+        name: per_page
+        schema:
+          type: integer
+          format: int64
+          default: 10
+      - description: |-
+          Column(s) to sort the results. Multiple columns can be combined in a comma-separated list. Column names can also be set within a SQL string function, such as `upper()`.
+
+          Some possible values:
+
+          `name`, `velocity_var_name`, `mod_date`, `sort_order`
+
+          `description`, `structuretype`, `category`, `inode`
+        in: query
+        name: orderby
+        schema:
+          type: string
+          default: usage
+      - description: "Sort direction: choose between ascending or descending."
+        in: query
+        name: direction
+        schema:
+          type: string
+          default: ASC
+          enum:
+          - ASC
+          - DESC
+      - description: Filter by site identifier.
+        in: query
+        name: host
+        schema:
+          type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              example:
+                entity:
+                - baseType: string
+                  clazz: string
+                  defaultType: true
+                  description: string
+                  fixed: true
+                  folder: string
+                  folderPath: string
+                  host: string
+                  iDate: 0
+                  icon: string
+                  id: string
+                  layout: []
+                  metadata: {}
+                  modDate: 0
+                  multilingualable: true
+                  nEntries: 0
+                  name: string
+                  siteName: string
+                  sortOrder: 0
+                  system: true
+                  variable: string
+                  versionable: true
+                  workflows: []
+                errors: []
+                i18nMessagesMap: {}
+                messages: []
+                pagination:
+                  currentPage: 0
+                  perPage: 0
+                  totalEntries: 0
+                permissions: []
+          description: Content types retrieved successfully
+        "403":
+          description: Forbidden
+        "500":
+          description: Internal Server Error
+      summary: Retrieves a list of content types for a page
+      tags:
+      - getPagesContentTypes
+      - Content Type
   /v1/contenttype/{baseVariableName}/_copy:
     post:
       description: |-