adipu/LabWiseiOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

editing all fields works and app is actually functional with profile edits

Browse Source
This commit is contained in:
pulipakaa24
2026-04-10 22:20:12 -05:00
parent b8880af200
commit b79d591395
8 changed files with 69 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LabWise.xcodeproj/xcuserdata/adipu.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@@ -7,7 +7,7 @@
<key>LabWise.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>

6
LabWise/AddChemicalView.swift
View File

@@ -120,9 +120,9 @@ final class AddChemicalViewModel {
func loadProfile() async {
guard !isEditing else { return }
if let profile = try? await profileClient.get() {
piFirstName = profile.piFirstName
bldgCode = profile.bldgCode
lab = profile.lab
piFirstName = profile.piFirstName ?? ""
bldgCode = profile.bldgCode ?? ""
lab = profile.lab ?? ""
contact = profile.contact ?? ""
}
}

15
LabWise/InventoryView.swift
View File

@@ -61,11 +61,16 @@ struct InventoryView: View {
ProgressView("Loading...")
.frame(maxWidth: .infinity, maxHeight: .infinity)
} else if viewModel.chemicals.isEmpty {
ContentUnavailableView(
"No Chemicals",
systemImage: "flask",
description: Text("Add your first chemical using the + button.")
)
ScrollView {
ContentUnavailableView(
"No Chemicals",
systemImage: "flask",
description: Text("Add your first chemical using the + button.")
)
}
.refreshable {
await viewModel.loadChemicals()
}
} else {
List {
ForEach(viewModel.chemicals) { chemical in

63
LabWise/ProfileView.swift
View File

@@ -24,12 +24,18 @@ final class ProfileViewModel {
func load() async {
isLoading = true
defer { isLoading = false }
do {
let p = try await profileClient.get()
async let profileFetch = profileClient.get()
async let userFetch = authClient.fetchCurrentUser()
if let p = try? await profileFetch {
profile = p
populateFields(from: p)
} catch {
// Profile may not exist yet — that's OK
}
if let user = try? await userFetch {
await MainActor.run {
AppState.shared.currentUser = user
}
}
}
@@ -38,17 +44,17 @@ final class ProfileViewModel {
defer { isSaving = false }
do {
let trimmedName = displayName.trimmingCharacters(in: .whitespaces)
if !trimmedName.isEmpty && trimmedName != AppState.shared.currentUser?.name {
if trimmedName != (AppState.shared.currentUser?.name ?? "") {
let updatedUser = try await authClient.updateName(trimmedName)
await MainActor.run {
AppState.shared.currentUser = updatedUser
}
}
let body = UserProfileUpsertBody(
piFirstName: piFirstName,
bldgCode: bldgCode,
lab: lab,
contact: contact.isEmpty ? nil : contact
piFirstName: piFirstName.trimmingCharacters(in: .whitespaces).isEmpty ? nil : piFirstName.trimmingCharacters(in: .whitespaces),
bldgCode: bldgCode.trimmingCharacters(in: .whitespaces).isEmpty ? nil : bldgCode.trimmingCharacters(in: .whitespaces),
lab: lab.trimmingCharacters(in: .whitespaces).isEmpty ? nil : lab.trimmingCharacters(in: .whitespaces),
contact: contact.trimmingCharacters(in: .whitespaces).isEmpty ? nil : contact.trimmingCharacters(in: .whitespaces)
)
let updated = try await profileClient.upsert(body)
profile = updated
@@ -80,9 +86,9 @@ final class ProfileViewModel {
}
private func populateFields(from p: UserProfile) {
piFirstName = p.piFirstName
bldgCode = p.bldgCode
lab = p.lab
piFirstName = p.piFirstName ?? ""
bldgCode = p.bldgCode ?? ""
lab = p.lab ?? ""
contact = p.contact ?? ""
}
}
@@ -125,6 +131,18 @@ struct ProfileView: View {
}
}
Section {
Button(role: .destructive) {
Task { await viewModel.signOut() }
} label: {
HStack {
Spacer()
Text("Sign Out")
Spacer()
}
}
}
Section {
Button(role: .destructive) {
viewModel.showDeleteConfirm = true
@@ -139,17 +157,10 @@ struct ProfileView: View {
} footer: {
Text("Permanently deletes your account and all data including chemicals and protocols.")
}
Section {
Button(role: .destructive) {
Task { await viewModel.signOut() }
} label: {
HStack {
Spacer()
Text("Sign Out")
Spacer()
}
}
}
.refreshable {
if !viewModel.isEditing {
await viewModel.load()
}
}
.navigationTitle("Profile")
@@ -173,9 +184,9 @@ struct ProfileView: View {
viewModel.isEditing = false
viewModel.displayName = appState.currentUser?.name ?? ""
if let p = viewModel.profile {
viewModel.piFirstName = p.piFirstName
viewModel.bldgCode = p.bldgCode
viewModel.lab = p.lab
viewModel.piFirstName = p.piFirstName ?? ""
viewModel.bldgCode = p.bldgCode ?? ""
viewModel.lab = p.lab ?? ""
viewModel.contact = p.contact ?? ""
}
}

6
LabWise/ScanView.swift
View File

@@ -499,9 +499,9 @@ final class LabelScannerViewModel {
func loadProfile() async {
if let profile = try? await profileClient.get() {
piFirstName = profile.piFirstName
bldgCode = profile.bldgCode
lab = profile.lab
piFirstName = profile.piFirstName ?? ""
bldgCode = profile.bldgCode ?? ""
lab = profile.lab ?? ""
contact = profile.contact ?? ""
}
}

1
LabWiseKit/Sources/LabWiseKit/APIClient.swift
View File

@@ -44,6 +44,7 @@ public final class APIClient: Sendable {
var req = URLRequest(url: url)
req.httpMethod = method
req.setValue(contentType, forHTTPHeaderField: "Content-Type")
req.setValue(baseURL.absoluteString, forHTTPHeaderField: "Origin")
if let body {
do {

8
LabWiseKit/Sources/LabWiseKit/Auth/AuthClient.swift
View File

@@ -335,13 +335,13 @@ public final class AuthClient: Sendable {
// MARK: - Update Name
private struct UpdateNameBody: Encodable, Sendable {
let name: String
let name: String?
}
/// Update the authenticated user's display name.
/// Update the authenticated user's display name. Pass an empty string to clear it.
public func updateName(_ name: String) async throws -> AuthUser {
let body = UpdateNameBody(name: name)
_ = try await api.postRaw("/api/auth/update-user", body: body)
let body = UpdateNameBody(name: name.isEmpty ? nil : name)
_ = try await api.postRaw("/api/account/name", body: body)
return try await fetchCurrentUser()
}

20
LabWiseKit/Sources/LabWiseKit/Models/UserProfile.swift
View File

@@ -3,9 +3,9 @@ import Foundation
/// Profile data returned by the server uses snake_case keys.
public struct UserProfile: Codable, Sendable {
public var userId: String
public var piFirstName: String
public var bldgCode: String
public var lab: String
public var piFirstName: String?
public var bldgCode: String?
public var lab: String?
public var contact: String?
enum CodingKeys: String, CodingKey {
@@ -18,9 +18,9 @@ public struct UserProfile: Codable, Sendable {
public init(
userId: String = "",
piFirstName: String = "",
bldgCode: String = "",
lab: String = "",
piFirstName: String? = nil,
bldgCode: String? = nil,
lab: String? = nil,
contact: String? = nil
) {
self.userId = userId
@@ -33,9 +33,9 @@ public struct UserProfile: Codable, Sendable {
/// Request body for POST /api/profile — server expects snake_case keys.
public struct UserProfileUpsertBody: Codable, Sendable {
public var piFirstName: String
public var bldgCode: String
public var lab: String
public var piFirstName: String?
public var bldgCode: String?
public var lab: String?
public var contact: String?
enum CodingKeys: String, CodingKey {
@@ -45,7 +45,7 @@ public struct UserProfileUpsertBody: Codable, Sendable {
case contact
}
public init(piFirstName: String, bldgCode: String, lab: String, contact: String? = nil) {
public init(piFirstName: String? = nil, bldgCode: String? = nil, lab: String? = nil, contact: String? = nil) {
self.piFirstName = piFirstName
self.bldgCode = bldgCode
self.lab = lab