Missing GraphQL filters + tests

changelog/src/changelog/entries/2026/03/8728.SUP-19716.bugfix

@@ -0,0 +1 @@
+GraphQL: Filtering has been enabled for the selected entities: schemas, microschemas, tags, tag families.

common/src/main/resources/i18n/translations_de.properties

@@ -203,7 +203,7 @@ schema_missing_project_uuid=Es wurde keine Projekt UUID angegeben.
 schema_missing_name=Es wurde kein Schemaname angegeben.
 schema_missing_displayfield=Das displayField Feld ist verpflichtend und muss angegeben werden.
 schema_migration_no_changes_specified=Migration kann nicht gestartet werden. Es wurden keine Änderungen angegeben.
-schema_update_no_difference_detected=Migration wurde nicht gestartet. Es wurden keine Änderungen erkannt.
+schema_update_no_difference_detected=Migration wurde für {0} nicht gestartet. Es wurden keine Änderungen erkannt.
 schema_not_found=Schema konnte nicht gefunden werden: "{0}"
 schema_conflicting_name=Schema name "{0}" bereits belegt.
 schema_deleted=Schema "{0}" wurde gelöscht.

common/src/main/resources/i18n/translations_en.properties

@@ -201,7 +201,7 @@ schema_missing_project_uuid=No project uuid was specified.
 schema_missing_name=No schema name was specified.
 schema_missing_displayfield=The displayField property is mandatory and must be set.
 schema_migration_no_changes_specified=Migration cannot be invoked. No changes were specified.
-schema_update_no_difference_detected=Migration was not invoked. No changes were detected.
+schema_update_no_difference_detected=Migration was not invoked for {0}. No changes were detected.
 schema_not_found=Schema could not be found: "{0}"
 schema_conflicting_name=Schema name "{0}" already in use.
 schema_deleted=Schema "{0}" was deleted.

common/src/main/resources/i18n/translations_zh.properties

@@ -190,7 +190,7 @@ micronode_error_missing_reference=字段{0}缺少内嵌数据模型引用。
 schema_missing_project_uuid=未指定项目uuid。
 schema_missing_name=未指定数据模型名称。
 schema_missing_displayfield=显示字段属性是强制性的，必须设置。
-schema_migration_no_changes_specified=无法进行迁移。未指定更改。
+schema_migration_no_changes_specified=无法进行迁移：“{0}”。未指定更改。
 schema_update_no_difference_detected=未执行迁移。未检测到变化。
 schema_not_found=找不到数据模型：“{0}”
 schema_conflicting_name=数据模型名称“{0}”已在使用中。

core/src/main/java/com/gentics/mesh/core/data/schema/handler/SchemaComparatorImpl.java

