- Added a new Obsidian Data View Filter Editor control that allows administrators to build and edit Data View Filters. This provides a more consistent and user-friendly way to configure filter criteria across Obsidian-based blocks and tools.

Author: joshuahenninger

Rock.Enums/Reporting/FilterGroupJoinType.cs

@@ -0,0 +1,35 @@
+// <copyright>
+// Copyright by the Spark Development Network
+//
+// Licensed under the Rock Community License (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.rockrms.com/license
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+//
+
+namespace Rock.Enums.Reporting
+{
+    /// <summary>
+    /// Specifies how child filters in a group are joined together.
+    /// </summary>
+    public enum FilterGroupJoinType
+    {
+        /// <summary>
+        /// All child filters must be satisfied.
+        /// </summary>
+        All = 0,
+
+        /// <summary>
+        /// Any child filter may be satisfied.
+        /// </summary>
+        Any = 1
+    }
+}

Rock.Enums/Reporting/FilterGroupTruthType.cs

@@ -0,0 +1,35 @@
+// <copyright>
+// Copyright by the Spark Development Network
+//
+// Licensed under the Rock Community License (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.rockrms.com/license
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </copyright>
+//
+
+namespace Rock.Enums.Reporting
+{
+    /// <summary>
+    /// Specifies whether the group evaluates for true or false conditions.
+    /// </summary>
+    public enum FilterGroupTruthType
+    {
+        /// <summary>
+        /// The child filter logic should evaluate to true.
+        /// </summary>
+        True = 0,
+
+        /// <summary>
+        /// The child filter logic should evaluate to false.
+        /// </summary>
+        False = 1
+    }
+}

Rock.Frontend.Styles/src/styles/styles-v2/components/_panels.scss

@@ -35,7 +35,7 @@
   box-shadow:         var(--box-shadow);
 
   .panel-title {
-    i {
+    & > i {
       margin-right: var(--spacing-tiny);
       color: var(--color-interface-medium);
     }

Rock.JavaScript.Obsidian.Blocks/src/Example/ControlGallery/dataViewFilterEditorGallery.partial.obs

@@ -0,0 +1,51 @@
+<template>
+    <GalleryAndResult :importCode="importCode"
+                      :exampleCode="exampleCode"
+                      description="Edits a nested DataViewFilter tree using the same filter components that Data Views and Content Channel Views use.">
+
+        <ContentSection title="Filtering Logic">
+            <ContentStack title="Content Filtering"
+                          description="Defines the rule groups used to determine which items are included in the results.">
+                <DataViewFilterEditor v-model="value"
+                                      :entityTypeGuid="entityTypeGuid?.value" />
+            </ContentStack>
+        </ContentSection>
+
+        <template #settings>
+            <div class="row">
+                <div class="col-md-3">
+                    <EntityTypePicker label="For Entity Type"
+                                      v-model="entityTypeGuid"
+                                      enhanceForLongLists
+                                      showBlankItem />
+                </div>
+            </div>
+        </template>
+    </GalleryAndResult>
+</template>
+
+<script setup lang="ts">
+    import { ref, watch } from "vue";
+    import GalleryAndResult from "./common/galleryAndResult.partial.obs";
+    import { getSfcControlImportPath } from "./common/utils.partial";
+    import ContentSection from "@Obsidian/Controls/contentSection.obs";
+    import ContentStack from "@Obsidian/Controls/contentStack.obs";
+    import DataViewFilterEditor from "@Obsidian/Controls/dataViewFilterEditor.obs";
+    import EntityTypePicker from "@Obsidian/Controls/entityTypePicker.obs";
+    import { createDefaultDataViewFilter } from "@Obsidian/Core/Reporting/dataViewFilterEditor";
+    import { EntityType } from "@Obsidian/SystemGuids/entityType";
+    import { DataViewFilterBag } from "@Obsidian/ViewModels/Reporting/dataViewFilterBag";
+    import type { ListItemBag } from "@Obsidian/ViewModels/Utility/listItemBag";
+
+    const defaultEntityTypeGuid = EntityType.Person;
+
+    const entityTypeGuid = ref<ListItemBag | null>({ text: "Person", value: defaultEntityTypeGuid });
+    const value = ref<DataViewFilterBag>(createDefaultDataViewFilter());
+
+    const importCode = getSfcControlImportPath("dataViewFilterEditor");
+    const exampleCode = `<DataViewFilterEditor v-model="value" :entityTypeGuid="entityTypeGuid" />`;
+
+    watch(entityTypeGuid, () => {
+        value.value = createDefaultDataViewFilter();
+    });
+</script>

Rock.JavaScript.Obsidian.Blocks/src/Example/controlGallery.ts

@@ -152,6 +152,7 @@ import CampusPickerGallery from "./ControlGallery/campusPickerGallery.partial.ob
 import ScheduleBuilderGallery from "./ControlGallery/scheduleBuilderGallery.partial.obs";
 import BinaryFilePickerGallery from "./ControlGallery/binaryFilePickerGallery.partial.obs";
 import EventItemPickerGallery from "./ControlGallery/eventItemPickerGallery.partial.obs";
+import DataViewFilterEditorGallery from "./ControlGallery/dataViewFilterEditorGallery.partial.obs";
 import DataViewPickerGallery from "./ControlGallery/dataViewPickerGallery.partial.obs";
 import WorkflowTypePickerGallery from "./ControlGallery/workflowTypePickerGallery.partial.obs";
 import FinancialGatewayPickerGallery from "./ControlGallery/financialGatewayPickerGallery.partial.obs";
@@ -331,6 +332,7 @@ const controlGalleryComponents: Record<string, Component> = [
     CodeEditorGallery,
     ModalGallery,
     EventItemPickerGallery,
+    DataViewFilterEditorGallery,
     DataViewPickerGallery,
     WorkflowTypePickerGallery,
     ComponentPickerGallery,

Rock.JavaScript.Obsidian.Reporting/src/DataFilters/Person/hasPictureFilter.obs

@@ -1,5 +1,5 @@
 <template>
-    <RadioButtonList v-model="hasPicture" :items="hasPictureOptions" horizontal />
+    <RadioButtonList v-model="hasPicture" :items="hasPictureOptions" horizontal disableLabel />
 </template>
 
 <script setup lang="ts">