Merge branch 'main' of github.com:arjunkomath/netdata-ios

arjunkomath · Oct 27, 2022 · c9b9fe2 · c9b9fe2
2 parents 9dcbb11 + e16c6d5
commit c9b9fe2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/netdata.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/netdata.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "Bugsnag",
-        "repositoryURL": "https://github.com/bugsnag/bugsnag-cocoa",
-        "state": {
-          "branch": null,
-          "revision": "3850d4cd88f3eeabc8fff271a1b08a6a6d4e381a",
-          "version": "6.10.2"
-        }
+  "pins" : [
+    {
+      "identity" : "bugsnag-cocoa",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/bugsnag/bugsnag-cocoa",
+      "state" : {
+        "revision" : "3850d4cd88f3eeabc8fff271a1b08a6a6d4e381a",
+        "version" : "6.10.2"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }
diff --git a/netdata.xcodeproj/xcuserdata/arjunkomath.xcuserdatad/xcschemes/xcschememanagement.plist b/netdata.xcodeproj/xcuserdata/arjunkomath.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>AlarmWidgetExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 		<key>Playground (Playground) 1.xcscheme</key>
 		<dict>
@@ -38,7 +38,7 @@
 		<key>netdata.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

diff --git a/netdata/Models/ServerCharts.swift b/netdata/Models/ServerCharts.swift
@@ -14,7 +14,6 @@ public struct ServerChart: Encodable, Decodable, Identifiable {
     var family: String;
     var context: String;
     var title: String;
-    var enabled: Bool;
     var units: String;
 }
 
@@ -26,7 +25,7 @@ public struct ServerCharts: Encodable, Decodable {
     public var activeCharts: [ServerChart] {
         return charts.keys.sorted()
             .filter {
-                charts[$0] != nil && charts[$0]!.enabled
+                charts[$0] != nil
             }
             .map {
                 charts[$0]!

diff --git a/netdata/Modules/ServerDetail/Components/ChartListRow.swift b/netdata/Modules/ServerDetail/Components/ChartListRow.swift
@@ -38,7 +38,6 @@ struct ChartListRow_Previews: PreviewProvider {
                                         family: "fragments",
                                         context: "ipv4.sockstat_frag_mem",
                                         title: "IPv4 FRAG Sockets Memory (ipv4.sockstat_frag_mem)",
-                                        enabled: true,
                                         units: "GiB"),
         serverUrl: "",
         basicAuthBase64: "")

diff --git a/netdata/Modules/ServerDetail/Components/CustomChartDetailView.swift b/netdata/Modules/ServerDetail/Components/CustomChartDetailView.swift
@@ -42,6 +42,7 @@ struct CustomChartDetailView: View {
             } else {
                 Button(action: {
                     withAnimation {
+                        // Fix warning https://developer.apple.com/forums/thread/711899
                         userSettings.bookmarks.insert(serverChart.id, at: 0)
                     }
                 }, label: {

diff --git a/netdata/Modules/ServerDetail/ServerDetailViewModel.swift b/netdata/Modules/ServerDetail/ServerDetailViewModel.swift
@@ -147,8 +147,6 @@ enum DataMode {
                 self.bookmarks = bookmarks
                     .compactMap { chart in
                         charts.charts[chart]
-                    }.filter { chart in
-                        chart.enabled
                     }
 
                 self.bookmarkedChartData = Array(repeating: ServerData(labels: [], data: []), count: self.bookmarks.count)