Skip to content

Commit 52efd84

Browse files
keankean
committed
Fix build
1 parent 5ab7742 commit 52efd84

8 files changed

+2
-128
lines changed

Diff for: ‎Pulse.xcodeproj/project.pbxproj

-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
0C40C09A296F77F1009ECF16 /* ConsoleSearchToggleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C40C099296F77F1009ECF16 /* ConsoleSearchToggleCell.swift */; };
6060
0C40C0A4296F849E009ECF16 /* ConsoleSearchTimePeriodCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C40C0A3296F849E009ECF16 /* ConsoleSearchTimePeriodCell.swift */; };
6161
0C57511A2B01BA40001074E5 /* DebugAnalyticsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C5751182B01BA2B001074E5 /* DebugAnalyticsView.swift */; };
62-
0C603BD829E45A3C004FD4ED /* ConsoleListPinsSectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C603BD729E45A3C004FD4ED /* ConsoleListPinsSectionView.swift */; };
6362
0C63A3782979FE3A00F6A6A5 /* ConsoleSearchTerm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C63A3772979FE3A00F6A6A5 /* ConsoleSearchTerm.swift */; };
6463
0C63A380297A02D200F6A6A5 /* StringSearchOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C63A37E297A02AD00F6A6A5 /* StringSearchOptions.swift */; };
6564
0C63A387297A432500F6A6A5 /* ConsoleSearchContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C63A385297A432500F6A6A5 /* ConsoleSearchContextMenu.swift */; };
@@ -497,7 +496,6 @@
497496
0C40C099296F77F1009ECF16 /* ConsoleSearchToggleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleSearchToggleCell.swift; sourceTree = "<group>"; };
498497
0C40C0A3296F849E009ECF16 /* ConsoleSearchTimePeriodCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleSearchTimePeriodCell.swift; sourceTree = "<group>"; };
499498
0C5751182B01BA2B001074E5 /* DebugAnalyticsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugAnalyticsView.swift; sourceTree = "<group>"; };
500-
0C603BD729E45A3C004FD4ED /* ConsoleListPinsSectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleListPinsSectionView.swift; sourceTree = "<group>"; };
501499
0C63A3772979FE3A00F6A6A5 /* ConsoleSearchTerm.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConsoleSearchTerm.swift; sourceTree = "<group>"; };
502500
0C63A37E297A02AD00F6A6A5 /* StringSearchOptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringSearchOptions.swift; sourceTree = "<group>"; };
503501
0C63A385297A432500F6A6A5 /* ConsoleSearchContextMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConsoleSearchContextMenu.swift; sourceTree = "<group>"; };
@@ -918,7 +916,6 @@
918916
0CE45E0929776BED00249C5D /* ConsoleListContentView.swift */,
919917
0CAF1D7A297C2040002E2722 /* ConsoleListViewModel.swift */,
920918
0C7A0DFF297C51CE00B4B69D /* ConsoleListOptions.swift */,
921-
0C603BD729E45A3C004FD4ED /* ConsoleListPinsSectionView.swift */,
922919
);
923920
path = List;
924921
sourceTree = "<group>";
@@ -1907,7 +1904,6 @@
19071904
0C0352DE299482F3008CDEF8 /* MockStore.swift in Sources */,
19081905
0CF0D62E296F189600EED9D4 /* RichTextView-watchos.swift in Sources */,
19091906
0CF0D634296F189600EED9D4 /* TimingView.swift in Sources */,
1910-
0C603BD829E45A3C004FD4ED /* ConsoleListPinsSectionView.swift in Sources */,
19111907
0CF0D622296F189600EED9D4 /* Formatters.swift in Sources */,
19121908
0CF0D62F296F189600EED9D4 /* TextView.swift in Sources */,
19131909
0CBEF6A629DF69EB00132FB3 /* ConsoleView.swift in Sources */,

Diff for: ‎Sources/PulseUI/Features/Console/List/ConsoleListContentView.swift