@@ -47,7 +47,7 @@ public List<SchemaChangeModel> diff(SchemaModel schemaA, SchemaModel schemaB) {
 		compareAndAddSchemaProperty(changes, AUTO_PURGE_FLAG_KEY, schemaA.getAutoPurge(), schemaB.getAutoPurge(), SchemaModel.class);
 
 		// .noIndex
-		compareAndAddSchemaProperty(changes, NO_INDEX_KEY, schemaA.getNoIndex(), schemaB.getNoIndex(), SchemaModel.class, true, true);
+		compareAndAddSchemaProperty(changes, NO_INDEX_KEY, schemaA.getNoIndex(), schemaB.getNoIndex(), SchemaModel.class);
 
 		// .container
 		// Only diff the flag if a value has been set in the schemaB

mdm/hibernate-core/src/main/java/com/gentics/mesh/hibernate/data/dao/DaoHelper.java

@@ -1502,6 +1502,9 @@ private HibernateFilter makeParameterOperand(
 		} else if (actualFieldName.startsWith("USER.")) {
 			actualFieldName = parts[1];
 			maybeOwner = Optional.of("USER");
+		} else if (actualFieldName.startsWith("TAGFAMILY.")) {
+			actualFieldName = parts[1];
+			maybeOwner = Optional.of("TAGFAMILY");
 		} else if (maybeOwner.filter(o -> "USER".equals(o)).isPresent()) {
 			maybeOwner = joins.stream().map(j -> {
 				if ("USER".equals(j.getLeft().getTable())) {
@@ -1512,6 +1515,16 @@ private HibernateFilter makeParameterOperand(
 					return null;
 				}
 			}).filter(s -> StringUtils.isNotBlank(s)).findAny().or(() -> op.maybeGetOwner());
+		} else if (maybeOwner.filter(o -> "TAGFAMILY".equals(o)).isPresent()) {
+			maybeOwner = joins.stream().map(j -> {
+				if ("TAGFAMILY".equals(j.getLeft().getTable())) {
+					return j.getRight().getField();
+				} else if ("TAGFAMILY".equals(j.getRight().getTable())) {
+					return j.getLeft().getField();
+				} else {
+					return null;
+				}
+			}).filter(s -> StringUtils.isNotBlank(s)).findAny().or(() -> op.maybeGetOwner());
 		} else if (maybeOwner.filter(o -> o.endsWith("LIST")).isPresent()) {
 			if (op instanceof ListItemOperationOperand) {
 				actualFieldName = buildListFieldItemOperand((ListItemOperationOperand) op, maybeOwner, ownerAlias, paramsMap, callStack.peek().getInitiatingFilterName(), maybeBranch, maybeTopLevelFilter, maybeContainerType, callStack);

mdm/hibernate-core/src/main/java/com/gentics/mesh/hibernate/data/dao/TagDaoImpl.java

@@ -337,4 +337,21 @@ public HibTag beforeDeletedFromDatabase(HibTag element) {
 		}
 		return element;
 	}
+
+	@Override
+	public String mapGraphQlFilterFieldName(String gqlName) {
+		switch (gqlName) {
+		case "tagFamily": return "tagFamily_dbUuid";
+		}
+		return super.mapGraphQlFilterFieldName(gqlName);
+	}
+
+	@Override
+	public String mapGraphQlSortingFieldName(String gqlName) {
+		switch (gqlName) {
+		case "tagFamily": return "TAGFAMILY.tagFamily_dbUuid";
+		case "TAGFAMILY.tagFamily_dbUuid": return mapGraphQlSortingFieldName("tagFamily");
+		}
+		return super.mapGraphQlSortingFieldName(gqlName);
+	}
 }

tests/tests-core/src/main/java/com/gentics/mesh/core/graphql/GraphQLEndpointTest.java

@@ -166,10 +166,13 @@ protected static Stream<List<Object>> queries() {
 				Arrays.asList("role-user-group-query", true, false, "draft"),
 				Arrays.asList("group-query", true, false, "draft"),
 				Arrays.asList("schema-query", true, false, "draft"),
+				Arrays.asList("schemas-query", true, false, "draft"),
 				// Arrays.asList("schema-projects-query", true, false, "draft"),
 				Arrays.asList("microschema-query", true, false, "draft"),
+				Arrays.asList("microschemas-query", true, false, "draft"),
 				Arrays.asList("paging-query", true, false, "draft"),
 				Arrays.asList("tagFamily-query", true, false, "draft"),
+				Arrays.asList("tagfamilies-query", true, false, "draft"),
 				Arrays.asList("node-query", true, false, "draft"),
 				Arrays.asList("node-tag-query", true, false, "draft"),
 				Arrays.asList("nodes-query", true, false, "draft"),
@@ -196,6 +199,7 @@ protected static Stream<List<Object>> queries() {
 				Arrays.asList("node-field-list-path-query", true, false, "draft"),
 				Arrays.asList("project-query", true, false, "draft"),
 				Arrays.asList("tag-query", true, false, "draft"),
+				Arrays.asList("tags-query", true, false, "draft"),
 				Arrays.asList("branch-query", true, true, "draft"),
 				Arrays.asList("user-query", true, false, "draft"),
 				Arrays.asList("microschema-projects-query", true, false, "draft"),

tests/tests-core/src/main/resources/graphql/microschema-query

@@ -2,6 +2,7 @@
 	microschemas {
 		elements {
 			uuid
+			isNoIndex
 		}
 	}
 }

tests/tests-core/src/main/resources/graphql/microschemas-query

@@ -0,0 +1,17 @@
+{
+	microschemas (filter: {name: {oneOf: ["vcard", "whatever"]}}, sort: {name: ASCENDING}) {
+		# [$.data.microschemas.totalCount=1]
+		totalCount
+		elements {
+			# [$.data.microschemas.elements[0].name=vcard]
+			name
+			# [$.data.microschemas.elements[0].uuid=<is-uuid>]
+			uuid
+			# [$.data.microschemas.elements[0].isNoIndex=<is-null>]
+			isNoIndex
+			# [$.data.microschemas.elements[0].isEmpty=false]
+			isEmpty
+		}
+	}
+}
+# [$.errors=<is-undefined>]

tests/tests-core/src/main/resources/graphql/schema-query

@@ -22,6 +22,8 @@
 		name
 		# [$.data.folderSchema.isAutoPurge=true]
 		isAutoPurge
+		# [$.data.folderSchema.isNoIndex=<is-null>]
+		isNoIndex
 	}
 
 	schema(name:"content") {

tests/tests-core/src/main/resources/graphql/schemas-query

@@ -0,0 +1,19 @@
+{
+	schemas (filter: {name: {oneOf: ["content", "whatever"]}}, sort: {name: ASCENDING}) {
+		# [$.data.schemas.totalCount=1]
+		totalCount
+		elements {
+			# [$.data.schemas.elements[0].name=content]
+			name
+			# [$.data.schemas.elements[0].uuid=<is-uuid>]
+			uuid
+			# [$.data.schemas.elements[0].isNoIndex=<is-null>]
+			isNoIndex
+			# [$.data.schemas.elements[0].isEmpty=false]
+			isEmpty
+			# [$.data.schemas.elements[0].isAutoPurge=<is-null>]
+			isAutoPurge
+		}
+	}
+}
+# [$.errors=<is-undefined>]

tests/tests-core/src/main/resources/graphql/tagfamilies-query

@@ -0,0 +1,21 @@
+{
+	tagFamilies (filter: {name: {oneOf: ["colors", "basic", "whatever"]}}, sort: {name: DESCENDING}) {
+		# [$.data.tagFamilies.totalCount=2]
+		totalCount
+		elements {
+			# [$.data.tagFamilies.elements[0].name=colors]
+			name
+			# [$.data.tagFamilies.elements[0].uuid=<is-uuid>]
+			uuid
+			tags (sortBy: "name", sortOrder: ASCENDING) {
+				# [$.data.tagFamilies.elements[0].tags.totalCount=3]
+				totalCount
+				elements {
+					# [$.data.tagFamilies.elements[0].tags.elements[0].name=blue]
+					name
+				}
+			}
+		}
+	}
+}
+# [$.errors=<is-undefined>]

tests/tests-core/src/main/resources/graphql/tags-query

@@ -0,0 +1,13 @@
+{
+	tags (filter: {name: {oneOf: ["red", "jeep", "whatever"]}, tagFamily: {name: {oneOf: ["colors"]}}}, sort: {name: ASCENDING}) {
+		# [$.data.tags.totalCount=1]
+		totalCount
+		elements {
+			# [$.data.tags.elements[0].name=red]
+			name
+			# [$.data.tags.elements[0].uuid=<is-uuid>]
+			uuid
+		}
+	}
+}
+# [$.errors=<is-undefined>]

verticles/graphql/src/main/java/com/gentics/mesh/graphql/filter/RoleFilter.java

@@ -5,7 +5,6 @@
 import java.util.Optional;
 
 import com.gentics.graphqlfilter.filter.FilterField;
-import com.gentics.graphqlfilter.filter.StartMainFilter;
 import com.gentics.mesh.ElementType;
 import com.gentics.mesh.core.data.role.HibRole;
 

verticles/graphql/src/main/java/com/gentics/mesh/graphql/filter/TagFamilyFilter.java

@@ -0,0 +1,46 @@
+package com.gentics.mesh.graphql.filter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import com.gentics.graphqlfilter.filter.FilterField;
+import com.gentics.mesh.ElementType;
+import com.gentics.mesh.core.data.tagfamily.HibTagFamily;
+
+/**
+ * Filters tag families in GraphQl. This filter should be used whenever a list of tag families is returned.
+ */
+public class TagFamilyFilter extends EntityFilter<HibTagFamily> {
+
+	private static final ElementType ELEMENT = ElementType.TAGFAMILY;
+	private static final String NAME = "TagFamilyFilter";
+
+	private static TagFamilyFilter instance;
+
+	public static synchronized TagFamilyFilter filter() {
+		if (instance == null) {
+			instance = new TagFamilyFilter();
+		}
+		return instance;
+	}
+
+	private TagFamilyFilter() {
+		super(NAME, "Filters tag families", Optional.of(ELEMENT.name()));
+	}
+
+	@Override
+	protected List<FilterField<HibTagFamily, ?>> getFilters() {
+		String owner = ELEMENT.name();
+		List<FilterField<HibTagFamily, ?>> filters = new ArrayList<>();
+		filters.add(CommonFields.hibNameFilter(owner));
+		filters.add(CommonFields.hibUuidFilter(owner));
+		filters.addAll(CommonFields.hibUserTrackingFilter(owner));
+		return filters;
+	}
+
+	@Override
+	protected ElementType getEntityType() {
+		return ELEMENT;
+	}
+}

verticles/graphql/src/main/java/com/gentics/mesh/graphql/filter/TagFilter.java

@@ -0,0 +1,54 @@
+package com.gentics.mesh.graphql.filter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import com.gentics.graphqlfilter.filter.DateFilter;
+import com.gentics.graphqlfilter.filter.FilterField;
+import com.gentics.graphqlfilter.filter.MappedFilter;
+import com.gentics.graphqlfilter.filter.operation.JoinPart;
+import com.gentics.mesh.ElementType;
+import com.gentics.mesh.core.data.tag.HibTag;
+import com.gentics.mesh.core.data.user.HibUserTracking;
+
+import graphql.util.Pair;
+
+/**
+ * Filters tags in GraphQl. This filter should be used whenever a list of tags is returned.
+ */
+public class TagFilter extends EntityFilter<HibTag> {
+
+	private static final ElementType ELEMENT = ElementType.TAG;
+	private static final String NAME = "TagFilter";
+
+	private static TagFilter instance;
+
+	public static synchronized TagFilter filter() {
+		if (instance == null) {
+			instance = new TagFilter();
+		}
+		return instance;
+	}
+
+	private TagFilter() {
+		super(NAME, "Filters tags", Optional.of(ELEMENT.name()));
+	}
+
+	@Override
+	protected List<FilterField<HibTag, ?>> getFilters() {
+		String owner = ELEMENT.name();
+		List<FilterField<HibTag, ?>> filters = new ArrayList<>();
+		filters.add(CommonFields.hibNameFilter(owner));
+		filters.add(CommonFields.hibUuidFilter(owner));
+		filters.addAll(CommonFields.hibUserTrackingFilter(owner));
+		filters.add(new MappedFilter<>(owner, "tagFamily", "Filters by creator", TagFamilyFilter.filter(), HibTag::getTagFamily, Pair.pair("tagFamily", new JoinPart(ElementType.USER.name(), "uuid"))));
+		return filters;
+	}
+
+	@Override
+	protected ElementType getEntityType() {
+		return ELEMENT;
+	}
+}

verticles/graphql/src/main/java/com/gentics/mesh/graphql/type/AbstractTypeProvider.java

@@ -598,16 +598,29 @@ protected PagingParameters getPagingInfo(DataFetchingEnvironment env) {
 			parameters.setPerPage(perPage);
 		}
 		String sortBy = env.getArgument("sortBy");
-		SortOrder sortOrder = env.getArgument("sortOrder");
+		Sorting sortOrder = env.getArgument("sortOrder");
 		if (StringUtils.isNotBlank(sortBy) && sortOrder != null) {
-			parameters.putSort(sortBy, sortOrder);
+			parameters.putSort(sortBy, fromGraphQl(sortOrder));
 		}
 		Map<String, ?> sortArgument = env.getArgument("sort");
 		parameters.putSort(parseGraphQlSort(sortArgument, Optional.empty()));
 		parameters.validate();
 		return parameters;
 	}
 
+	private static SortOrder fromGraphQl(Sorting sorting) {
+		if (sorting == null) {
+			return null;
+		}
+		switch (sorting) {
+		case ASCENDING:
+			return SortOrder.ASCENDING;
+		case DESCENDING:
+			return SortOrder.DESCENDING;		
+		}
+		return SortOrder.UNSORTED;
+	}
+
 	@SuppressWarnings("unchecked")
 	private static final Map<String, SortOrder> parseGraphQlSort(Map<String, ?> sort, Optional<String> prefix) {
 		if (sort == null) {

verticles/graphql/src/main/java/com/gentics/mesh/graphql/type/MicroschemaTypeProvider.java

@@ -12,6 +12,9 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.gentics.mesh.core.data.branch.HibBranch;
 import com.gentics.mesh.core.data.dao.UserDao;
 import com.gentics.mesh.core.data.perm.InternalPermission;
@@ -29,8 +32,6 @@
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLObjectType.Builder;
 import graphql.schema.GraphQLOutputType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * GraphQL type provider for microschema types.
@@ -89,6 +90,12 @@ public GraphQLObjectType createType() {
 			return model == null || model.getFields() == null || model.getFields().isEmpty();
 		}));
 
+		// .isNoIndex
+		schemaType.field(newFieldDefinition().name("isNoIndex").type(GraphQLBoolean).dataFetcher((env) -> {
+			MicroschemaVersionModel model = loadModelWithFallback(env);
+			return model != null ? model.getNoIndex() : null;
+		}));
+
 		// .fields
 		Builder fieldListBuilder = newObject().name(MICROSCHEMA_FIELD_TYPE).description("List of schema fields");