Merge branch 'main' of https://github.com/red5coder/jamf-protect-ulf-uploader

Author: red5coder

.DS_Store

@@ -296,9 +296,9 @@
 				CODE_SIGN_ENTITLEMENTS = "Jamf Protect ULF Uploader/Jamf_Protect_ULF_Uploader.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 43;
+				CURRENT_PROJECT_VERSION = 44;
 				DEVELOPMENT_ASSET_PATHS = "\"Jamf Protect ULF Uploader/Preview Content\"";
-				DEVELOPMENT_TEAM = VR4GB7TBDP;
+				DEVELOPMENT_TEAM = CLQKFNPCCP;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -309,7 +309,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.mallion.jamf-protect-ulf-uploader";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -325,9 +325,9 @@
 				CODE_SIGN_ENTITLEMENTS = "Jamf Protect ULF Uploader/Jamf_Protect_ULF_Uploader.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 43;
+				CURRENT_PROJECT_VERSION = 44;
 				DEVELOPMENT_ASSET_PATHS = "\"Jamf Protect ULF Uploader/Preview Content\"";
-				DEVELOPMENT_TEAM = VR4GB7TBDP;
+				DEVELOPMENT_TEAM = CLQKFNPCCP;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -338,7 +338,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.mallion.jamf-protect-ulf-uploader";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

Jamf Protect ULF Uploader.xcodeproj/project.pbxproj

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Jamf Protect ULF Uploader.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

Jamf Protect ULF Uploader.xcodeproj/project.xcworkspace/xcuserdata/thijs.xhaflaire.xcuserdatad/UserInterfaceState.xcuserstate

@@ -31,7 +31,11 @@ struct ContentView: View {
         if searchTerm.isEmpty {
             return ulfilters.filter { _ in true }
         } else {
-            return ulfilters.filter {  $0.name.lowercased().contains(searchTerm.lowercased())  || $0.tagsDiplay.lowercased().contains(searchTerm.lowercased())     }
+            return ulfilters.filter {
+                $0.name.lowercased().contains(searchTerm.lowercased())  ||
+                $0.description.lowercased().contains(searchTerm.lowercased()) ||
+                $0.tagsDiplay.lowercased().contains(searchTerm.lowercased())
+            }
         }
     }
 
@@ -56,13 +60,28 @@ struct ContentView: View {
                         ))
                     }
                     .width(45)
-                    TableColumn("Filter Name", value: \.name)
-                    TableColumn("Tags" ,value: \.tagsDiplay)
+                    TableColumn("Filter Name") { logfilter in
+                        Text(logfilter.name)
+                            .lineLimit(nil)
+                            .fixedSize(horizontal: false, vertical: true)
+                    }
+                    .width(ideal: 200)
+                    TableColumn("Description") { logfilter in
+                        Text(logfilter.description)
+                            .lineLimit(nil) // Allow multiple lines
+                            .fixedSize(horizontal: false, vertical: true)
+                    }
+                    .width(ideal: 650)
+                    TableColumn("Tags") { logfilter in
+                        Text(logfilter.tagsDiplay)
+                            .lineLimit(nil) // Allow multiple lines
+                            .fixedSize(horizontal: false, vertical: true)
+                    }
                 }
                 .onChange(of: sortOrder) { newOrder in
                     ulfilters.sort(using: newOrder)
                 }
-                .searchable(text: $searchTerm, prompt: "Name or tag")
+                .searchable(text: $searchTerm, prompt: "Search in name, description or tag")
             HStack {
                 Button("Fetch Filters") {
                     Task {

Jamf Protect ULF Uploader.xcodeproj/xcuserdata/thijs.xhaflaire.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -47,6 +47,7 @@ mutation createFilter {
   createUnifiedLoggingFilter(
     input: {
       name: "\(ulfilter.name)"
+      description: "\(ulfilter.description)"
       filter: "\(predicate)"
       enabled: \(enabled)
       tags: [\(tags)]