-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ struct ConsoleListContentView: View {
1212
@EnvironmentObject var viewModel: ConsoleListViewModel
1313

1414
var body: some View {
15-
#if os(iOS) || os(visionOS)
16-
if !viewModel.pins.isEmpty {
17-
ConsoleListPinsSectionView(viewModel: viewModel)
18-
if !viewModel.entities.isEmpty {
19-
PlainListGroupSeparator()
20-
}
21-
}
22-
#endif
2315
plainView
2416
}
2517

Diff for: ‎Sources/PulseUI/Features/Console/List/ConsoleListPinsSectionView.swift

-54
This file was deleted.

Diff for: ‎Sources/PulseUI/Features/Console/List/ConsoleListViewModel.swift

-21
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ final class ConsoleListViewModel: ConsoleDataSourceDelegate, ObservableObject, C
1414
#else
1515
var visibleEntities: [NSManagedObject] { entities }
1616
#endif
17-
@Published private(set) var pins: [NSManagedObject] = []
1817
@Published private(set) var entities: [NSManagedObject] = []
1918
@Published private(set) var sections: [NSFetchedResultsSectionInfo]?
2019

@@ -46,7 +45,6 @@ final class ConsoleListViewModel: ConsoleDataSourceDelegate, ObservableObject, C
4645
private let environment: ConsoleEnvironment
4746
private let filters: ConsoleFiltersViewModel
4847
private let sessions: ManagedObjectsObserver<LoggerSessionEntity>
49-
private let pinsObserver: ManagedObjectsObserver<LoggerMessageEntity>
5048
private var dataSource: ConsoleDataSource?
5149
private var cancellables: [AnyCancellable] = []
5250
private var filtersCancellable: AnyCancellable?
@@ -57,7 +55,6 @@ final class ConsoleListViewModel: ConsoleDataSourceDelegate, ObservableObject, C
5755
self.mode = environment.mode
5856
self.filters = filters
5957
self.sessions = .sessions(for: store.viewContext)
60-
self.pinsObserver = .pins(for: store.viewContext)
6158

6259
$entities.sink { [weak self] in
6360
self?.filters.entities.send($0)
@@ -67,13 +64,6 @@ final class ConsoleListViewModel: ConsoleDataSourceDelegate, ObservableObject, C
6764
self?.refreshPreviousSessionButton(sessions: $0)
6865
}.store(in: &cancellables)
6966

70-
pinsObserver.$objects.dropFirst().sink { [weak self] pins in
71-
guard let self = self else { return }
72-
withAnimation {
73-
self.pins = filter(pins: pins, mode: self.mode)
74-
}
75-
}.store(in: &cancellables)
76-
7767
environment.$listOptions.dropFirst().sink { [weak self] in
7868
self?.resetDataSource(options: $0)
7969
}.store(in: &cancellables)
@@ -85,7 +75,6 @@ final class ConsoleListViewModel: ConsoleDataSourceDelegate, ObservableObject, C
8575

8676
private func didUpdateMode(_ mode: ConsoleMode) {
8777
self.mode = mode
88-
pins = filter(pins: pinsObserver.objects, mode: mode)
8978
if isViewVisible {
9079
resetDataSource(options: environment.listOptions)
9180
}
@@ -197,13 +186,3 @@ final class ConsoleListViewModel: ConsoleDataSourceDelegate, ObservableObject, C
197186
}
198187
#endif
199188
}
200-
201-
private func filter(pins: [LoggerMessageEntity], mode: ConsoleMode) -> [LoggerMessageEntity] {
202-
pins.filter {
203-
switch mode {
204-
case .all: return true
205-
case .logs: return $0.task == nil
206-
case .network: return $0.task != nil
207-
}
208-
}
209-
}

Diff for: ‎Sources/PulseUI/Features/Inspector/NetworkInspectorView.swift

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ struct NetworkInspectorView: View {
9494
#if os(iOS) || os(visionOS)
9595
@ViewBuilder
9696
private var trailingNavigationBarItems: some View {
97-
PinButton(viewModel: PinButtonViewModel(task), isTextNeeded: false)
9897
Menu(content: {
9998
AttributedStringShareMenu(shareItems: $shareItems) {
10099
TextRenderer(options: .sharing).make {

Diff for: ‎Sources/PulseUI/Features/Search/Views/ConsoleSearchResultsSectionView.swift

-29
Original file line numberDiff line numberDiff line change
@@ -167,35 +167,6 @@ extension PlainListSectionHeader where Content == Text {
167167
}
168168
}
169169

170-
@available(iOS 15, visionOS 1.0, *)
171-
struct PlainListExpandableSectionHeader<Destination: View>: View {
172-
let title: String
173-
let count: Int
174-
@ViewBuilder let destination: () -> Destination
175-
var isSeeAllHidden = false
176-
177-
var body: some View {
178-
PlainListSectionHeader {
179-
HStack(alignment: .bottom, spacing: 0) {
180-
Text(title)
181-
.foregroundColor(.secondary)
182-
.font(.subheadline.weight(.medium))
183-
+
184-
Text(" (\(count))")
185-
.foregroundColor(.secondary.opacity(0.7))
186-
.font(.subheadline.weight(.medium).monospacedDigit())
187-
if !isSeeAllHidden {
188-
Spacer()
189-
Text("Show All")
190-
.foregroundColor(.accentColor)
191-
.font(.subheadline)
192-
.background(NavigationLink("", destination: destination).opacity(0))
193-
}
194-
}
195-
}
196-
}
197-
}
198-
199170
@available(iOS 15, visionOS 1.0, *)
200171
struct PlainListSeeAllView: View {
201172
let count: Int

Diff for: ‎Sources/PulseUI/Helpers/ManagedObjectsObserver.swift

-10
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@ final class ManagedObjectsObserver<T: NSManagedObject>: NSObject, NSFetchedResul
3030
}
3131
}
3232

33-
extension ManagedObjectsObserver where T == LoggerMessageEntity {
34-
static func pins(for context: NSManagedObjectContext) -> ManagedObjectsObserver {
35-
let request = NSFetchRequest<LoggerMessageEntity>(entityName: "\(LoggerMessageEntity.self)")
36-
request.sortDescriptors = [NSSortDescriptor(keyPath: \LoggerMessageEntity.createdAt, ascending: false)]
37-
request.predicate = NSPredicate(format: "isPinned == YES")
38-
39-
return ManagedObjectsObserver(request: request, context: context, cacheName: "com.github.pulse.pins-cache")
40-
}
41-
}
42-
4333
extension ManagedObjectsObserver where T == LoggerSessionEntity {
4434
static func sessions(for context: NSManagedObjectContext) -> ManagedObjectsObserver {
4535
let request = NSFetchRequest<LoggerSessionEntity>(entityName: "\(LoggerSessionEntity.self)")

Diff for: ‎Sources/PulseUI/Helpers/WatchConnectivityService-ios.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ final class WatchConnectivityService: NSObject, ObservableObject {
4444
}
4545

4646
private func makeImportedStoreURL() -> URL {
47-
LoggerStore.logsURL.appendingPathComponent("import.pulse")
47+
fatalError("not implemented")
48+
// LoggerStore.logsURL.appendingPathComponent("import.pulse")
4849
}
4950

5051
extension LoggerStore {

0 commit comments

Comments
 (0)