From d421e8054ae8ca953b3063809df09c0c6b3359c5 Mon Sep 17 00:00:00 2001 From: henrique <7henrique18@gmail.com> Date: Sat, 31 Jan 2026 11:13:25 -0300 Subject: [PATCH 1/8] feat(review): implement user detailed reviews feature and enhance ProfileTabView with ProfileReviewsListView --- .../Plotwist.xcodeproj/project.pbxproj | 4 +- .../Plotwist/Services/ReviewService.swift | 96 ++++++ .../Plotwist/Views/Home/ProfileTabView.swift | 13 +- .../Profile/ProfileReviewsListView.swift | 307 ++++++++++++++++++ 4 files changed, 407 insertions(+), 13 deletions(-) create mode 100644 apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift diff --git a/apps/ios/Plotwist/Plotwist.xcodeproj/project.pbxproj b/apps/ios/Plotwist/Plotwist.xcodeproj/project.pbxproj index 4c82ee95..91a8bc93 100644 --- a/apps/ios/Plotwist/Plotwist.xcodeproj/project.pbxproj +++ b/apps/ios/Plotwist/Plotwist.xcodeproj/project.pbxproj @@ -252,7 +252,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = 54XPVTP5PA; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -280,7 +280,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = 54XPVTP5PA; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; diff --git a/apps/ios/Plotwist/Plotwist/Services/ReviewService.swift b/apps/ios/Plotwist/Plotwist/Services/ReviewService.swift index 38093327..0c3ddf35 100644 --- a/apps/ios/Plotwist/Plotwist/Services/ReviewService.swift +++ b/apps/ios/Plotwist/Plotwist/Services/ReviewService.swift @@ -288,6 +288,42 @@ class ReviewService { decoder.keyDecodingStrategy = .convertFromSnakeCase return try decoder.decode([ReviewListItem].self, from: data) } + + // MARK: - Get User Detailed Reviews (for profile) + func getUserDetailedReviews( + userId: String, + language: String = Language.current.rawValue, + orderBy: String = "createdAt", + limit: Int = 100 + ) async throws -> [DetailedReview] { + let urlString = "\(API.baseURL)/detailed/reviews?userId=\(userId)&language=\(language)&orderBy=\(orderBy)&limit=\(limit)" + + guard let url = URL(string: urlString) else { + throw ReviewError.invalidURL + } + + var request = URLRequest(url: url) + + // Add token if available (optional auth) + if let token = UserDefaults.standard.string(forKey: "token") { + request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization") + } + + let (data, response) = try await URLSession.shared.data(for: request) + + guard let http = response as? HTTPURLResponse else { + throw ReviewError.invalidResponse + } + + guard http.statusCode == 200 else { + throw ReviewError.invalidResponse + } + + let decoder = JSONDecoder() + decoder.keyDecodingStrategy = .convertFromSnakeCase + let result = try decoder.decode(DetailedReviewsResponse.self, from: data) + return result.reviews + } } // MARK: - Models @@ -384,6 +420,66 @@ struct ReviewData: Codable { } } +// MARK: - Detailed Review (for profile reviews list) +struct DetailedReview: Codable, Identifiable { + let id: String + let createdAt: String + let userId: String + let tmdbId: Int + let mediaType: String + let review: String + let rating: Double + let hasSpoilers: Bool + let language: String? + let seasonNumber: Int? + let episodeNumber: Int? + let user: ReviewUser + let likeCount: Int + let replyCount: Int + let userLike: UserLike? + let title: String + let posterPath: String? + let backdropPath: String? + + var posterURL: URL? { + guard let posterPath = posterPath else { return nil } + return URL(string: "https://image.tmdb.org/t/p/w342\(posterPath)") + } + + var formattedDate: String { + let inputFormatter = ISO8601DateFormatter() + inputFormatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds] + + guard let date = inputFormatter.date(from: createdAt) else { + // Try without fractional seconds + inputFormatter.formatOptions = [.withInternetDateTime] + guard let date = inputFormatter.date(from: createdAt) else { + return createdAt + } + return formatDate(date) + } + return formatDate(date) + } + + private func formatDate(_ date: Date) -> String { + let outputFormatter = DateFormatter() + outputFormatter.dateFormat = "dd/MM/yyyy" + return outputFormatter.string(from: date) + } + + var seasonBadge: String? { + guard mediaType == "TV_SHOW", let season = seasonNumber else { return nil } + if let episode = episodeNumber { + return "(S\(String(format: "%02d", season))E\(String(format: "%02d", episode)))" + } + return "(S\(String(format: "%02d", season)))" + } +} + +struct DetailedReviewsResponse: Codable { + let reviews: [DetailedReview] +} + enum ReviewError: LocalizedError { case invalidURL case invalidResponse diff --git a/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift b/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift index 8d8fbfa6..7d559c78 100644 --- a/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift +++ b/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift @@ -272,17 +272,8 @@ struct ProfileTabView: View { } case .reviews: - // Reviews tab content - placeholder for now - VStack(spacing: 16) { - Image(systemName: "text.bubble") - .font(.system(size: 48)) - .foregroundColor(.appMutedForegroundAdaptive) - Text(strings.beFirstToReview) - .font(.subheadline) - .foregroundColor(.appMutedForegroundAdaptive) - } - .frame(maxWidth: .infinity) - .padding(.top, 60) + // Reviews tab content + ProfileReviewsListView(userId: user.id) } Spacer() diff --git a/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift b/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift new file mode 100644 index 00000000..362620bd --- /dev/null +++ b/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift @@ -0,0 +1,307 @@ +// +// ProfileReviewsListView.swift +// Plotwist +// + +import SwiftUI + +// MARK: - Reviews Cache +class ProfileReviewsCache { + static let shared = ProfileReviewsCache() + private init() {} + + private var cache: [String: CachedReviews] = [:] + private let cacheDuration: TimeInterval = 300 // 5 minutes + + private struct CachedReviews { + let reviews: [DetailedReview] + let timestamp: Date + } + + func get(userId: String) -> (reviews: [DetailedReview], hasMore: Bool)? { + guard let cached = cache[userId], + Date().timeIntervalSince(cached.timestamp) < cacheDuration else { + return nil + } + return (cached.reviews, false) + } + + func set(userId: String, reviews: [DetailedReview], hasMore: Bool = false) { + cache[userId] = CachedReviews(reviews: reviews, timestamp: Date()) + } + + func invalidate(userId: String) { + cache.removeValue(forKey: userId) + } + + func invalidateAll() { + cache.removeAll() + } +} + +struct ProfileReviewsListView: View { + let userId: String + + @State private var reviews: [DetailedReview] = [] + @State private var isLoading = true + @State private var error: String? + @State private var strings = L10n.current + + private let cache = ProfileReviewsCache.shared + + // Calculate poster width: (screenWidth - 48 padding - 24 grid spacing) / 3 + private var posterWidth: CGFloat { + (UIScreen.main.bounds.width - 48 - 24) / 3 + } + + var body: some View { + Group { + if isLoading && reviews.isEmpty { + // Loading skeleton + VStack(spacing: 16) { + ForEach(0..<3, id: \.self) { _ in + ProfileReviewSkeletonItem(posterWidth: posterWidth) + } + } + .padding(.horizontal, 24) + .padding(.top, 16) + } else if reviews.isEmpty { + // Empty state + VStack(spacing: 16) { + Image(systemName: "text.bubble") + .font(.system(size: 48)) + .foregroundColor(.appMutedForegroundAdaptive) + Text(strings.beFirstToReview) + .font(.subheadline) + .foregroundColor(.appMutedForegroundAdaptive) + } + .frame(maxWidth: .infinity) + .padding(.top, 60) + } else { + // Reviews list + VStack(spacing: 16) { + ForEach(reviews) { review in + NavigationLink { + MediaDetailView( + mediaId: review.tmdbId, + mediaType: review.mediaType == "MOVIE" ? "movie" : "tv" + ) + } label: { + ProfileReviewItem(review: review, posterWidth: posterWidth) + } + .buttonStyle(.plain) + } + } + .padding(.horizontal, 24) + .padding(.top, 16) + } + } + .onAppear { + restoreFromCache() + } + .task { + await loadReviews() + } + .onReceive(NotificationCenter.default.publisher(for: .languageChanged)) { _ in + strings = L10n.current + } + } + + private func restoreFromCache() { + if let cached = cache.get(userId: userId) { + reviews = cached.reviews + isLoading = false + } + } + + private func loadReviews() async { + // Skip if already have cached data + if !reviews.isEmpty { + isLoading = false + return + } + + isLoading = true + defer { isLoading = false } + + do { + let newReviews = try await ReviewService.shared.getUserDetailedReviews(userId: userId) + reviews = newReviews + cache.set(userId: userId, reviews: newReviews, hasMore: false) + } catch { + self.error = error.localizedDescription + reviews = [] + } + } +} + +// MARK: - Profile Review Item +struct ProfileReviewItem: View { + let review: DetailedReview + let posterWidth: CGFloat + + private var posterHeight: CGFloat { + posterWidth * 1.5 // 2:3 aspect ratio + } + + var body: some View { + HStack(alignment: .top, spacing: 12) { + // Poster - same style as collection + CachedAsyncImage(url: review.posterURL) { image in + image + .resizable() + .aspectRatio(contentMode: .fill) + } placeholder: { + RoundedRectangle(cornerRadius: 12) + .fill(Color.appBorderAdaptive) + } + .frame(width: posterWidth, height: posterHeight) + .clipShape(RoundedRectangle(cornerRadius: 12)) + .posterBorder(cornerRadius: 12) + .shadow(color: Color.black.opacity(0.1), radius: 2, x: 0, y: 1) + + // Content + VStack(alignment: .leading, spacing: 8) { + // Title + Season badge + HStack(spacing: 6) { + Text(review.title) + .font(.headline) + .foregroundColor(.appForegroundAdaptive) + .lineLimit(2) + + if let badge = review.seasonBadge { + Text(badge) + .font(.subheadline) + .foregroundColor(.appMutedForegroundAdaptive) + } + } + + // Stars + Date + HStack(spacing: 8) { + // Stars + HStack(spacing: 2) { + ForEach(1...5, id: \.self) { index in + Image(systemName: starIcon(for: index)) + .font(.system(size: 14)) + .foregroundColor(starColor(for: index)) + } + } + + Circle() + .fill(Color.appMutedForegroundAdaptive.opacity(0.5)) + .frame(width: 4, height: 4) + + Text(review.formattedDate) + .font(.subheadline) + .foregroundColor(.appMutedForegroundAdaptive) + } + + // Review text + if !review.review.isEmpty { + Text(review.review) + .font(.subheadline) + .foregroundColor(.appMutedForegroundAdaptive) + .lineLimit(4) + .multilineTextAlignment(.leading) + .blur(radius: review.hasSpoilers ? 4 : 0) + .overlay( + review.hasSpoilers + ? Text(L10n.current.containSpoilers) + .font(.caption.weight(.medium)) + .foregroundColor(.appMutedForegroundAdaptive) + .padding(.horizontal, 6) + .padding(.vertical, 3) + .background(Color.appInputFilled) + .cornerRadius(4) + : nil + ) + } + + Spacer(minLength: 0) + } + } + .frame(maxWidth: .infinity, alignment: .leading) + } + + private func starIcon(for index: Int) -> String { + let rating = review.rating + if Double(index) <= rating { + return "star.fill" + } else if Double(index) - 0.5 <= rating { + return "star.leadinghalf.filled" + } else { + return "star" + } + } + + private func starColor(for index: Int) -> Color { + let rating = review.rating + if Double(index) <= rating || Double(index) - 0.5 <= rating { + return .appStarYellow + } else { + return .appMutedForegroundAdaptive.opacity(0.3) + } + } +} + +// MARK: - Skeleton Item +struct ProfileReviewSkeletonItem: View { + let posterWidth: CGFloat + + private var posterHeight: CGFloat { + posterWidth * 1.5 // 2:3 aspect ratio + } + + var body: some View { + HStack(alignment: .top, spacing: 12) { + // Poster skeleton - same style as collection + RoundedRectangle(cornerRadius: 12) + .fill(Color.appBorderAdaptive) + .frame(width: posterWidth, height: posterHeight) + + // Content skeleton + VStack(alignment: .leading, spacing: 8) { + // Title + RoundedRectangle(cornerRadius: 4) + .fill(Color.appBorderAdaptive) + .frame(width: 180, height: 20) + + // Stars + Date + HStack(spacing: 8) { + RoundedRectangle(cornerRadius: 4) + .fill(Color.appBorderAdaptive) + .frame(width: 80, height: 14) + + RoundedRectangle(cornerRadius: 4) + .fill(Color.appBorderAdaptive) + .frame(width: 70, height: 14) + } + + // Review text + VStack(alignment: .leading, spacing: 6) { + RoundedRectangle(cornerRadius: 4) + .fill(Color.appBorderAdaptive) + .frame(height: 14) + + RoundedRectangle(cornerRadius: 4) + .fill(Color.appBorderAdaptive) + .frame(height: 14) + + RoundedRectangle(cornerRadius: 4) + .fill(Color.appBorderAdaptive) + .frame(width: 140, height: 14) + } + + Spacer(minLength: 0) + } + } + .frame(maxWidth: .infinity, alignment: .leading) + } +} + +// MARK: - Preview +#Preview { + NavigationView { + ProfileReviewsListView(userId: "test-user-id") + } +} From 529362971a214a024177a2252e71ad77831c274d Mon Sep 17 00:00:00 2001 From: henrique <7henrique18@gmail.com> Date: Sat, 31 Jan 2026 11:29:52 -0300 Subject: [PATCH 2/8] refactor(ui): simplify provider display in WhereToWatchSection and adjust layout in ProfileReviewsListView --- .../Views/Details/WhereToWatchSection.swift | 15 +---------- .../Profile/ProfileReviewsListView.swift | 27 +++++++++---------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/apps/ios/Plotwist/Plotwist/Views/Details/WhereToWatchSection.swift b/apps/ios/Plotwist/Plotwist/Views/Details/WhereToWatchSection.swift index ff56aecd..9b6f381d 100644 --- a/apps/ios/Plotwist/Plotwist/Views/Details/WhereToWatchSection.swift +++ b/apps/ios/Plotwist/Plotwist/Views/Details/WhereToWatchSection.swift @@ -144,7 +144,7 @@ struct ProviderCategoryAnimated: View { private let expandedSpacing: CGFloat = 6 private var displayProviders: [WatchProvider] { - isExpanded ? providers : Array(providers.prefix(5)) + providers } var body: some View { @@ -199,19 +199,6 @@ struct ProviderIconsLayout: View { } } - // Show +N badge when collapsed and more than 5 providers - if !isExpanded && allProviders.count > 5 { - Text("+\(allProviders.count - 5)") - .font(.caption.weight(.semibold)) - .foregroundColor(.appMutedForegroundAdaptive) - .frame(width: iconSize, height: iconSize) - .background(Color.appInputFilled) - .clipShape(RoundedRectangle(cornerRadius: cornerRadius)) - .overlay( - RoundedRectangle(cornerRadius: cornerRadius) - .stroke(Color.appBorderAdaptive, lineWidth: 1.5) - ) - } } } } diff --git a/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift b/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift index 362620bd..f7003f8a 100644 --- a/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift +++ b/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift @@ -79,7 +79,7 @@ struct ProfileReviewsListView: View { .padding(.top, 60) } else { // Reviews list - VStack(spacing: 16) { + VStack(spacing: 24) { ForEach(reviews) { review in NavigationLink { MediaDetailView( @@ -145,7 +145,7 @@ struct ProfileReviewItem: View { } var body: some View { - HStack(alignment: .top, spacing: 12) { + HStack(alignment: .center, spacing: 12) { // Poster - same style as collection CachedAsyncImage(url: review.posterURL) { image in image @@ -163,18 +163,21 @@ struct ProfileReviewItem: View { // Content VStack(alignment: .leading, spacing: 8) { // Title + Season badge - HStack(spacing: 6) { - Text(review.title) - .font(.headline) - .foregroundColor(.appForegroundAdaptive) - .lineLimit(2) - + Group { if let badge = review.seasonBadge { - Text(badge) + Text(review.title) + .font(.headline) + .foregroundColor(.appForegroundAdaptive) + + Text(" \(badge)") .font(.subheadline) .foregroundColor(.appMutedForegroundAdaptive) + } else { + Text(review.title) + .font(.headline) + .foregroundColor(.appForegroundAdaptive) } } + .lineLimit(2) // Stars + Date HStack(spacing: 8) { @@ -216,8 +219,6 @@ struct ProfileReviewItem: View { : nil ) } - - Spacer(minLength: 0) } } .frame(maxWidth: .infinity, alignment: .leading) @@ -253,7 +254,7 @@ struct ProfileReviewSkeletonItem: View { } var body: some View { - HStack(alignment: .top, spacing: 12) { + HStack(alignment: .center, spacing: 12) { // Poster skeleton - same style as collection RoundedRectangle(cornerRadius: 12) .fill(Color.appBorderAdaptive) @@ -291,8 +292,6 @@ struct ProfileReviewSkeletonItem: View { .fill(Color.appBorderAdaptive) .frame(width: 140, height: 14) } - - Spacer(minLength: 0) } } .frame(maxWidth: .infinity, alignment: .leading) From 9bcb1b93c30b1fbbe168cf1423a5b3c359595e2a Mon Sep 17 00:00:00 2001 From: henrique <7henrique18@gmail.com> Date: Sat, 31 Jan 2026 11:37:34 -0300 Subject: [PATCH 3/8] feat(review): increase review limit to 1000 and adjust padding in ProfileTabView for improved layout --- apps/ios/Plotwist/Plotwist/Services/ReviewService.swift | 2 +- apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/ios/Plotwist/Plotwist/Services/ReviewService.swift b/apps/ios/Plotwist/Plotwist/Services/ReviewService.swift index 0c3ddf35..5e2825dc 100644 --- a/apps/ios/Plotwist/Plotwist/Services/ReviewService.swift +++ b/apps/ios/Plotwist/Plotwist/Services/ReviewService.swift @@ -294,7 +294,7 @@ class ReviewService { userId: String, language: String = Language.current.rawValue, orderBy: String = "createdAt", - limit: Int = 100 + limit: Int = 1000 ) async throws -> [DetailedReview] { let urlString = "\(API.baseURL)/detailed/reviews?userId=\(userId)&language=\(language)&orderBy=\(orderBy)&limit=\(limit)" diff --git a/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift b/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift index 7d559c78..e3b2ca47 100644 --- a/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift +++ b/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift @@ -274,11 +274,10 @@ struct ProfileTabView: View { case .reviews: // Reviews tab content ProfileReviewsListView(userId: user.id) + .padding(.bottom, 24) } - - Spacer() - .frame(height: 100) } + .padding(.bottom, 100) .background( GeometryReader { geo -> Color in DispatchQueue.main.async { From f5e507a6631e1dfbadb7e18d42315938e32fac96 Mon Sep 17 00:00:00 2001 From: henrique <7henrique18@gmail.com> Date: Sat, 31 Jan 2026 11:42:44 -0300 Subject: [PATCH 4/8] feat(profile): enhance ProfileTabView with icon and color representation for status tabs, improving UI clarity and interaction --- .../Plotwist/Views/Home/ProfileTabView.swift | 61 +++++++++++-------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift b/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift index e3b2ca47..170d72c8 100644 --- a/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift +++ b/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift @@ -28,6 +28,24 @@ enum ProfileStatusTab: String, CaseIterable { case .dropped: return strings.dropped } } + + var icon: String { + switch self { + case .watched: return "eye.fill" + case .watching: return "play.circle.fill" + case .watchlist: return "clock.fill" + case .dropped: return "xmark.circle.fill" + } + } + + var color: Color { + switch self { + case .watched: return .green + case .watching: return .blue + case .watchlist: return .orange + case .dropped: return .red + } + } } // MARK: - Profile Main Tab @@ -569,41 +587,34 @@ struct ProfileStatusTabs: View { var body: some View { ScrollView(.horizontal, showsIndicators: false) { - HStack(spacing: 2) { + HStack(spacing: 8) { ForEach(ProfileStatusTab.allCases, id: \.self) { tab in Button { withAnimation(.easeInOut(duration: 0.2)) { selectedTab = tab } } label: { - Text(tab.displayName(strings: strings)) - .font(.footnote.weight(.medium)) - .foregroundColor( - selectedTab == tab - ? .appForegroundAdaptive - : .appMutedForegroundAdaptive - ) - .padding(.horizontal, 12) - .padding(.vertical, 8) - .background( - selectedTab == tab - ? Color.appBackgroundAdaptive - : Color.clear - ) - .clipShape(RoundedRectangle(cornerRadius: 8)) - .shadow( - color: selectedTab == tab ? Color.black.opacity(0.08) : Color.clear, - radius: 2, - x: 0, - y: 1 - ) + HStack(spacing: 6) { + Image(systemName: tab.icon) + .font(.system(size: 12)) + .foregroundColor(selectedTab == tab ? tab.color : .appMutedForegroundAdaptive) + + Text(tab.displayName(strings: strings)) + .font(.footnote.weight(.medium)) + .foregroundColor( + selectedTab == tab + ? .appForegroundAdaptive + : .appMutedForegroundAdaptive + ) + } + .padding(.horizontal, 12) + .padding(.vertical, 8) + .background(Color.appInputFilled) + .clipShape(Capsule()) } .buttonStyle(.plain) } } - .padding(3) - .background(Color.appInputFilled) - .clipShape(RoundedRectangle(cornerRadius: 10)) .padding(.horizontal, 24) } .scrollClipDisabled() From 9e1bd75dc71f956efc5ff5737c8e2d782f78a3b6 Mon Sep 17 00:00:00 2001 From: henrique <7henrique18@gmail.com> Date: Sat, 31 Jan 2026 11:49:34 -0300 Subject: [PATCH 5/8] refactor(profile): optimize ProfileReviewsListView for performance by replacing VStack with LazyVStack and pre-computing star data for reviews --- .../Profile/ProfileReviewsListView.swift | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift b/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift index f7003f8a..46eeaeee 100644 --- a/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift +++ b/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift @@ -78,8 +78,8 @@ struct ProfileReviewsListView: View { .frame(maxWidth: .infinity) .padding(.top, 60) } else { - // Reviews list - VStack(spacing: 24) { + // Reviews list - LazyVStack for better performance with large lists + LazyVStack(spacing: 24) { ForEach(reviews) { review in NavigationLink { MediaDetailView( @@ -144,6 +144,28 @@ struct ProfileReviewItem: View { posterWidth * 1.5 // 2:3 aspect ratio } + // Pre-compute star data for better performance + private var starData: [(icon: String, color: Color)] { + (1...5).map { index in + let rating = review.rating + let isFilled = Double(index) <= rating + let isHalf = !isFilled && Double(index) - 0.5 <= rating + + let icon: String + if isFilled { + icon = "star.fill" + } else if isHalf { + icon = "star.leadinghalf.filled" + } else { + icon = "star" + } + + let color: Color = (isFilled || isHalf) ? .appStarYellow : .appMutedForegroundAdaptive.opacity(0.3) + + return (icon, color) + } + } + var body: some View { HStack(alignment: .center, spacing: 12) { // Poster - same style as collection @@ -181,12 +203,12 @@ struct ProfileReviewItem: View { // Stars + Date HStack(spacing: 8) { - // Stars + // Stars - using pre-computed data HStack(spacing: 2) { - ForEach(1...5, id: \.self) { index in - Image(systemName: starIcon(for: index)) + ForEach(0..<5, id: \.self) { index in + Image(systemName: starData[index].icon) .font(.system(size: 14)) - .foregroundColor(starColor(for: index)) + .foregroundColor(starData[index].color) } } @@ -220,29 +242,10 @@ struct ProfileReviewItem: View { ) } } + .drawingGroup() // Rasterize text content for better scroll performance } .frame(maxWidth: .infinity, alignment: .leading) } - - private func starIcon(for index: Int) -> String { - let rating = review.rating - if Double(index) <= rating { - return "star.fill" - } else if Double(index) - 0.5 <= rating { - return "star.leadinghalf.filled" - } else { - return "star" - } - } - - private func starColor(for index: Int) -> Color { - let rating = review.rating - if Double(index) <= rating || Double(index) - 0.5 <= rating { - return .appStarYellow - } else { - return .appMutedForegroundAdaptive.opacity(0.3) - } - } } // MARK: - Skeleton Item From 73dd2ab7416c58dfea47798780b111f89de535e1 Mon Sep 17 00:00:00 2001 From: henrique <7henrique18@gmail.com> Date: Sat, 31 Jan 2026 12:09:01 -0300 Subject: [PATCH 6/8] feat(ui): enhance FloatingSheetContainer with device-specific corner radius and improved padding; update ReviewSheet button styling to use capsule shape for better visual consistency --- .../Plotwist/Extensions/View+Sheet.swift | 27 +++++++++++++++---- .../Plotwist/Views/Details/ReviewSheet.swift | 2 +- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/apps/ios/Plotwist/Plotwist/Extensions/View+Sheet.swift b/apps/ios/Plotwist/Plotwist/Extensions/View+Sheet.swift index 57b4154f..2b6caa2b 100644 --- a/apps/ios/Plotwist/Plotwist/Extensions/View+Sheet.swift +++ b/apps/ios/Plotwist/Plotwist/Extensions/View+Sheet.swift @@ -5,14 +5,29 @@ import SwiftUI +// MARK: - UIScreen Extension for Device Corner Radius +extension UIScreen { + /// Returns the display corner radius of the device screen + var deviceCornerRadius: CGFloat { + guard let cornerRadius = value(forKey: "_displayCornerRadius") as? CGFloat else { + return 44 // Fallback for older devices or simulator + } + return cornerRadius + } +} + // MARK: - Sheet Style Configuration enum SheetStyle { /// Margem horizontal do sheet flutuante - static let horizontalPadding: CGFloat = 16 - /// Raio de arredondamento do sheet - static let cornerRadius: CGFloat = 32 - /// Altura extra para compensar o padding (padding * 2) - static let heightOffset: CGFloat = 32 + static let horizontalPadding: CGFloat = 8 + /// Margem inferior do sheet flutuante + static let bottomPadding: CGFloat = 8 + /// Raio de arredondamento do sheet - usa o raio do dispositivo + static var cornerRadius: CGFloat { + UIScreen.main.deviceCornerRadius + } + /// Altura extra para compensar o padding + static let heightOffset: CGFloat = 20 } // MARK: - Floating Sheet Container @@ -31,7 +46,9 @@ struct FloatingSheetContainer: View { .background(Color.appBackgroundAdaptive) .clipShape(RoundedRectangle(cornerRadius: SheetStyle.cornerRadius)) .padding(.horizontal, SheetStyle.horizontalPadding) + .padding(.bottom, SheetStyle.bottomPadding) } + .ignoresSafeArea(.container, edges: .bottom) } } diff --git a/apps/ios/Plotwist/Plotwist/Views/Details/ReviewSheet.swift b/apps/ios/Plotwist/Plotwist/Views/Details/ReviewSheet.swift index b0a61e1e..17a014dc 100644 --- a/apps/ios/Plotwist/Plotwist/Views/Details/ReviewSheet.swift +++ b/apps/ios/Plotwist/Plotwist/Views/Details/ReviewSheet.swift @@ -109,7 +109,7 @@ struct ReviewSheet: View { .frame(height: 48) .background(Color.appForegroundAdaptive) .foregroundColor(.appBackgroundAdaptive) - .cornerRadius(12) + .clipShape(Capsule()) } .disabled(!isFormValid || isLoading || isDeleting) .opacity(!isFormValid || isLoading || isDeleting ? 0.5 : 1) From f354513ffca4c68ceaa6663b7bdb02ade1ecf375 Mon Sep 17 00:00:00 2001 From: henrique <7henrique18@gmail.com> Date: Sat, 31 Jan 2026 12:09:35 -0300 Subject: [PATCH 7/8] chore(project): update CURRENT_PROJECT_VERSION from 7 to 8 in project.pbxproj to reflect new versioning --- apps/ios/Plotwist/Plotwist.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/ios/Plotwist/Plotwist.xcodeproj/project.pbxproj b/apps/ios/Plotwist/Plotwist.xcodeproj/project.pbxproj index 91a8bc93..074ce593 100644 --- a/apps/ios/Plotwist/Plotwist.xcodeproj/project.pbxproj +++ b/apps/ios/Plotwist/Plotwist.xcodeproj/project.pbxproj @@ -252,7 +252,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 8; DEVELOPMENT_TEAM = 54XPVTP5PA; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -280,7 +280,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 8; DEVELOPMENT_TEAM = 54XPVTP5PA; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; From 222faed64b6d420fcc09f6e78a58f4b084e6d57f Mon Sep 17 00:00:00 2001 From: henrique <7henrique18@gmail.com> Date: Sat, 31 Jan 2026 15:05:23 -0300 Subject: [PATCH 8/8] feat(env): update .gitignore to include all environment files and enhance Stripe integration for development with a dummy key; improve reviews route schema with operationId; refactor ProfileTabView for better tab content handling; optimize ProfileReviewItem by replacing star data computation with StarRatingView; update Orval generated files to version 7.21.0 and add queryClient support in API hooks. --- .gitignore | 1 + 23 | 0 apps/backend/src/adapters/stripe.ts | 6 +- apps/backend/src/http/routes/reviews.ts | 1 + .../Plotwist/Views/Home/ProfileTabView.swift | 173 +-- .../Profile/ProfileReviewsListView.swift | 31 +- apps/web/orval.config.js | 5 + apps/web/src/api/auth.ts | 18 +- apps/web/src/api/default.ts | 57 +- apps/web/src/api/endpoints.schemas.ts | 1111 +++++++++++------ apps/web/src/api/follows.ts | 225 +++- apps/web/src/api/images.ts | 20 +- apps/web/src/api/imports.ts | 70 +- apps/web/src/api/like.ts | 74 +- apps/web/src/api/list-item.ts | 80 +- apps/web/src/api/list.ts | 184 +-- apps/web/src/api/review-replies.ts | 80 +- apps/web/src/api/reviews.ts | 251 ++-- apps/web/src/api/social-links.ts | 70 +- apps/web/src/api/subscriptions.ts | 88 ++ apps/web/src/api/user-activities.ts | 232 +++- apps/web/src/api/user-episodes.ts | 74 +- apps/web/src/api/user-items.ts | 421 ++++++- apps/web/src/api/user-stats.ts | 462 ++++--- apps/web/src/api/users.ts | 384 +++--- apps/web/src/api/watch-entries.ts | 366 ++++++ apps/web/src/api/webhook.ts | 15 +- .../[lang]/[username]/reviews/_reviews.tsx | 55 +- .../app/[lang]/[username]/reviews/page.tsx | 8 +- 29 files changed, 3154 insertions(+), 1408 deletions(-) create mode 100644 23 create mode 100644 apps/web/src/api/subscriptions.ts create mode 100644 apps/web/src/api/watch-entries.ts diff --git a/.gitignore b/.gitignore index 96fab4fe..8f1b2fe8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ node_modules .env.development.local .env.test.local .env.production.local +.env.* # Testing coverage diff --git a/23 b/23 new file mode 100644 index 00000000..e69de29b diff --git a/apps/backend/src/adapters/stripe.ts b/apps/backend/src/adapters/stripe.ts index f1fe9084..e5b880fb 100644 --- a/apps/backend/src/adapters/stripe.ts +++ b/apps/backend/src/adapters/stripe.ts @@ -1,4 +1,8 @@ import Stripe from 'stripe' import { config } from '@/config' -export const stripe = new Stripe(config.services.STRIPE_SECRET_KEY) +// Stripe is optional in development - use a dummy key if not provided +const stripeKey = + config.services.STRIPE_SECRET_KEY || 'sk_test_dummy_key_for_dev' + +export const stripe = new Stripe(stripeKey) diff --git a/apps/backend/src/http/routes/reviews.ts b/apps/backend/src/http/routes/reviews.ts index 57378a44..f839b135 100644 --- a/apps/backend/src/http/routes/reviews.ts +++ b/apps/backend/src/http/routes/reviews.ts @@ -100,6 +100,7 @@ export async function reviewsRoute(app: FastifyInstance) { method: 'GET', url: '/detailed/reviews', schema: { + operationId: 'getDetailedReviews', description: 'Get detailed reviews', tags: [reviewsTag], query: getReviewsQuerySchema, diff --git a/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift b/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift index 6d67f9d1..40a596ba 100644 --- a/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift +++ b/apps/ios/Plotwist/Plotwist/Views/Home/ProfileTabView.swift @@ -207,93 +207,104 @@ struct ProfileTabView: View { .padding(.top, 20) .padding(.bottom, 8) - // Tab Content - switch selectedMainTab { - case .collection: - // Status Tabs inside Collection - ProfileStatusTabs(selectedTab: $selectedStatusTab, strings: strings) - .padding(.top, 8) - .onChange(of: selectedStatusTab) { _ in - Task { await loadUserItems() } - } + // Tab Content with slide animation + Group { + if selectedMainTab == .collection { + VStack(spacing: 0) { + // Status Tabs inside Collection + ProfileStatusTabs(selectedTab: $selectedStatusTab, strings: strings) + .padding(.top, 8) + .onChange(of: selectedStatusTab) { _ in + Task { await loadUserItems() } + } - // User Items Grid - if isLoadingItems { - LazyVGrid( - columns: [ - GridItem(.flexible(), spacing: 12), - GridItem(.flexible(), spacing: 12), - GridItem(.flexible(), spacing: 12), - ], - spacing: 16 - ) { - ForEach(0..<6, id: \.self) { _ in - RoundedRectangle(cornerRadius: 12) - .fill(Color.appBorderAdaptive) - .aspectRatio(2 / 3, contentMode: .fit) - } - } - .padding(.horizontal, 24) - .padding(.top, 16) - } else if userItems.isEmpty { - // Empty state - Add first item - LazyVGrid( - columns: [ - GridItem(.flexible(), spacing: 12), - GridItem(.flexible(), spacing: 12), - GridItem(.flexible(), spacing: 12), - ], - spacing: 16 - ) { - Button { - NotificationCenter.default.post(name: .navigateToSearch, object: nil) - } label: { - RoundedRectangle(cornerRadius: 12) - .strokeBorder( - style: StrokeStyle(lineWidth: 2, dash: [8, 4]) - ) - .foregroundColor(.appBorderAdaptive) - .aspectRatio(2 / 3, contentMode: .fit) - .overlay( - Image(systemName: "plus") - .font(.system(size: 24, weight: .medium)) - .foregroundColor(.appMutedForegroundAdaptive) - ) - } - .buttonStyle(.plain) - } - .padding(.horizontal, 24) - .padding(.top, 16) - } else { - LazyVGrid( - columns: [ - GridItem(.flexible(), spacing: 12), - GridItem(.flexible(), spacing: 12), - GridItem(.flexible(), spacing: 12), - ], - spacing: 16 - ) { - ForEach(userItems) { item in - NavigationLink { - MediaDetailView( - mediaId: item.tmdbId, - mediaType: item.mediaType == "MOVIE" ? "movie" : "tv" - ) - } label: { - ProfileItemCard(tmdbId: item.tmdbId, mediaType: item.mediaType) + // User Items Grid + if isLoadingItems { + LazyVGrid( + columns: [ + GridItem(.flexible(), spacing: 12), + GridItem(.flexible(), spacing: 12), + GridItem(.flexible(), spacing: 12), + ], + spacing: 16 + ) { + ForEach(0..<6, id: \.self) { _ in + RoundedRectangle(cornerRadius: 12) + .fill(Color.appBorderAdaptive) + .aspectRatio(2 / 3, contentMode: .fit) + } + } + .padding(.horizontal, 24) + .padding(.top, 16) + } else if userItems.isEmpty { + // Empty state - Add first item + LazyVGrid( + columns: [ + GridItem(.flexible(), spacing: 12), + GridItem(.flexible(), spacing: 12), + GridItem(.flexible(), spacing: 12), + ], + spacing: 16 + ) { + Button { + NotificationCenter.default.post(name: .navigateToSearch, object: nil) + } label: { + RoundedRectangle(cornerRadius: 12) + .strokeBorder( + style: StrokeStyle(lineWidth: 2, dash: [8, 4]) + ) + .foregroundColor(.appBorderAdaptive) + .aspectRatio(2 / 3, contentMode: .fit) + .overlay( + Image(systemName: "plus") + .font(.system(size: 24, weight: .medium)) + .foregroundColor(.appMutedForegroundAdaptive) + ) + } + .buttonStyle(.plain) } - .buttonStyle(.plain) + .padding(.horizontal, 24) + .padding(.top, 16) + } else { + LazyVGrid( + columns: [ + GridItem(.flexible(), spacing: 12), + GridItem(.flexible(), spacing: 12), + GridItem(.flexible(), spacing: 12), + ], + spacing: 16 + ) { + ForEach(userItems) { item in + NavigationLink { + MediaDetailView( + mediaId: item.tmdbId, + mediaType: item.mediaType == "MOVIE" ? "movie" : "tv" + ) + } label: { + ProfileItemCard(tmdbId: item.tmdbId, mediaType: item.mediaType) + } + .buttonStyle(.plain) + } + } + .padding(.horizontal, 24) + .padding(.top, 16) } } - .padding(.horizontal, 24) - .padding(.top, 16) + .transition(.asymmetric( + insertion: .move(edge: .leading).combined(with: .opacity), + removal: .move(edge: .leading).combined(with: .opacity) + )) + } else { + // Reviews tab content with pagination + ProfileReviewsListView(userId: user.id) + .padding(.bottom, 24) + .transition(.asymmetric( + insertion: .move(edge: .trailing).combined(with: .opacity), + removal: .move(edge: .trailing).combined(with: .opacity) + )) } - - case .reviews: - // Reviews tab content with pagination - ProfileReviewsListView(userId: user.id) - .padding(.bottom, 24) } + .animation(.easeInOut(duration: 0.3), value: selectedMainTab) } .padding(.bottom, 100) .background( diff --git a/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift b/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift index e94d81de..3355fd34 100644 --- a/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift +++ b/apps/ios/Plotwist/Plotwist/Views/Profile/ProfileReviewsListView.swift @@ -205,28 +205,6 @@ struct ProfileReviewItem: View { posterWidth * 1.5 // 2:3 aspect ratio } - // Pre-compute star data for better performance - private var starData: [(icon: String, color: Color)] { - (1...5).map { index in - let rating = review.rating - let isFilled = Double(index) <= rating - let isHalf = !isFilled && Double(index) - 0.5 <= rating - - let icon: String - if isFilled { - icon = "star.fill" - } else if isHalf { - icon = "star.leadinghalf.filled" - } else { - icon = "star" - } - - let color: Color = (isFilled || isHalf) ? .appStarYellow : .appMutedForegroundAdaptive.opacity(0.3) - - return (icon, color) - } - } - var body: some View { HStack(alignment: .center, spacing: 12) { // Poster @@ -264,13 +242,7 @@ struct ProfileReviewItem: View { // Stars + Date HStack(spacing: 8) { - HStack(spacing: 2) { - ForEach(0..<5, id: \.self) { index in - Image(systemName: starData[index].icon) - .font(.system(size: 14)) - .foregroundColor(starData[index].color) - } - } + StarRatingView(rating: .constant(review.rating), size: 14, interactive: false) Circle() .fill(Color.appMutedForegroundAdaptive.opacity(0.5)) @@ -302,7 +274,6 @@ struct ProfileReviewItem: View { ) } } - .drawingGroup() // Rasterize text content for better scroll performance } .frame(maxWidth: .infinity, alignment: .leading) } diff --git a/apps/web/orval.config.js b/apps/web/orval.config.js index cf25fca9..ed8fc220 100644 --- a/apps/web/orval.config.js +++ b/apps/web/orval.config.js @@ -34,6 +34,11 @@ module.exports = { useInfinite: true, }, }, + getDetailedReviews: { + query: { + useInfinite: true, + }, + }, }, }, diff --git a/apps/web/src/api/auth.ts b/apps/web/src/api/auth.ts index ec7a08e0..9f2f852a 100644 --- a/apps/web/src/api/auth.ts +++ b/apps/web/src/api/auth.ts @@ -1,27 +1,31 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 */ import { useMutation -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { MutationFunction, + QueryClient, UseMutationOptions, UseMutationResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import type { PostLogin200, PostLogin400, PostLoginBody -} from './endpoints.schemas' +} from './endpoints.schemas'; + import { axiosInstance } from '../services/axios-instance'; + /** * User login with login and password */ @@ -44,7 +48,7 @@ export const postLogin = ( export const getPostLoginMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PostLoginBody}, TContext>, } ): UseMutationOptions>, TError,{data: PostLoginBody}, TContext> => { - + const mutationKey = ['postLogin']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -72,7 +76,7 @@ const {mutation: mutationOptions} = options ? export const usePostLogin = (options?: { mutation?:UseMutationOptions>, TError,{data: PostLoginBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostLoginBody}, @@ -81,6 +85,6 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostLoginMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } \ No newline at end of file diff --git a/apps/web/src/api/default.ts b/apps/web/src/api/default.ts index 873e7191..f35feaa1 100644 --- a/apps/web/src/api/default.ts +++ b/apps/web/src/api/default.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 @@ -7,11 +7,12 @@ import { useQuery, useSuspenseQuery -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { DataTag, DefinedInitialDataOptions, DefinedUseQueryResult, + QueryClient, QueryFunction, QueryKey, UndefinedInitialDataOptions, @@ -19,12 +20,14 @@ import type { UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import { axiosInstance } from '../services/axios-instance'; + export const getHealth = ( signal?: AbortSignal @@ -38,8 +41,12 @@ export const getHealth = ( } + + export const getGetHealthQueryKey = () => { - return [`/health`] as const; + return [ + `/health` + ] as const; } @@ -58,7 +65,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetHealthQueryResult = NonNullable>> @@ -73,8 +80,8 @@ export function useGetHealth>, TErr Awaited> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetHealth>, TError = unknown>( options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -83,21 +90,21 @@ export function useGetHealth>, TErr Awaited> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetHealth>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetHealth>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetHealthQueryOptions(options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -106,6 +113,7 @@ export function useGetHealth>, TErr + export const getGetHealthSuspenseQueryOptions = >, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } ) => { @@ -121,7 +129,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetHealthSuspenseQueryResult = NonNullable>> @@ -130,25 +138,25 @@ export type GetHealthSuspenseQueryError = unknown export function useGetHealthSuspense>, TError = unknown>( options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetHealthSuspense>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetHealthSuspense>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetHealthSuspense>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetHealthSuspenseQueryOptions(options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -157,3 +165,4 @@ export function useGetHealthSuspense(options?: { mutation?:UseMutationOptions>, TError,{data: PostFollowBody}, TContext>, } ): UseMutationOptions>, TError,{data: PostFollowBody}, TContext> => { - + const mutationKey = ['postFollow']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -92,7 +96,7 @@ const {mutation: mutationOptions} = options ? export const usePostFollow = (options?: { mutation?:UseMutationOptions>, TError,{data: PostFollowBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostFollowBody}, @@ -101,7 +105,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostFollowMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get follow @@ -120,8 +124,12 @@ export const getFollow = ( } -export const getGetFollowQueryKey = (params: GetFollowParams,) => { - return [`/follow`, ...(params ? [params]: [])] as const; + + +export const getGetFollowQueryKey = (params?: GetFollowParams,) => { + return [ + `/follow`, ...(params ? [params]: []) + ] as const; } @@ -140,7 +148,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetFollowQueryResult = NonNullable>> @@ -155,8 +163,8 @@ export function useGetFollow>, TErr Awaited> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetFollow>, TError = unknown>( params: GetFollowParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -165,21 +173,21 @@ export function useGetFollow>, TErr Awaited> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetFollow>, TError = unknown>( params: GetFollowParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetFollow>, TError = unknown>( params: GetFollowParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetFollowQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -188,6 +196,7 @@ export function useGetFollow>, TErr + export const getGetFollowSuspenseQueryOptions = >, TError = unknown>(params: GetFollowParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -203,7 +212,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetFollowSuspenseQueryResult = NonNullable>> @@ -212,25 +221,25 @@ export type GetFollowSuspenseQueryError = unknown export function useGetFollowSuspense>, TError = unknown>( params: GetFollowParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetFollowSuspense>, TError = unknown>( params: GetFollowParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetFollowSuspense>, TError = unknown>( params: GetFollowParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetFollowSuspense>, TError = unknown>( params: GetFollowParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetFollowSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -239,6 +248,7 @@ export function useGetFollowSuspense(options?: { mutation?:UseMutationOptions>, TError,{data: DeleteFollowBody}, TContext>, } ): UseMutationOptions>, TError,{data: DeleteFollowBody}, TContext> => { - + const mutationKey = ['deleteFollow']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -288,7 +298,7 @@ const {mutation: mutationOptions} = options ? export const useDeleteFollow = (options?: { mutation?:UseMutationOptions>, TError,{data: DeleteFollowBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: DeleteFollowBody}, @@ -297,7 +307,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getDeleteFollowMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get followers @@ -316,8 +326,18 @@ export const getFollowers = ( } + + +export const getGetFollowersInfiniteQueryKey = (params?: GetFollowersParams,) => { + return [ + 'infinite', `/followers`, ...(params ? [params]: []) + ] as const; + } + export const getGetFollowersQueryKey = (params?: GetFollowersParams,) => { - return [`/followers`, ...(params ? [params]: [])] as const; + return [ + `/followers`, ...(params ? [params]: []) + ] as const; } @@ -326,7 +346,7 @@ export const getGetFollowersInfiniteQueryOptions = >, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseInfiniteQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetFollowersInfiniteQueryResult = NonNullable>> @@ -351,8 +371,8 @@ export function useGetFollowersInfinite> > , 'initialData' >, } - - ): DefinedUseInfiniteQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseInfiniteQueryResult & { queryKey: DataTag } export function useGetFollowersInfinite>>, TError = unknown>( params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -361,21 +381,21 @@ export function useGetFollowersInfinite> > , 'initialData' >, } - - ): UseInfiniteQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } export function useGetFollowersInfinite>>, TError = unknown>( params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseInfiniteQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } export function useGetFollowersInfinite>>, TError = unknown>( params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseInfiniteQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } { const queryOptions = getGetFollowersInfiniteQueryOptions(params,options) - const query = useInfiniteQuery(queryOptions) as UseInfiniteQueryResult & { queryKey: DataTag }; + const query = useInfiniteQuery(queryOptions, queryClient) as UseInfiniteQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -384,3 +404,120 @@ export function useGetFollowersInfinite>, TError = unknown>(params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetFollowersQueryKey(params); + + + + const queryFn: QueryFunction>> = ({ signal }) => getFollowers(params, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetFollowersQueryResult = NonNullable>> +export type GetFollowersQueryError = unknown + + +export function useGetFollowers>, TError = unknown>( + params: undefined | GetFollowersParams, options: { query:Partial>, TError, TData>> & Pick< + DefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } +export function useGetFollowers>, TError = unknown>( + params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>> & Pick< + UndefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } +export function useGetFollowers>, TError = unknown>( + params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } + +export function useGetFollowers>, TError = unknown>( + params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetFollowersQueryOptions(params,options) + + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + +export const getGetFollowersSuspenseQueryOptions = >, TError = unknown>(params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetFollowersQueryKey(params); + + + + const queryFn: QueryFunction>> = ({ signal }) => getFollowers(params, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetFollowersSuspenseQueryResult = NonNullable>> +export type GetFollowersSuspenseQueryError = unknown + + +export function useGetFollowersSuspense>, TError = unknown>( + params: undefined | GetFollowersParams, options: { query:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetFollowersSuspense>, TError = unknown>( + params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetFollowersSuspense>, TError = unknown>( + params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } + +export function useGetFollowersSuspense>, TError = unknown>( + params?: GetFollowersParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetFollowersSuspenseQueryOptions(params,options) + + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + diff --git a/apps/web/src/api/images.ts b/apps/web/src/api/images.ts index bc6a9ae2..be9d5033 100644 --- a/apps/web/src/api/images.ts +++ b/apps/web/src/api/images.ts @@ -1,27 +1,31 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 */ import { useMutation -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { MutationFunction, + QueryClient, UseMutationOptions, UseMutationResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import type { PostImage201, PostImageBody, PostImageParams -} from './endpoints.schemas' +} from './endpoints.schemas'; + import { axiosInstance } from '../services/axios-instance'; + /** * Create image */ @@ -32,7 +36,7 @@ export const postImage = ( ) => { const formData = new FormData(); -formData.append('file', postImageBody.file) +formData.append(`file`, postImageBody.file) return axiosInstance( {url: `/image`, method: 'POST', @@ -48,7 +52,7 @@ formData.append('file', postImageBody.file) export const getPostImageMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PostImageBody;params: PostImageParams}, TContext>, } ): UseMutationOptions>, TError,{data: PostImageBody;params: PostImageParams}, TContext> => { - + const mutationKey = ['postImage']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -76,7 +80,7 @@ const {mutation: mutationOptions} = options ? export const usePostImage = (options?: { mutation?:UseMutationOptions>, TError,{data: PostImageBody;params: PostImageParams}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostImageBody;params: PostImageParams}, @@ -85,6 +89,6 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostImageMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } \ No newline at end of file diff --git a/apps/web/src/api/imports.ts b/apps/web/src/api/imports.ts index 36dbcd7e..6929a054 100644 --- a/apps/web/src/api/imports.ts +++ b/apps/web/src/api/imports.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 @@ -8,12 +8,13 @@ import { useMutation, useQuery, useSuspenseQuery -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { DataTag, DefinedInitialDataOptions, DefinedUseQueryResult, MutationFunction, + QueryClient, QueryFunction, QueryKey, UndefinedInitialDataOptions, @@ -23,7 +24,8 @@ import type { UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import type { GetImportImportId200, GetImportImportId404, @@ -31,12 +33,14 @@ import type { PostImport422, PostImportBody, PostImportParams -} from './endpoints.schemas' +} from './endpoints.schemas'; + import { axiosInstance } from '../services/axios-instance'; + /** * Save imports to run */ @@ -47,7 +51,7 @@ export const postImport = ( ) => { const formData = new FormData(); -formData.append('file', postImportBody.file) +formData.append(`file`, postImportBody.file) return axiosInstance( {url: `/import`, method: 'POST', @@ -63,7 +67,7 @@ formData.append('file', postImportBody.file) export const getPostImportMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PostImportBody;params: PostImportParams}, TContext>, } ): UseMutationOptions>, TError,{data: PostImportBody;params: PostImportParams}, TContext> => { - + const mutationKey = ['postImport']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -91,7 +95,7 @@ const {mutation: mutationOptions} = options ? export const usePostImport = (options?: { mutation?:UseMutationOptions>, TError,{data: PostImportBody;params: PostImportParams}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostImportBody;params: PostImportParams}, @@ -100,7 +104,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostImportMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get detailed import @@ -118,8 +122,12 @@ export const getImportImportId = ( } -export const getGetImportImportIdQueryKey = (importId: string,) => { - return [`/import/${importId}`] as const; + + +export const getGetImportImportIdQueryKey = (importId?: string,) => { + return [ + `/import/${importId}` + ] as const; } @@ -138,7 +146,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(importId), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(importId), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetImportImportIdQueryResult = NonNullable>> @@ -153,8 +161,8 @@ export function useGetImportImportId> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetImportImportId>, TError = GetImportImportId404>( importId: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -163,21 +171,21 @@ export function useGetImportImportId> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetImportImportId>, TError = GetImportImportId404>( importId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetImportImportId>, TError = GetImportImportId404>( importId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetImportImportIdQueryOptions(importId,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -186,6 +194,7 @@ export function useGetImportImportId>, TError = GetImportImportId404>(importId: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -201,7 +210,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetImportImportIdSuspenseQueryResult = NonNullable>> @@ -210,25 +219,25 @@ export type GetImportImportIdSuspenseQueryError = GetImportImportId404 export function useGetImportImportIdSuspense>, TError = GetImportImportId404>( importId: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetImportImportIdSuspense>, TError = GetImportImportId404>( importId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetImportImportIdSuspense>, TError = GetImportImportId404>( importId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetImportImportIdSuspense>, TError = GetImportImportId404>( importId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetImportImportIdSuspenseQueryOptions(importId,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -237,3 +246,4 @@ export function useGetImportImportIdSuspense(options?: { mutation?:UseMutationOptions>, TError,{data: PostLikeBody}, TContext>, } ): UseMutationOptions>, TError,{data: PostLikeBody}, TContext> => { - + const mutationKey = ['postLike']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -84,7 +88,7 @@ const {mutation: mutationOptions} = options ? export const usePostLike = (options?: { mutation?:UseMutationOptions>, TError,{data: PostLikeBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostLikeBody}, @@ -93,7 +97,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostLikeMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Delete like @@ -114,7 +118,7 @@ export const deleteLikeId = ( export const getDeleteLikeIdMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } ): UseMutationOptions>, TError,{id: string}, TContext> => { - + const mutationKey = ['deleteLikeId']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -142,7 +146,7 @@ const {mutation: mutationOptions} = options ? export const useDeleteLikeId = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {id: string}, @@ -151,7 +155,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getDeleteLikeIdMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get likes @@ -169,8 +173,12 @@ export const getLikesEntityId = ( } -export const getGetLikesEntityIdQueryKey = (entityId: string,) => { - return [`/likes/${entityId}`] as const; + + +export const getGetLikesEntityIdQueryKey = (entityId?: string,) => { + return [ + `/likes/${entityId}` + ] as const; } @@ -189,7 +197,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(entityId), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(entityId), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetLikesEntityIdQueryResult = NonNullable>> @@ -204,8 +212,8 @@ export function useGetLikesEntityId> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetLikesEntityId>, TError = unknown>( entityId: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -214,21 +222,21 @@ export function useGetLikesEntityId> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetLikesEntityId>, TError = unknown>( entityId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetLikesEntityId>, TError = unknown>( entityId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetLikesEntityIdQueryOptions(entityId,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -237,6 +245,7 @@ export function useGetLikesEntityId>, TError = unknown>(entityId: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -252,7 +261,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetLikesEntityIdSuspenseQueryResult = NonNullable>> @@ -261,25 +270,25 @@ export type GetLikesEntityIdSuspenseQueryError = unknown export function useGetLikesEntityIdSuspense>, TError = unknown>( entityId: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetLikesEntityIdSuspense>, TError = unknown>( entityId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetLikesEntityIdSuspense>, TError = unknown>( entityId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetLikesEntityIdSuspense>, TError = unknown>( entityId: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetLikesEntityIdSuspenseQueryOptions(entityId,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -288,3 +297,4 @@ export function useGetLikesEntityIdSuspense(options?: { mutation?:UseMutationOptions>, TError,{data: PostListItemBody}, TContext>, } ): UseMutationOptions>, TError,{data: PostListItemBody}, TContext> => { - + const mutationKey = ['postListItem']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -86,7 +90,7 @@ const {mutation: mutationOptions} = options ? export const usePostListItem = (options?: { mutation?:UseMutationOptions>, TError,{data: PostListItemBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostListItemBody}, @@ -95,7 +99,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostListItemMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Create list item @@ -115,9 +119,13 @@ export const getListItemsByListId = ( } -export const getGetListItemsByListIdQueryKey = (listId: string, + + +export const getGetListItemsByListIdQueryKey = (listId?: string, params?: GetListItemsByListIdParams,) => { - return [`/list-items/by/${listId}`, ...(params ? [params]: [])] as const; + return [ + `/list-items/by/${listId}`, ...(params ? [params]: []) + ] as const; } @@ -137,7 +145,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(listId), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(listId), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetListItemsByListIdQueryResult = NonNullable>> @@ -153,8 +161,8 @@ export function useGetListItemsByListId> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetListItemsByListId>, TError = unknown>( listId: string, params?: GetListItemsByListIdParams, options?: { query?:Partial>, TError, TData>> & Pick< @@ -164,23 +172,23 @@ export function useGetListItemsByListId> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetListItemsByListId>, TError = unknown>( listId: string, params?: GetListItemsByListIdParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetListItemsByListId>, TError = unknown>( listId: string, params?: GetListItemsByListIdParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetListItemsByListIdQueryOptions(listId,params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -189,6 +197,7 @@ export function useGetListItemsByListId>, TError = unknown>(listId: string, params?: GetListItemsByListIdParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -205,7 +214,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetListItemsByListIdSuspenseQueryResult = NonNullable>> @@ -215,28 +224,28 @@ export type GetListItemsByListIdSuspenseQueryError = unknown export function useGetListItemsByListIdSuspense>, TError = unknown>( listId: string, params: undefined | GetListItemsByListIdParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListItemsByListIdSuspense>, TError = unknown>( listId: string, params?: GetListItemsByListIdParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListItemsByListIdSuspense>, TError = unknown>( listId: string, params?: GetListItemsByListIdParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListItemsByListIdSuspense>, TError = unknown>( listId: string, params?: GetListItemsByListIdParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetListItemsByListIdSuspenseQueryOptions(listId,params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -245,6 +254,7 @@ export function useGetListItemsByListIdSuspense(options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } ): UseMutationOptions>, TError,{id: string}, TContext> => { - + const mutationKey = ['deleteListItemId']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -292,7 +302,7 @@ const {mutation: mutationOptions} = options ? export const useDeleteListItemId = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {id: string}, @@ -301,7 +311,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getDeleteListItemIdMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Update list items position @@ -324,7 +334,7 @@ export const updateListItemsPositions = ( export const getUpdateListItemsPositionsMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: UpdateListItemsPositionsBody}, TContext>, } ): UseMutationOptions>, TError,{data: UpdateListItemsPositionsBody}, TContext> => { - + const mutationKey = ['updateListItemsPositions']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -352,7 +362,7 @@ const {mutation: mutationOptions} = options ? export const useUpdateListItemsPositions = (options?: { mutation?:UseMutationOptions>, TError,{data: UpdateListItemsPositionsBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: UpdateListItemsPositionsBody}, @@ -361,6 +371,6 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getUpdateListItemsPositionsMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } \ No newline at end of file diff --git a/apps/web/src/api/list.ts b/apps/web/src/api/list.ts index 99f95726..e9470eee 100644 --- a/apps/web/src/api/list.ts +++ b/apps/web/src/api/list.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 @@ -8,12 +8,13 @@ import { useMutation, useQuery, useSuspenseQuery -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { DataTag, DefinedInitialDataOptions, DefinedUseQueryResult, MutationFunction, + QueryClient, QueryFunction, QueryKey, UndefinedInitialDataOptions, @@ -23,7 +24,8 @@ import type { UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import type { DeleteListId204, DeleteListId404, @@ -41,12 +43,14 @@ import type { PutListId200, PutListId404, PutListIdBody -} from './endpoints.schemas' +} from './endpoints.schemas'; + import { axiosInstance } from '../services/axios-instance'; + /** * Create a list */ @@ -69,7 +73,7 @@ export const postList = ( export const getPostListMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PostListBody}, TContext>, } ): UseMutationOptions>, TError,{data: PostListBody}, TContext> => { - + const mutationKey = ['postList']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -97,7 +101,7 @@ const {mutation: mutationOptions} = options ? export const usePostList = (options?: { mutation?:UseMutationOptions>, TError,{data: PostListBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostListBody}, @@ -106,7 +110,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostListMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get lists @@ -125,8 +129,12 @@ export const getLists = ( } + + export const getGetListsQueryKey = (params?: GetListsParams,) => { - return [`/lists`, ...(params ? [params]: [])] as const; + return [ + `/lists`, ...(params ? [params]: []) + ] as const; } @@ -145,7 +153,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetListsQueryResult = NonNullable>> @@ -160,8 +168,8 @@ export function useGetLists>, TError Awaited> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetLists>, TError = GetLists404>( params?: GetListsParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -170,21 +178,21 @@ export function useGetLists>, TError Awaited> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetLists>, TError = GetLists404>( params?: GetListsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetLists>, TError = GetLists404>( params?: GetListsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetListsQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -193,6 +201,7 @@ export function useGetLists>, TError + export const getGetListsSuspenseQueryOptions = >, TError = GetLists404>(params?: GetListsParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -208,7 +217,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetListsSuspenseQueryResult = NonNullable>> @@ -217,25 +226,25 @@ export type GetListsSuspenseQueryError = GetLists404 export function useGetListsSuspense>, TError = GetLists404>( params: undefined | GetListsParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListsSuspense>, TError = GetLists404>( params?: GetListsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListsSuspense>, TError = GetLists404>( params?: GetListsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListsSuspense>, TError = GetLists404>( params?: GetListsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetListsSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -244,6 +253,7 @@ export function useGetListsSuspense> + /** * Delete list */ @@ -263,7 +273,7 @@ export const deleteListId = ( export const getDeleteListIdMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } ): UseMutationOptions>, TError,{id: string}, TContext> => { - + const mutationKey = ['deleteListId']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -291,7 +301,7 @@ const {mutation: mutationOptions} = options ? export const useDeleteListId = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {id: string}, @@ -300,7 +310,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getDeleteListIdMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Update list @@ -324,7 +334,7 @@ export const putListId = ( export const getPutListIdMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{id: string;data: PutListIdBody}, TContext>, } ): UseMutationOptions>, TError,{id: string;data: PutListIdBody}, TContext> => { - + const mutationKey = ['putListId']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -352,7 +362,7 @@ const {mutation: mutationOptions} = options ? export const usePutListId = (options?: { mutation?:UseMutationOptions>, TError,{id: string;data: PutListIdBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {id: string;data: PutListIdBody}, @@ -361,7 +371,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPutListIdMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get list by ID @@ -379,8 +389,12 @@ export const getListById = ( } -export const getGetListByIdQueryKey = (id: string,) => { - return [`/list/by/${id}`] as const; + + +export const getGetListByIdQueryKey = (id?: string,) => { + return [ + `/list/by/${id}` + ] as const; } @@ -399,7 +413,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetListByIdQueryResult = NonNullable>> @@ -414,8 +428,8 @@ export function useGetListById>, Awaited> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetListById>, TError = GetListById404>( id: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -424,21 +438,21 @@ export function useGetListById>, Awaited> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetListById>, TError = GetListById404>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetListById>, TError = GetListById404>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetListByIdQueryOptions(id,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -447,6 +461,7 @@ export function useGetListById>, + export const getGetListByIdSuspenseQueryOptions = >, TError = GetListById404>(id: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -462,7 +477,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetListByIdSuspenseQueryResult = NonNullable>> @@ -471,25 +486,25 @@ export type GetListByIdSuspenseQueryError = GetListById404 export function useGetListByIdSuspense>, TError = GetListById404>( id: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListByIdSuspense>, TError = GetListById404>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListByIdSuspense>, TError = GetListById404>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListByIdSuspense>, TError = GetListById404>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetListByIdSuspenseQueryOptions(id,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -498,6 +513,7 @@ export function useGetListByIdSuspense(options?: { mutation?:UseMutationOptions>, TError,{data: PatchListBannerBody}, TContext>, } ): UseMutationOptions>, TError,{data: PatchListBannerBody}, TContext> => { - + const mutationKey = ['patchListBanner']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -547,7 +563,7 @@ const {mutation: mutationOptions} = options ? export const usePatchListBanner = (options?: { mutation?:UseMutationOptions>, TError,{data: PatchListBannerBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PatchListBannerBody}, @@ -556,7 +572,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPatchListBannerMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get list progress @@ -574,8 +590,12 @@ export const getListProgress = ( } -export const getGetListProgressQueryKey = (id: string,) => { - return [`/list/${id}/progress`] as const; + + +export const getGetListProgressQueryKey = (id?: string,) => { + return [ + `/list/${id}/progress` + ] as const; } @@ -594,7 +614,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetListProgressQueryResult = NonNullable>> @@ -609,8 +629,8 @@ export function useGetListProgress> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetListProgress>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -619,21 +639,21 @@ export function useGetListProgress> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetListProgress>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetListProgress>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetListProgressQueryOptions(id,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -642,6 +662,7 @@ export function useGetListProgress>, TError = unknown>(id: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -657,7 +678,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetListProgressSuspenseQueryResult = NonNullable>> @@ -666,25 +687,25 @@ export type GetListProgressSuspenseQueryError = unknown export function useGetListProgressSuspense>, TError = unknown>( id: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListProgressSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListProgressSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetListProgressSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetListProgressSuspenseQueryOptions(id,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -693,3 +714,4 @@ export function useGetListProgressSuspense(options?: { mutation?:UseMutationOptions>, TError,{data: PostReviewReplyBody}, TContext>, } ): UseMutationOptions>, TError,{data: PostReviewReplyBody}, TContext> => { - + const mutationKey = ['postReviewReply']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -88,7 +92,7 @@ const {mutation: mutationOptions} = options ? export const usePostReviewReply = (options?: { mutation?:UseMutationOptions>, TError,{data: PostReviewReplyBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostReviewReplyBody}, @@ -97,7 +101,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostReviewReplyMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get review replies @@ -116,8 +120,12 @@ export const getReviewReplies = ( } -export const getGetReviewRepliesQueryKey = (params: GetReviewRepliesParams,) => { - return [`/review-replies`, ...(params ? [params]: [])] as const; + + +export const getGetReviewRepliesQueryKey = (params?: GetReviewRepliesParams,) => { + return [ + `/review-replies`, ...(params ? [params]: []) + ] as const; } @@ -136,7 +144,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetReviewRepliesQueryResult = NonNullable>> @@ -151,8 +159,8 @@ export function useGetReviewReplies> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetReviewReplies>, TError = unknown>( params: GetReviewRepliesParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -161,21 +169,21 @@ export function useGetReviewReplies> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetReviewReplies>, TError = unknown>( params: GetReviewRepliesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetReviewReplies>, TError = unknown>( params: GetReviewRepliesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetReviewRepliesQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -184,6 +192,7 @@ export function useGetReviewReplies>, TError = unknown>(params: GetReviewRepliesParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -199,7 +208,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetReviewRepliesSuspenseQueryResult = NonNullable>> @@ -208,25 +217,25 @@ export type GetReviewRepliesSuspenseQueryError = unknown export function useGetReviewRepliesSuspense>, TError = unknown>( params: GetReviewRepliesParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetReviewRepliesSuspense>, TError = unknown>( params: GetReviewRepliesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetReviewRepliesSuspense>, TError = unknown>( params: GetReviewRepliesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetReviewRepliesSuspense>, TError = unknown>( params: GetReviewRepliesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetReviewRepliesSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -235,6 +244,7 @@ export function useGetReviewRepliesSuspense(options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } ): UseMutationOptions>, TError,{id: string}, TContext> => { - + const mutationKey = ['deleteReviewReplyById']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -282,7 +292,7 @@ const {mutation: mutationOptions} = options ? export const useDeleteReviewReplyById = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {id: string}, @@ -291,7 +301,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getDeleteReviewReplyByIdMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Update review reply by id @@ -315,7 +325,7 @@ export const putReviewReplyById = ( export const getPutReviewReplyByIdMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{id: string;data: PutReviewReplyByIdBody}, TContext>, } ): UseMutationOptions>, TError,{id: string;data: PutReviewReplyByIdBody}, TContext> => { - + const mutationKey = ['putReviewReplyById']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -343,7 +353,7 @@ const {mutation: mutationOptions} = options ? export const usePutReviewReplyById = (options?: { mutation?:UseMutationOptions>, TError,{id: string;data: PutReviewReplyByIdBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {id: string;data: PutReviewReplyByIdBody}, @@ -352,6 +362,6 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPutReviewReplyByIdMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } \ No newline at end of file diff --git a/apps/web/src/api/reviews.ts b/apps/web/src/api/reviews.ts index 5cfb9ffb..13b5305e 100644 --- a/apps/web/src/api/reviews.ts +++ b/apps/web/src/api/reviews.ts @@ -1,29 +1,36 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 */ import { + useInfiniteQuery, useMutation, useQuery, useSuspenseQuery -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { DataTag, DefinedInitialDataOptions, + DefinedUseInfiniteQueryResult, DefinedUseQueryResult, + InfiniteData, MutationFunction, + QueryClient, QueryFunction, QueryKey, UndefinedInitialDataOptions, + UseInfiniteQueryOptions, + UseInfiniteQueryResult, UseMutationOptions, UseMutationResult, UseQueryOptions, UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import type { GetDetailedReviews200, GetDetailedReviewsParams, @@ -36,12 +43,14 @@ import type { PostReviewBody, PutReviewById200, PutReviewByIdBody -} from './endpoints.schemas' +} from './endpoints.schemas'; + import { axiosInstance } from '../services/axios-instance'; + /** * Create a review */ @@ -64,7 +73,7 @@ export const postReview = ( export const getPostReviewMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PostReviewBody}, TContext>, } ): UseMutationOptions>, TError,{data: PostReviewBody}, TContext> => { - + const mutationKey = ['postReview']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -92,7 +101,7 @@ const {mutation: mutationOptions} = options ? export const usePostReview = (options?: { mutation?:UseMutationOptions>, TError,{data: PostReviewBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostReviewBody}, @@ -101,7 +110,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostReviewMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get review @@ -120,8 +129,12 @@ export const getReview = ( } -export const getGetReviewQueryKey = (params: GetReviewParams,) => { - return [`/review`, ...(params ? [params]: [])] as const; + + +export const getGetReviewQueryKey = (params?: GetReviewParams,) => { + return [ + `/review`, ...(params ? [params]: []) + ] as const; } @@ -140,7 +153,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetReviewQueryResult = NonNullable>> @@ -155,8 +168,8 @@ export function useGetReview>, TErr Awaited> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetReview>, TError = unknown>( params: GetReviewParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -165,21 +178,21 @@ export function useGetReview>, TErr Awaited> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetReview>, TError = unknown>( params: GetReviewParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetReview>, TError = unknown>( params: GetReviewParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetReviewQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -188,6 +201,7 @@ export function useGetReview>, TErr + export const getGetReviewSuspenseQueryOptions = >, TError = unknown>(params: GetReviewParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -203,7 +217,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetReviewSuspenseQueryResult = NonNullable>> @@ -212,25 +226,25 @@ export type GetReviewSuspenseQueryError = unknown export function useGetReviewSuspense>, TError = unknown>( params: GetReviewParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetReviewSuspense>, TError = unknown>( params: GetReviewParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetReviewSuspense>, TError = unknown>( params: GetReviewParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetReviewSuspense>, TError = unknown>( params: GetReviewParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetReviewSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -239,6 +253,7 @@ export function useGetReviewSuspense { - return [`/reviews`, ...(params ? [params]: [])] as const; + return [ + `/reviews`, ...(params ? [params]: []) + ] as const; } @@ -276,7 +295,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetReviewsQueryResult = NonNullable>> @@ -291,8 +310,8 @@ export function useGetReviews>, TE Awaited> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetReviews>, TError = unknown>( params?: GetReviewsParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -301,21 +320,21 @@ export function useGetReviews>, TE Awaited> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetReviews>, TError = unknown>( params?: GetReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetReviews>, TError = unknown>( params?: GetReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetReviewsQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -324,6 +343,7 @@ export function useGetReviews>, TE + export const getGetReviewsSuspenseQueryOptions = >, TError = unknown>(params?: GetReviewsParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -339,7 +359,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetReviewsSuspenseQueryResult = NonNullable>> @@ -348,25 +368,25 @@ export type GetReviewsSuspenseQueryError = unknown export function useGetReviewsSuspense>, TError = unknown>( params: undefined | GetReviewsParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetReviewsSuspense>, TError = unknown>( params?: GetReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetReviewsSuspense>, TError = unknown>( params?: GetReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetReviewsSuspense>, TError = unknown>( params?: GetReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetReviewsSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -375,6 +395,7 @@ export function useGetReviewsSuspense(options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } ): UseMutationOptions>, TError,{id: string}, TContext> => { - + const mutationKey = ['deleteReviewById']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -422,7 +443,7 @@ const {mutation: mutationOptions} = options ? export const useDeleteReviewById = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {id: string}, @@ -431,7 +452,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getDeleteReviewByIdMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Update review by id @@ -455,7 +476,7 @@ export const putReviewById = ( export const getPutReviewByIdMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{id: string;data: PutReviewByIdBody}, TContext>, } ): UseMutationOptions>, TError,{id: string;data: PutReviewByIdBody}, TContext> => { - + const mutationKey = ['putReviewById']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -483,7 +504,7 @@ const {mutation: mutationOptions} = options ? export const usePutReviewById = (options?: { mutation?:UseMutationOptions>, TError,{id: string;data: PutReviewByIdBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {id: string;data: PutReviewByIdBody}, @@ -492,7 +513,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPutReviewByIdMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get detailed reviews @@ -511,11 +532,85 @@ export const getDetailedReviews = ( } + + +export const getGetDetailedReviewsInfiniteQueryKey = (params?: GetDetailedReviewsParams,) => { + return [ + 'infinite', `/detailed/reviews`, ...(params ? [params]: []) + ] as const; + } + export const getGetDetailedReviewsQueryKey = (params?: GetDetailedReviewsParams,) => { - return [`/detailed/reviews`, ...(params ? [params]: [])] as const; + return [ + `/detailed/reviews`, ...(params ? [params]: []) + ] as const; } +export const getGetDetailedReviewsInfiniteQueryOptions = >>, TError = unknown>(params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetDetailedReviewsInfiniteQueryKey(params); + + + + const queryFn: QueryFunction>> = ({ signal }) => getDetailedReviews(params, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseInfiniteQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetDetailedReviewsInfiniteQueryResult = NonNullable>> +export type GetDetailedReviewsInfiniteQueryError = unknown + + +export function useGetDetailedReviewsInfinite>>, TError = unknown>( + params: undefined | GetDetailedReviewsParams, options: { query:Partial>, TError, TData>> & Pick< + DefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): DefinedUseInfiniteQueryResult & { queryKey: DataTag } +export function useGetDetailedReviewsInfinite>>, TError = unknown>( + params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>> & Pick< + UndefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } +export function useGetDetailedReviewsInfinite>>, TError = unknown>( + params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } + +export function useGetDetailedReviewsInfinite>>, TError = unknown>( + params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetDetailedReviewsInfiniteQueryOptions(params,options) + + const query = useInfiniteQuery(queryOptions, queryClient) as UseInfiniteQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + export const getGetDetailedReviewsQueryOptions = >, TError = unknown>(params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -531,7 +626,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetDetailedReviewsQueryResult = NonNullable>> @@ -546,8 +641,8 @@ export function useGetDetailedReviews> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetDetailedReviews>, TError = unknown>( params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -556,21 +651,21 @@ export function useGetDetailedReviews> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetDetailedReviews>, TError = unknown>( params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetDetailedReviews>, TError = unknown>( params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetDetailedReviewsQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -579,6 +674,7 @@ export function useGetDetailedReviews>, TError = unknown>(params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -594,7 +690,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetDetailedReviewsSuspenseQueryResult = NonNullable>> @@ -603,25 +699,25 @@ export type GetDetailedReviewsSuspenseQueryError = unknown export function useGetDetailedReviewsSuspense>, TError = unknown>( params: undefined | GetDetailedReviewsParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetDetailedReviewsSuspense>, TError = unknown>( params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetDetailedReviewsSuspense>, TError = unknown>( params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetDetailedReviewsSuspense>, TError = unknown>( params?: GetDetailedReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetDetailedReviewsSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -630,3 +726,4 @@ export function useGetDetailedReviewsSuspense { - return axiosInstance( + return axiosInstance( {url: `/social-links`, method: 'PUT', headers: {'Content-Type': 'application/json', }, data: putSocialLinksBody @@ -55,7 +59,7 @@ export const putSocialLinks = ( export const getPutSocialLinksMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PutSocialLinksBody}, TContext>, } ): UseMutationOptions>, TError,{data: PutSocialLinksBody}, TContext> => { - + const mutationKey = ['putSocialLinks']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -83,7 +87,7 @@ const {mutation: mutationOptions} = options ? export const usePutSocialLinks = (options?: { mutation?:UseMutationOptions>, TError,{data: PutSocialLinksBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PutSocialLinksBody}, @@ -92,7 +96,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPutSocialLinksMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get social links by userId @@ -111,8 +115,12 @@ export const getSocialLinks = ( } -export const getGetSocialLinksQueryKey = (params: GetSocialLinksParams,) => { - return [`/social-links`, ...(params ? [params]: [])] as const; + + +export const getGetSocialLinksQueryKey = (params?: GetSocialLinksParams,) => { + return [ + `/social-links`, ...(params ? [params]: []) + ] as const; } @@ -131,7 +139,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetSocialLinksQueryResult = NonNullable>> @@ -146,8 +154,8 @@ export function useGetSocialLinks> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetSocialLinks>, TError = unknown>( params: GetSocialLinksParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -156,21 +164,21 @@ export function useGetSocialLinks> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetSocialLinks>, TError = unknown>( params: GetSocialLinksParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetSocialLinks>, TError = unknown>( params: GetSocialLinksParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetSocialLinksQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -179,6 +187,7 @@ export function useGetSocialLinks>, TError = unknown>(params: GetSocialLinksParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -194,7 +203,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetSocialLinksSuspenseQueryResult = NonNullable>> @@ -203,25 +212,25 @@ export type GetSocialLinksSuspenseQueryError = unknown export function useGetSocialLinksSuspense>, TError = unknown>( params: GetSocialLinksParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetSocialLinksSuspense>, TError = unknown>( params: GetSocialLinksParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetSocialLinksSuspense>, TError = unknown>( params: GetSocialLinksParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetSocialLinksSuspense>, TError = unknown>( params: GetSocialLinksParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetSocialLinksSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -230,3 +239,4 @@ export function useGetSocialLinksSuspense { + + + return axiosInstance( + {url: `/user/subscription`, method: 'DELETE', + headers: {'Content-Type': 'application/json', }, + data: deleteUserSubscriptionBody + }, + ); + } + + + +export const getDeleteUserSubscriptionMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: DeleteUserSubscriptionBody}, TContext>, } +): UseMutationOptions>, TError,{data: DeleteUserSubscriptionBody}, TContext> => { + +const mutationKey = ['deleteUserSubscription']; +const {mutation: mutationOptions} = options ? + options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? + options + : {...options, mutation: {...options.mutation, mutationKey}} + : {mutation: { mutationKey, }}; + + + + + const mutationFn: MutationFunction>, {data: DeleteUserSubscriptionBody}> = (props) => { + const {data} = props ?? {}; + + return deleteUserSubscription(data,) + } + + + + + return { mutationFn, ...mutationOptions }} + + export type DeleteUserSubscriptionMutationResult = NonNullable>> + export type DeleteUserSubscriptionMutationBody = DeleteUserSubscriptionBody + export type DeleteUserSubscriptionMutationError = unknown + + export const useDeleteUserSubscription = (options?: { mutation?:UseMutationOptions>, TError,{data: DeleteUserSubscriptionBody}, TContext>, } + , queryClient?: QueryClient): UseMutationResult< + Awaited>, + TError, + {data: DeleteUserSubscriptionBody}, + TContext + > => { + + const mutationOptions = getDeleteUserSubscriptionMutationOptions(options); + + return useMutation(mutationOptions, queryClient); + } + \ No newline at end of file diff --git a/apps/web/src/api/user-activities.ts b/apps/web/src/api/user-activities.ts index e0d8e1fb..56705096 100644 --- a/apps/web/src/api/user-activities.ts +++ b/apps/web/src/api/user-activities.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 @@ -9,7 +9,7 @@ import { useMutation, useQuery, useSuspenseQuery -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { DataTag, DefinedInitialDataOptions, @@ -17,6 +17,7 @@ import type { DefinedUseQueryResult, InfiniteData, MutationFunction, + QueryClient, QueryFunction, QueryKey, UndefinedInitialDataOptions, @@ -28,18 +29,21 @@ import type { UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import type { GetNetworkActivities200, GetNetworkActivitiesParams, GetUserActivities200, GetUserActivitiesParams -} from './endpoints.schemas' +} from './endpoints.schemas'; + import { axiosInstance } from '../services/axios-instance'; + /** * Get user activities */ @@ -58,9 +62,20 @@ export const getUserActivities = ( } -export const getGetUserActivitiesQueryKey = (userId: string, + + +export const getGetUserActivitiesInfiniteQueryKey = (userId?: string, + params?: GetUserActivitiesParams,) => { + return [ + 'infinite', `/user/${userId}/activities`, ...(params ? [params]: []) + ] as const; + } + +export const getGetUserActivitiesQueryKey = (userId?: string, params?: GetUserActivitiesParams,) => { - return [`/user/${userId}/activities`, ...(params ? [params]: [])] as const; + return [ + `/user/${userId}/activities`, ...(params ? [params]: []) + ] as const; } @@ -70,7 +85,7 @@ export const getGetUserActivitiesInfiniteQueryOptions = >, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(userId), ...queryOptions} as UseInfiniteQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserActivitiesInfiniteQueryResult = NonNullable>> @@ -96,8 +111,8 @@ export function useGetUserActivitiesInfinite> > , 'initialData' >, } - - ): DefinedUseInfiniteQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseInfiniteQueryResult & { queryKey: DataTag } export function useGetUserActivitiesInfinite>>, TError = unknown>( userId: string, params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>> & Pick< @@ -107,23 +122,149 @@ export function useGetUserActivitiesInfinite> > , 'initialData' >, } - - ): UseInfiniteQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } export function useGetUserActivitiesInfinite>>, TError = unknown>( userId: string, params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseInfiniteQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } export function useGetUserActivitiesInfinite>>, TError = unknown>( userId: string, params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseInfiniteQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserActivitiesInfiniteQueryOptions(userId,params,options) - const query = useInfiniteQuery(queryOptions) as UseInfiniteQueryResult & { queryKey: DataTag }; + const query = useInfiniteQuery(queryOptions, queryClient) as UseInfiniteQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + +export const getGetUserActivitiesQueryOptions = >, TError = unknown>(userId: string, + params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetUserActivitiesQueryKey(userId,params); + + + + const queryFn: QueryFunction>> = ({ signal }) => getUserActivities(userId,params, signal); + + + + + + return { queryKey, queryFn, enabled: !!(userId), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetUserActivitiesQueryResult = NonNullable>> +export type GetUserActivitiesQueryError = unknown + + +export function useGetUserActivities>, TError = unknown>( + userId: string, + params: undefined | GetUserActivitiesParams, options: { query:Partial>, TError, TData>> & Pick< + DefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } +export function useGetUserActivities>, TError = unknown>( + userId: string, + params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>> & Pick< + UndefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } +export function useGetUserActivities>, TError = unknown>( + userId: string, + params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } + +export function useGetUserActivities>, TError = unknown>( + userId: string, + params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetUserActivitiesQueryOptions(userId,params,options) + + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + +export const getGetUserActivitiesSuspenseQueryOptions = >, TError = unknown>(userId: string, + params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetUserActivitiesQueryKey(userId,params); + + + + const queryFn: QueryFunction>> = ({ signal }) => getUserActivities(userId,params, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetUserActivitiesSuspenseQueryResult = NonNullable>> +export type GetUserActivitiesSuspenseQueryError = unknown + + +export function useGetUserActivitiesSuspense>, TError = unknown>( + userId: string, + params: undefined | GetUserActivitiesParams, options: { query:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetUserActivitiesSuspense>, TError = unknown>( + userId: string, + params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetUserActivitiesSuspense>, TError = unknown>( + userId: string, + params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } + +export function useGetUserActivitiesSuspense>, TError = unknown>( + userId: string, + params?: GetUserActivitiesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetUserActivitiesSuspenseQueryOptions(userId,params,options) + + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -132,6 +273,7 @@ export function useGetUserActivitiesInfinite(options?: { mutation?:UseMutationOptions>, TError,{activityId: string}, TContext>, } ): UseMutationOptions>, TError,{activityId: string}, TContext> => { - + const mutationKey = ['deleteUserActivity']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -179,7 +321,7 @@ const {mutation: mutationOptions} = options ? export const useDeleteUserActivity = (options?: { mutation?:UseMutationOptions>, TError,{activityId: string}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {activityId: string}, @@ -188,7 +330,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getDeleteUserActivityMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get network activities @@ -207,8 +349,12 @@ export const getNetworkActivities = ( } -export const getGetNetworkActivitiesQueryKey = (params: GetNetworkActivitiesParams,) => { - return [`/network/activities`, ...(params ? [params]: [])] as const; + + +export const getGetNetworkActivitiesQueryKey = (params?: GetNetworkActivitiesParams,) => { + return [ + `/network/activities`, ...(params ? [params]: []) + ] as const; } @@ -227,7 +373,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetNetworkActivitiesQueryResult = NonNullable>> @@ -242,8 +388,8 @@ export function useGetNetworkActivities> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetNetworkActivities>, TError = unknown>( params: GetNetworkActivitiesParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -252,21 +398,21 @@ export function useGetNetworkActivities> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetNetworkActivities>, TError = unknown>( params: GetNetworkActivitiesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetNetworkActivities>, TError = unknown>( params: GetNetworkActivitiesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetNetworkActivitiesQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -275,6 +421,7 @@ export function useGetNetworkActivities>, TError = unknown>(params: GetNetworkActivitiesParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -290,7 +437,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetNetworkActivitiesSuspenseQueryResult = NonNullable>> @@ -299,25 +446,25 @@ export type GetNetworkActivitiesSuspenseQueryError = unknown export function useGetNetworkActivitiesSuspense>, TError = unknown>( params: GetNetworkActivitiesParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetNetworkActivitiesSuspense>, TError = unknown>( params: GetNetworkActivitiesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetNetworkActivitiesSuspense>, TError = unknown>( params: GetNetworkActivitiesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetNetworkActivitiesSuspense>, TError = unknown>( params: GetNetworkActivitiesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetNetworkActivitiesSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -326,3 +473,4 @@ export function useGetNetworkActivitiesSuspense(options?: { mutation?:UseMutationOptions>, TError,{data: PostUserEpisodesBodyItem[]}, TContext>, } ): UseMutationOptions>, TError,{data: PostUserEpisodesBodyItem[]}, TContext> => { - + const mutationKey = ['postUserEpisodes']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -88,7 +92,7 @@ const {mutation: mutationOptions} = options ? export const usePostUserEpisodes = (options?: { mutation?:UseMutationOptions>, TError,{data: PostUserEpisodesBodyItem[]}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostUserEpisodesBodyItem[]}, @@ -97,7 +101,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostUserEpisodesMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get user episode @@ -116,8 +120,12 @@ export const getUserEpisodes = ( } -export const getGetUserEpisodesQueryKey = (params: GetUserEpisodesParams,) => { - return [`/user/episodes`, ...(params ? [params]: [])] as const; + + +export const getGetUserEpisodesQueryKey = (params?: GetUserEpisodesParams,) => { + return [ + `/user/episodes`, ...(params ? [params]: []) + ] as const; } @@ -136,7 +144,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserEpisodesQueryResult = NonNullable>> @@ -151,8 +159,8 @@ export function useGetUserEpisodes> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserEpisodes>, TError = unknown>( params: GetUserEpisodesParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -161,21 +169,21 @@ export function useGetUserEpisodes> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserEpisodes>, TError = unknown>( params: GetUserEpisodesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserEpisodes>, TError = unknown>( params: GetUserEpisodesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserEpisodesQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -184,6 +192,7 @@ export function useGetUserEpisodes>, TError = unknown>(params: GetUserEpisodesParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -199,7 +208,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserEpisodesSuspenseQueryResult = NonNullable>> @@ -208,25 +217,25 @@ export type GetUserEpisodesSuspenseQueryError = unknown export function useGetUserEpisodesSuspense>, TError = unknown>( params: GetUserEpisodesParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserEpisodesSuspense>, TError = unknown>( params: GetUserEpisodesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserEpisodesSuspense>, TError = unknown>( params: GetUserEpisodesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserEpisodesSuspense>, TError = unknown>( params: GetUserEpisodesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserEpisodesSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -235,6 +244,7 @@ export function useGetUserEpisodesSuspense(options?: { mutation?:UseMutationOptions>, TError,{data: DeleteUserEpisodesBody}, TContext>, } ): UseMutationOptions>, TError,{data: DeleteUserEpisodesBody}, TContext> => { - + const mutationKey = ['deleteUserEpisodes']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -284,7 +294,7 @@ const {mutation: mutationOptions} = options ? export const useDeleteUserEpisodes = (options?: { mutation?:UseMutationOptions>, TError,{data: DeleteUserEpisodesBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: DeleteUserEpisodesBody}, @@ -293,6 +303,6 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getDeleteUserEpisodesMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } \ No newline at end of file diff --git a/apps/web/src/api/user-items.ts b/apps/web/src/api/user-items.ts index d638233b..5dd13d9d 100644 --- a/apps/web/src/api/user-items.ts +++ b/apps/web/src/api/user-items.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 @@ -9,7 +9,7 @@ import { useMutation, useQuery, useSuspenseQuery -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { DataTag, DefinedInitialDataOptions, @@ -17,6 +17,7 @@ import type { DefinedUseQueryResult, InfiniteData, MutationFunction, + QueryClient, QueryFunction, QueryKey, UndefinedInitialDataOptions, @@ -28,7 +29,8 @@ import type { UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import type { GetAllUserItems200, GetAllUserItemsParams, @@ -36,14 +38,18 @@ import type { GetUserItemParams, GetUserItems200, GetUserItemsBody, + GetUserItemsCount200, + GetUserItemsCountParams, PutUserItem201, PutUserItemBody -} from './endpoints.schemas' +} from './endpoints.schemas'; + import { axiosInstance } from '../services/axios-instance'; + /** * Upsert user item */ @@ -65,7 +71,7 @@ export const putUserItem = ( export const getPutUserItemMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PutUserItemBody}, TContext>, } ): UseMutationOptions>, TError,{data: PutUserItemBody}, TContext> => { - + const mutationKey = ['putUserItem']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -93,7 +99,7 @@ const {mutation: mutationOptions} = options ? export const usePutUserItem = (options?: { mutation?:UseMutationOptions>, TError,{data: PutUserItemBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PutUserItemBody}, @@ -102,7 +108,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPutUserItemMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get user item @@ -121,8 +127,12 @@ export const getUserItem = ( } -export const getGetUserItemQueryKey = (params: GetUserItemParams,) => { - return [`/user/item`, ...(params ? [params]: [])] as const; + + +export const getGetUserItemQueryKey = (params?: GetUserItemParams,) => { + return [ + `/user/item`, ...(params ? [params]: []) + ] as const; } @@ -141,7 +151,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserItemQueryResult = NonNullable>> @@ -156,8 +166,8 @@ export function useGetUserItem>, Awaited> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserItem>, TError = unknown>( params: GetUserItemParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -166,21 +176,21 @@ export function useGetUserItem>, Awaited> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserItem>, TError = unknown>( params: GetUserItemParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserItem>, TError = unknown>( params: GetUserItemParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserItemQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -189,6 +199,7 @@ export function useGetUserItem>, + export const getGetUserItemSuspenseQueryOptions = >, TError = unknown>(params: GetUserItemParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -204,7 +215,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserItemSuspenseQueryResult = NonNullable>> @@ -213,25 +224,25 @@ export type GetUserItemSuspenseQueryError = unknown export function useGetUserItemSuspense>, TError = unknown>( params: GetUserItemParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserItemSuspense>, TError = unknown>( params: GetUserItemParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserItemSuspense>, TError = unknown>( params: GetUserItemParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserItemSuspense>, TError = unknown>( params: GetUserItemParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserItemSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -240,6 +251,7 @@ export function useGetUserItemSuspense { - return [`/user/items`, getUserItemsBody] as const; + + +export const getGetUserItemsInfiniteQueryKey = (getUserItemsBody?: GetUserItemsBody,) => { + return [ + 'infinite', `/user/items`, getUserItemsBody + ] as const; + } + +export const getGetUserItemsQueryKey = (getUserItemsBody?: GetUserItemsBody,) => { + return [ + `/user/items`, getUserItemsBody + ] as const; } @@ -268,7 +290,7 @@ export const getGetUserItemsInfiniteQueryOptions = >, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseInfiniteQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserItemsInfiniteQueryResult = NonNullable>> @@ -293,8 +315,8 @@ export function useGetUserItemsInfinite> > , 'initialData' >, } - - ): DefinedUseInfiniteQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseInfiniteQueryResult & { queryKey: DataTag } export function useGetUserItemsInfinite>>, TError = unknown>( getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -303,21 +325,137 @@ export function useGetUserItemsInfinite> > , 'initialData' >, } - - ): UseInfiniteQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } export function useGetUserItemsInfinite>>, TError = unknown>( getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>>, } - - ): UseInfiniteQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } export function useGetUserItemsInfinite>>, TError = unknown>( getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>>, } - - ): UseInfiniteQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseInfiniteQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserItemsInfiniteQueryOptions(getUserItemsBody,options) - const query = useInfiniteQuery(queryOptions) as UseInfiniteQueryResult & { queryKey: DataTag }; + const query = useInfiniteQuery(queryOptions, queryClient) as UseInfiniteQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + +export const getGetUserItemsQueryOptions = >, TError = unknown>(getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetUserItemsQueryKey(getUserItemsBody); + + + + const queryFn: QueryFunction>> = ({ signal }) => getUserItems(getUserItemsBody, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetUserItemsQueryResult = NonNullable>> +export type GetUserItemsQueryError = unknown + + +export function useGetUserItems>, TError = unknown>( + getUserItemsBody: GetUserItemsBody, options: { query:Partial>, TError, TData>> & Pick< + DefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } +export function useGetUserItems>, TError = unknown>( + getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>> & Pick< + UndefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } +export function useGetUserItems>, TError = unknown>( + getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } + +export function useGetUserItems>, TError = unknown>( + getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetUserItemsQueryOptions(getUserItemsBody,options) + + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + +export const getGetUserItemsSuspenseQueryOptions = >, TError = unknown>(getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetUserItemsQueryKey(getUserItemsBody); + + + + const queryFn: QueryFunction>> = ({ signal }) => getUserItems(getUserItemsBody, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetUserItemsSuspenseQueryResult = NonNullable>> +export type GetUserItemsSuspenseQueryError = unknown + + +export function useGetUserItemsSuspense>, TError = unknown>( + getUserItemsBody: GetUserItemsBody, options: { query:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetUserItemsSuspense>, TError = unknown>( + getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetUserItemsSuspense>, TError = unknown>( + getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } + +export function useGetUserItemsSuspense>, TError = unknown>( + getUserItemsBody: GetUserItemsBody, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetUserItemsSuspenseQueryOptions(getUserItemsBody,options) + + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -326,6 +464,7 @@ export function useGetUserItemsInfinite(options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } ): UseMutationOptions>, TError,{id: string}, TContext> => { - + const mutationKey = ['deleteUserItemId']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -373,7 +512,7 @@ const {mutation: mutationOptions} = options ? export const useDeleteUserItemId = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {id: string}, @@ -382,7 +521,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getDeleteUserItemIdMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get user items @@ -401,8 +540,12 @@ export const getAllUserItems = ( } -export const getGetAllUserItemsQueryKey = (params: GetAllUserItemsParams,) => { - return [`/user/items/all`, ...(params ? [params]: [])] as const; + + +export const getGetAllUserItemsQueryKey = (params?: GetAllUserItemsParams,) => { + return [ + `/user/items/all`, ...(params ? [params]: []) + ] as const; } @@ -421,7 +564,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetAllUserItemsQueryResult = NonNullable>> @@ -436,8 +579,8 @@ export function useGetAllUserItems> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetAllUserItems>, TError = unknown>( params: GetAllUserItemsParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -446,21 +589,21 @@ export function useGetAllUserItems> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetAllUserItems>, TError = unknown>( params: GetAllUserItemsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetAllUserItems>, TError = unknown>( params: GetAllUserItemsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetAllUserItemsQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -469,6 +612,7 @@ export function useGetAllUserItems>, TError = unknown>(params: GetAllUserItemsParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -484,7 +628,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetAllUserItemsSuspenseQueryResult = NonNullable>> @@ -493,25 +637,25 @@ export type GetAllUserItemsSuspenseQueryError = unknown export function useGetAllUserItemsSuspense>, TError = unknown>( params: GetAllUserItemsParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetAllUserItemsSuspense>, TError = unknown>( params: GetAllUserItemsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetAllUserItemsSuspense>, TError = unknown>( params: GetAllUserItemsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetAllUserItemsSuspense>, TError = unknown>( params: GetAllUserItemsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetAllUserItemsSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -520,3 +664,146 @@ export function useGetAllUserItemsSuspense { + + + return axiosInstance( + {url: `/user/items/count`, method: 'GET', + params, signal + }, + ); + } + + + + +export const getGetUserItemsCountQueryKey = (params?: GetUserItemsCountParams,) => { + return [ + `/user/items/count`, ...(params ? [params]: []) + ] as const; + } + + +export const getGetUserItemsCountQueryOptions = >, TError = unknown>(params: GetUserItemsCountParams, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetUserItemsCountQueryKey(params); + + + + const queryFn: QueryFunction>> = ({ signal }) => getUserItemsCount(params, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetUserItemsCountQueryResult = NonNullable>> +export type GetUserItemsCountQueryError = unknown + + +export function useGetUserItemsCount>, TError = unknown>( + params: GetUserItemsCountParams, options: { query:Partial>, TError, TData>> & Pick< + DefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } +export function useGetUserItemsCount>, TError = unknown>( + params: GetUserItemsCountParams, options?: { query?:Partial>, TError, TData>> & Pick< + UndefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } +export function useGetUserItemsCount>, TError = unknown>( + params: GetUserItemsCountParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } + +export function useGetUserItemsCount>, TError = unknown>( + params: GetUserItemsCountParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetUserItemsCountQueryOptions(params,options) + + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + +export const getGetUserItemsCountSuspenseQueryOptions = >, TError = unknown>(params: GetUserItemsCountParams, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetUserItemsCountQueryKey(params); + + + + const queryFn: QueryFunction>> = ({ signal }) => getUserItemsCount(params, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetUserItemsCountSuspenseQueryResult = NonNullable>> +export type GetUserItemsCountSuspenseQueryError = unknown + + +export function useGetUserItemsCountSuspense>, TError = unknown>( + params: GetUserItemsCountParams, options: { query:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetUserItemsCountSuspense>, TError = unknown>( + params: GetUserItemsCountParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetUserItemsCountSuspense>, TError = unknown>( + params: GetUserItemsCountParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } + +export function useGetUserItemsCountSuspense>, TError = unknown>( + params: GetUserItemsCountParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetUserItemsCountSuspenseQueryOptions(params,options) + + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + diff --git a/apps/web/src/api/user-stats.ts b/apps/web/src/api/user-stats.ts index 76618d29..cdefb6cf 100644 --- a/apps/web/src/api/user-stats.ts +++ b/apps/web/src/api/user-stats.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 @@ -7,11 +7,12 @@ import { useQuery, useSuspenseQuery -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { DataTag, DefinedInitialDataOptions, DefinedUseQueryResult, + QueryClient, QueryFunction, QueryKey, UndefinedInitialDataOptions, @@ -19,7 +20,8 @@ import type { UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import type { GetUserIdBestReviews200, GetUserIdBestReviewsParams, @@ -35,12 +37,14 @@ import type { GetUserIdWatchedCountriesParams, GetUserIdWatchedGenres200, GetUserIdWatchedGenresParams -} from './endpoints.schemas' +} from './endpoints.schemas'; + import { axiosInstance } from '../services/axios-instance'; + /** * Get user stats */ @@ -57,8 +61,12 @@ export const getUserIdStats = ( } -export const getGetUserIdStatsQueryKey = (id: string,) => { - return [`/user/${id}/stats`] as const; + + +export const getGetUserIdStatsQueryKey = (id?: string,) => { + return [ + `/user/${id}/stats` + ] as const; } @@ -77,7 +85,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdStatsQueryResult = NonNullable>> @@ -92,8 +100,8 @@ export function useGetUserIdStats> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserIdStats>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -102,21 +110,21 @@ export function useGetUserIdStats> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdStats>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdStats>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdStatsQueryOptions(id,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -125,6 +133,7 @@ export function useGetUserIdStats>, TError = unknown>(id: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -140,7 +149,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdStatsSuspenseQueryResult = NonNullable>> @@ -149,25 +158,25 @@ export type GetUserIdStatsSuspenseQueryError = unknown export function useGetUserIdStatsSuspense>, TError = unknown>( id: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdStatsSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdStatsSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdStatsSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdStatsSuspenseQueryOptions(id,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -176,6 +185,7 @@ export function useGetUserIdStatsSuspense { - return [`/user/${id}/total-hours`] as const; + + +export const getGetUserIdTotalHoursQueryKey = (id?: string,) => { + return [ + `/user/${id}/total-hours` + ] as const; } @@ -212,7 +226,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdTotalHoursQueryResult = NonNullable>> @@ -227,8 +241,8 @@ export function useGetUserIdTotalHours> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserIdTotalHours>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -237,21 +251,21 @@ export function useGetUserIdTotalHours> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdTotalHours>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdTotalHours>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdTotalHoursQueryOptions(id,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -260,6 +274,7 @@ export function useGetUserIdTotalHours>, TError = unknown>(id: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -275,7 +290,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdTotalHoursSuspenseQueryResult = NonNullable>> @@ -284,25 +299,25 @@ export type GetUserIdTotalHoursSuspenseQueryError = unknown export function useGetUserIdTotalHoursSuspense>, TError = unknown>( id: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdTotalHoursSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdTotalHoursSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdTotalHoursSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdTotalHoursSuspenseQueryOptions(id,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -311,6 +326,7 @@ export function useGetUserIdTotalHoursSuspense { - return [`/user/${id}/reviews-count`] as const; + + +export const getGetUserIdReviewsCountQueryKey = (id?: string,) => { + return [ + `/user/${id}/reviews-count` + ] as const; } @@ -347,7 +367,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdReviewsCountQueryResult = NonNullable>> @@ -362,8 +382,8 @@ export function useGetUserIdReviewsCount> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserIdReviewsCount>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -372,21 +392,21 @@ export function useGetUserIdReviewsCount> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdReviewsCount>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdReviewsCount>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdReviewsCountQueryOptions(id,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -395,6 +415,7 @@ export function useGetUserIdReviewsCount>, TError = unknown>(id: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -410,7 +431,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdReviewsCountSuspenseQueryResult = NonNullable>> @@ -419,25 +440,25 @@ export type GetUserIdReviewsCountSuspenseQueryError = unknown export function useGetUserIdReviewsCountSuspense>, TError = unknown>( id: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdReviewsCountSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdReviewsCountSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdReviewsCountSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdReviewsCountSuspenseQueryOptions(id,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -446,6 +467,7 @@ export function useGetUserIdReviewsCountSuspense { - return [`/user/${id}/most-watched-series`, ...(params ? [params]: [])] as const; + return [ + `/user/${id}/most-watched-series`, ...(params ? [params]: []) + ] as const; } @@ -486,7 +512,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdMostWatchedSeriesQueryResult = NonNullable>> @@ -502,8 +528,8 @@ export function useGetUserIdMostWatchedSeries> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserIdMostWatchedSeries>, TError = unknown>( id: string, params?: GetUserIdMostWatchedSeriesParams, options?: { query?:Partial>, TError, TData>> & Pick< @@ -513,23 +539,23 @@ export function useGetUserIdMostWatchedSeries> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdMostWatchedSeries>, TError = unknown>( id: string, params?: GetUserIdMostWatchedSeriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdMostWatchedSeries>, TError = unknown>( id: string, params?: GetUserIdMostWatchedSeriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdMostWatchedSeriesQueryOptions(id,params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -538,6 +564,7 @@ export function useGetUserIdMostWatchedSeries>, TError = unknown>(id: string, params?: GetUserIdMostWatchedSeriesParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -554,7 +581,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdMostWatchedSeriesSuspenseQueryResult = NonNullable>> @@ -564,28 +591,28 @@ export type GetUserIdMostWatchedSeriesSuspenseQueryError = unknown export function useGetUserIdMostWatchedSeriesSuspense>, TError = unknown>( id: string, params: undefined | GetUserIdMostWatchedSeriesParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdMostWatchedSeriesSuspense>, TError = unknown>( id: string, params?: GetUserIdMostWatchedSeriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdMostWatchedSeriesSuspense>, TError = unknown>( id: string, params?: GetUserIdMostWatchedSeriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdMostWatchedSeriesSuspense>, TError = unknown>( id: string, params?: GetUserIdMostWatchedSeriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdMostWatchedSeriesSuspenseQueryOptions(id,params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -594,6 +621,7 @@ export function useGetUserIdMostWatchedSeriesSuspense { - return [`/user/${id}/watched-genres`, ...(params ? [params]: [])] as const; + return [ + `/user/${id}/watched-genres`, ...(params ? [params]: []) + ] as const; } @@ -634,7 +666,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdWatchedGenresQueryResult = NonNullable>> @@ -650,8 +682,8 @@ export function useGetUserIdWatchedGenres> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedGenres>, TError = unknown>( id: string, params?: GetUserIdWatchedGenresParams, options?: { query?:Partial>, TError, TData>> & Pick< @@ -661,23 +693,23 @@ export function useGetUserIdWatchedGenres> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedGenres>, TError = unknown>( id: string, params?: GetUserIdWatchedGenresParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedGenres>, TError = unknown>( id: string, params?: GetUserIdWatchedGenresParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdWatchedGenresQueryOptions(id,params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -686,6 +718,7 @@ export function useGetUserIdWatchedGenres>, TError = unknown>(id: string, params?: GetUserIdWatchedGenresParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -702,7 +735,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdWatchedGenresSuspenseQueryResult = NonNullable>> @@ -712,28 +745,28 @@ export type GetUserIdWatchedGenresSuspenseQueryError = unknown export function useGetUserIdWatchedGenresSuspense>, TError = unknown>( id: string, params: undefined | GetUserIdWatchedGenresParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedGenresSuspense>, TError = unknown>( id: string, params?: GetUserIdWatchedGenresParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedGenresSuspense>, TError = unknown>( id: string, params?: GetUserIdWatchedGenresParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedGenresSuspense>, TError = unknown>( id: string, params?: GetUserIdWatchedGenresParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdWatchedGenresSuspenseQueryOptions(id,params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -742,6 +775,7 @@ export function useGetUserIdWatchedGenresSuspense { - return [`/user/${id}/watched-cast`, ...(params ? [params]: [])] as const; + return [ + `/user/${id}/watched-cast`, ...(params ? [params]: []) + ] as const; } @@ -782,7 +820,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdWatchedCastQueryResult = NonNullable>> @@ -798,8 +836,8 @@ export function useGetUserIdWatchedCast> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCast>, TError = unknown>( id: string, params?: GetUserIdWatchedCastParams, options?: { query?:Partial>, TError, TData>> & Pick< @@ -809,23 +847,23 @@ export function useGetUserIdWatchedCast> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCast>, TError = unknown>( id: string, params?: GetUserIdWatchedCastParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCast>, TError = unknown>( id: string, params?: GetUserIdWatchedCastParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdWatchedCastQueryOptions(id,params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -834,6 +872,7 @@ export function useGetUserIdWatchedCast>, TError = unknown>(id: string, params?: GetUserIdWatchedCastParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -850,7 +889,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdWatchedCastSuspenseQueryResult = NonNullable>> @@ -860,28 +899,28 @@ export type GetUserIdWatchedCastSuspenseQueryError = unknown export function useGetUserIdWatchedCastSuspense>, TError = unknown>( id: string, params: undefined | GetUserIdWatchedCastParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCastSuspense>, TError = unknown>( id: string, params?: GetUserIdWatchedCastParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCastSuspense>, TError = unknown>( id: string, params?: GetUserIdWatchedCastParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCastSuspense>, TError = unknown>( id: string, params?: GetUserIdWatchedCastParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdWatchedCastSuspenseQueryOptions(id,params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -890,6 +929,7 @@ export function useGetUserIdWatchedCastSuspense { - return [`/user/${id}/watched-countries`, ...(params ? [params]: [])] as const; + return [ + `/user/${id}/watched-countries`, ...(params ? [params]: []) + ] as const; } @@ -930,7 +974,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdWatchedCountriesQueryResult = NonNullable>> @@ -946,8 +990,8 @@ export function useGetUserIdWatchedCountries> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCountries>, TError = unknown>( id: string, params?: GetUserIdWatchedCountriesParams, options?: { query?:Partial>, TError, TData>> & Pick< @@ -957,23 +1001,23 @@ export function useGetUserIdWatchedCountries> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCountries>, TError = unknown>( id: string, params?: GetUserIdWatchedCountriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCountries>, TError = unknown>( id: string, params?: GetUserIdWatchedCountriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdWatchedCountriesQueryOptions(id,params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -982,6 +1026,7 @@ export function useGetUserIdWatchedCountries>, TError = unknown>(id: string, params?: GetUserIdWatchedCountriesParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -998,7 +1043,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdWatchedCountriesSuspenseQueryResult = NonNullable>> @@ -1008,28 +1053,28 @@ export type GetUserIdWatchedCountriesSuspenseQueryError = unknown export function useGetUserIdWatchedCountriesSuspense>, TError = unknown>( id: string, params: undefined | GetUserIdWatchedCountriesParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCountriesSuspense>, TError = unknown>( id: string, params?: GetUserIdWatchedCountriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCountriesSuspense>, TError = unknown>( id: string, params?: GetUserIdWatchedCountriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdWatchedCountriesSuspense>, TError = unknown>( id: string, params?: GetUserIdWatchedCountriesParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdWatchedCountriesSuspenseQueryOptions(id,params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -1038,6 +1083,7 @@ export function useGetUserIdWatchedCountriesSuspense { - return [`/user/${id}/best-reviews`, ...(params ? [params]: [])] as const; + return [ + `/user/${id}/best-reviews`, ...(params ? [params]: []) + ] as const; } @@ -1078,7 +1128,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdBestReviewsQueryResult = NonNullable>> @@ -1094,8 +1144,8 @@ export function useGetUserIdBestReviews> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserIdBestReviews>, TError = unknown>( id: string, params?: GetUserIdBestReviewsParams, options?: { query?:Partial>, TError, TData>> & Pick< @@ -1105,23 +1155,23 @@ export function useGetUserIdBestReviews> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdBestReviews>, TError = unknown>( id: string, params?: GetUserIdBestReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdBestReviews>, TError = unknown>( id: string, params?: GetUserIdBestReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdBestReviewsQueryOptions(id,params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -1130,6 +1180,7 @@ export function useGetUserIdBestReviews>, TError = unknown>(id: string, params?: GetUserIdBestReviewsParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -1146,7 +1197,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdBestReviewsSuspenseQueryResult = NonNullable>> @@ -1156,28 +1207,28 @@ export type GetUserIdBestReviewsSuspenseQueryError = unknown export function useGetUserIdBestReviewsSuspense>, TError = unknown>( id: string, params: undefined | GetUserIdBestReviewsParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdBestReviewsSuspense>, TError = unknown>( id: string, params?: GetUserIdBestReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdBestReviewsSuspense>, TError = unknown>( id: string, params?: GetUserIdBestReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdBestReviewsSuspense>, TError = unknown>( id: string, params?: GetUserIdBestReviewsParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdBestReviewsSuspenseQueryOptions(id,params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -1186,6 +1237,7 @@ export function useGetUserIdBestReviewsSuspense { - return [`/user/${id}/items-status`] as const; + + +export const getGetUserIdItemsStatusQueryKey = (id?: string,) => { + return [ + `/user/${id}/items-status` + ] as const; } @@ -1222,7 +1278,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdItemsStatusQueryResult = NonNullable>> @@ -1237,8 +1293,8 @@ export function useGetUserIdItemsStatus> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserIdItemsStatus>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -1247,21 +1303,21 @@ export function useGetUserIdItemsStatus> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdItemsStatus>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserIdItemsStatus>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdItemsStatusQueryOptions(id,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -1270,6 +1326,7 @@ export function useGetUserIdItemsStatus>, TError = unknown>(id: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -1285,7 +1342,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserIdItemsStatusSuspenseQueryResult = NonNullable>> @@ -1294,25 +1351,25 @@ export type GetUserIdItemsStatusSuspenseQueryError = unknown export function useGetUserIdItemsStatusSuspense>, TError = unknown>( id: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdItemsStatusSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdItemsStatusSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserIdItemsStatusSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserIdItemsStatusSuspenseQueryOptions(id,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -1321,3 +1378,4 @@ export function useGetUserIdItemsStatusSuspense(options?: { mutation?:UseMutationOptions>, TError,{data: PostUsersCreateBody}, TContext>, } ): UseMutationOptions>, TError,{data: PostUsersCreateBody}, TContext> => { - + const mutationKey = ['postUsersCreate']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -103,7 +107,7 @@ const {mutation: mutationOptions} = options ? export const usePostUsersCreate = (options?: { mutation?:UseMutationOptions>, TError,{data: PostUsersCreateBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PostUsersCreateBody}, @@ -112,7 +116,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostUsersCreateMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Check if this username is available @@ -131,8 +135,12 @@ export const getUsersAvailableUsername = ( } -export const getGetUsersAvailableUsernameQueryKey = (params: GetUsersAvailableUsernameParams,) => { - return [`/users/available-username`, ...(params ? [params]: [])] as const; + + +export const getGetUsersAvailableUsernameQueryKey = (params?: GetUsersAvailableUsernameParams,) => { + return [ + `/users/available-username`, ...(params ? [params]: []) + ] as const; } @@ -151,7 +159,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUsersAvailableUsernameQueryResult = NonNullable>> @@ -166,8 +174,8 @@ export function useGetUsersAvailableUsername> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableUsername>, TError = GetUsersAvailableUsername409>( params: GetUsersAvailableUsernameParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -176,21 +184,21 @@ export function useGetUsersAvailableUsername> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableUsername>, TError = GetUsersAvailableUsername409>( params: GetUsersAvailableUsernameParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableUsername>, TError = GetUsersAvailableUsername409>( params: GetUsersAvailableUsernameParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUsersAvailableUsernameQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -199,6 +207,7 @@ export function useGetUsersAvailableUsername>, TError = GetUsersAvailableUsername409>(params: GetUsersAvailableUsernameParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -214,7 +223,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUsersAvailableUsernameSuspenseQueryResult = NonNullable>> @@ -223,25 +232,25 @@ export type GetUsersAvailableUsernameSuspenseQueryError = GetUsersAvailableUsern export function useGetUsersAvailableUsernameSuspense>, TError = GetUsersAvailableUsername409>( params: GetUsersAvailableUsernameParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableUsernameSuspense>, TError = GetUsersAvailableUsername409>( params: GetUsersAvailableUsernameParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableUsernameSuspense>, TError = GetUsersAvailableUsername409>( params: GetUsersAvailableUsernameParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableUsernameSuspense>, TError = GetUsersAvailableUsername409>( params: GetUsersAvailableUsernameParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUsersAvailableUsernameSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -250,6 +259,7 @@ export function useGetUsersAvailableUsernameSuspense { - return [`/users/available-email`, ...(params ? [params]: [])] as const; + + +export const getGetUsersAvailableEmailQueryKey = (params?: GetUsersAvailableEmailParams,) => { + return [ + `/users/available-email`, ...(params ? [params]: []) + ] as const; } @@ -287,7 +301,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUsersAvailableEmailQueryResult = NonNullable>> @@ -302,8 +316,8 @@ export function useGetUsersAvailableEmail> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableEmail>, TError = GetUsersAvailableEmail409>( params: GetUsersAvailableEmailParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -312,21 +326,21 @@ export function useGetUsersAvailableEmail> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableEmail>, TError = GetUsersAvailableEmail409>( params: GetUsersAvailableEmailParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableEmail>, TError = GetUsersAvailableEmail409>( params: GetUsersAvailableEmailParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUsersAvailableEmailQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -335,6 +349,7 @@ export function useGetUsersAvailableEmail>, TError = GetUsersAvailableEmail409>(params: GetUsersAvailableEmailParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -350,7 +365,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUsersAvailableEmailSuspenseQueryResult = NonNullable>> @@ -359,25 +374,25 @@ export type GetUsersAvailableEmailSuspenseQueryError = GetUsersAvailableEmail409 export function useGetUsersAvailableEmailSuspense>, TError = GetUsersAvailableEmail409>( params: GetUsersAvailableEmailParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableEmailSuspense>, TError = GetUsersAvailableEmail409>( params: GetUsersAvailableEmailParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableEmailSuspense>, TError = GetUsersAvailableEmail409>( params: GetUsersAvailableEmailParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersAvailableEmailSuspense>, TError = GetUsersAvailableEmail409>( params: GetUsersAvailableEmailParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUsersAvailableEmailSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -386,6 +401,7 @@ export function useGetUsersAvailableEmailSuspense { - return [`/users/${username}`] as const; + + +export const getGetUsersUsernameQueryKey = (username?: string,) => { + return [ + `/users/${username}` + ] as const; } @@ -422,7 +442,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(username), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(username), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUsersUsernameQueryResult = NonNullable>> @@ -437,8 +457,8 @@ export function useGetUsersUsername> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUsersUsername>, TError = unknown>( username: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -447,21 +467,21 @@ export function useGetUsersUsername> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUsersUsername>, TError = unknown>( username: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUsersUsername>, TError = unknown>( username: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUsersUsernameQueryOptions(username,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -470,6 +490,7 @@ export function useGetUsersUsername>, TError = unknown>(username: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -485,7 +506,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUsersUsernameSuspenseQueryResult = NonNullable>> @@ -494,25 +515,25 @@ export type GetUsersUsernameSuspenseQueryError = unknown export function useGetUsersUsernameSuspense>, TError = unknown>( username: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersUsernameSuspense>, TError = unknown>( username: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersUsernameSuspense>, TError = unknown>( username: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersUsernameSuspense>, TError = unknown>( username: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUsersUsernameSuspenseQueryOptions(username,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -521,6 +542,7 @@ export function useGetUsersUsernameSuspense { - return [`/user/by/${id}`] as const; + + +export const getGetUserByIdQueryKey = (id?: string,) => { + return [ + `/user/by/${id}` + ] as const; } @@ -557,7 +583,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, enabled: !!(id), ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserByIdQueryResult = NonNullable>> @@ -572,8 +598,8 @@ export function useGetUserById>, Awaited> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserById>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -582,21 +608,21 @@ export function useGetUserById>, Awaited> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserById>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserById>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserByIdQueryOptions(id,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -605,6 +631,7 @@ export function useGetUserById>, + export const getGetUserByIdSuspenseQueryOptions = >, TError = unknown>(id: string, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -620,7 +647,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserByIdSuspenseQueryResult = NonNullable>> @@ -629,25 +656,25 @@ export type GetUserByIdSuspenseQueryError = unknown export function useGetUserByIdSuspense>, TError = unknown>( id: string, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserByIdSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserByIdSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserByIdSuspense>, TError = unknown>( id: string, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserByIdSuspenseQueryOptions(id,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -656,8 +683,9 @@ export function useGetUserByIdSuspense { - return [`/me`] as const; + return [ + `/me` + ] as const; } @@ -692,7 +724,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetMeQueryResult = NonNullable>> @@ -707,8 +739,8 @@ export function useGetMe>, TError = unk Awaited> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetMe>, TError = unknown>( options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -717,21 +749,21 @@ export function useGetMe>, TError = unk Awaited> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetMe>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetMe>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetMeQueryOptions(options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -740,6 +772,7 @@ export function useGetMe>, TError = unk + export const getGetMeSuspenseQueryOptions = >, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } ) => { @@ -755,7 +788,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetMeSuspenseQueryResult = NonNullable>> @@ -764,25 +797,25 @@ export type GetMeSuspenseQueryError = unknown export function useGetMeSuspense>, TError = unknown>( options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetMeSuspense>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetMeSuspense>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetMeSuspense>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetMeSuspenseQueryOptions(options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -791,6 +824,7 @@ export function useGetMeSuspense>, TErr + /** * Update user */ @@ -812,7 +846,7 @@ export const patchUser = ( export const getPatchUserMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PatchUserBody}, TContext>, } ): UseMutationOptions>, TError,{data: PatchUserBody}, TContext> => { - + const mutationKey = ['patchUser']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -840,7 +874,7 @@ const {mutation: mutationOptions} = options ? export const usePatchUser = (options?: { mutation?:UseMutationOptions>, TError,{data: PatchUserBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PatchUserBody}, @@ -849,7 +883,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPatchUserMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Update user password @@ -872,7 +906,7 @@ export const patchUserPassword = ( export const getPatchUserPasswordMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PatchUserPasswordBody}, TContext>, } ): UseMutationOptions>, TError,{data: PatchUserPasswordBody}, TContext> => { - + const mutationKey = ['patchUserPassword']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -900,7 +934,7 @@ const {mutation: mutationOptions} = options ? export const usePatchUserPassword = (options?: { mutation?:UseMutationOptions>, TError,{data: PatchUserPasswordBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: PatchUserPasswordBody}, @@ -909,7 +943,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPatchUserPasswordMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Update user preferences @@ -932,7 +966,7 @@ export const updateUserPreferences = ( export const getUpdateUserPreferencesMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: UpdateUserPreferencesBody}, TContext>, } ): UseMutationOptions>, TError,{data: UpdateUserPreferencesBody}, TContext> => { - + const mutationKey = ['updateUserPreferences']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -960,7 +994,7 @@ const {mutation: mutationOptions} = options ? export const useUpdateUserPreferences = (options?: { mutation?:UseMutationOptions>, TError,{data: UpdateUserPreferencesBody}, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, {data: UpdateUserPreferencesBody}, @@ -969,7 +1003,7 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getUpdateUserPreferencesMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } /** * Get user preferences @@ -987,8 +1021,12 @@ export const getUserPreferences = ( } + + export const getGetUserPreferencesQueryKey = () => { - return [`/user/preferences`] as const; + return [ + `/user/preferences` + ] as const; } @@ -1007,7 +1045,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserPreferencesQueryResult = NonNullable>> @@ -1022,8 +1060,8 @@ export function useGetUserPreferences> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUserPreferences>, TError = unknown>( options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -1032,21 +1070,21 @@ export function useGetUserPreferences> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserPreferences>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUserPreferences>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserPreferencesQueryOptions(options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -1055,6 +1093,7 @@ export function useGetUserPreferences>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } ) => { @@ -1070,7 +1109,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUserPreferencesSuspenseQueryResult = NonNullable>> @@ -1079,25 +1118,25 @@ export type GetUserPreferencesSuspenseQueryError = unknown export function useGetUserPreferencesSuspense>, TError = unknown>( options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserPreferencesSuspense>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserPreferencesSuspense>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUserPreferencesSuspense>, TError = unknown>( options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUserPreferencesSuspenseQueryOptions(options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -1106,6 +1145,7 @@ export function useGetUserPreferencesSuspense { - return [`/users/search`, ...(params ? [params]: [])] as const; + + +export const getGetUsersSearchQueryKey = (params?: GetUsersSearchParams,) => { + return [ + `/users/search`, ...(params ? [params]: []) + ] as const; } @@ -1143,7 +1187,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUsersSearchQueryResult = NonNullable>> @@ -1158,8 +1202,8 @@ export function useGetUsersSearch> > , 'initialData' >, } - - ): DefinedUseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } export function useGetUsersSearch>, TError = unknown>( params: GetUsersSearchParams, options?: { query?:Partial>, TError, TData>> & Pick< UndefinedInitialDataOptions< @@ -1168,21 +1212,21 @@ export function useGetUsersSearch> > , 'initialData' >, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUsersSearch>, TError = unknown>( params: GetUsersSearchParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } export function useGetUsersSearch>, TError = unknown>( params: GetUsersSearchParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUsersSearchQueryOptions(params,options) - const query = useQuery(queryOptions) as UseQueryResult & { queryKey: DataTag }; + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -1191,6 +1235,7 @@ export function useGetUsersSearch>, TError = unknown>(params: GetUsersSearchParams, options?: { query?:Partial>, TError, TData>>, } ) => { @@ -1206,7 +1251,7 @@ const {query: queryOptions} = options ?? {}; - return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } } export type GetUsersSearchSuspenseQueryResult = NonNullable>> @@ -1215,25 +1260,25 @@ export type GetUsersSearchSuspenseQueryError = unknown export function useGetUsersSearchSuspense>, TError = unknown>( params: GetUsersSearchParams, options: { query:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersSearchSuspense>, TError = unknown>( params: GetUsersSearchParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersSearchSuspense>, TError = unknown>( params: GetUsersSearchParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } export function useGetUsersSearchSuspense>, TError = unknown>( params: GetUsersSearchParams, options?: { query?:Partial>, TError, TData>>, } - - ): UseSuspenseQueryResult & { queryKey: DataTag } { + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { const queryOptions = getGetUsersSearchSuspenseQueryOptions(params,options) - const query = useSuspenseQuery(queryOptions) as UseSuspenseQueryResult & { queryKey: DataTag }; + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; query.queryKey = queryOptions.queryKey ; @@ -1242,3 +1287,4 @@ export function useGetUsersSearchSuspense { + + + return axiosInstance( + {url: `/watch-entry`, method: 'POST', + headers: {'Content-Type': 'application/json', }, + data: postWatchEntryBody, signal + }, + ); + } + + + +export const getPostWatchEntryMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{data: PostWatchEntryBody}, TContext>, } +): UseMutationOptions>, TError,{data: PostWatchEntryBody}, TContext> => { + +const mutationKey = ['postWatchEntry']; +const {mutation: mutationOptions} = options ? + options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? + options + : {...options, mutation: {...options.mutation, mutationKey}} + : {mutation: { mutationKey, }}; + + + + + const mutationFn: MutationFunction>, {data: PostWatchEntryBody}> = (props) => { + const {data} = props ?? {}; + + return postWatchEntry(data,) + } + + + + + return { mutationFn, ...mutationOptions }} + + export type PostWatchEntryMutationResult = NonNullable>> + export type PostWatchEntryMutationBody = PostWatchEntryBody + export type PostWatchEntryMutationError = unknown + + export const usePostWatchEntry = (options?: { mutation?:UseMutationOptions>, TError,{data: PostWatchEntryBody}, TContext>, } + , queryClient?: QueryClient): UseMutationResult< + Awaited>, + TError, + {data: PostWatchEntryBody}, + TContext + > => { + + const mutationOptions = getPostWatchEntryMutationOptions(options); + + return useMutation(mutationOptions, queryClient); + } + /** + * Get watch entries for a user item + */ +export const getWatchEntries = ( + params: GetWatchEntriesParams, + signal?: AbortSignal +) => { + + + return axiosInstance( + {url: `/watch-entries`, method: 'GET', + params, signal + }, + ); + } + + + + +export const getGetWatchEntriesQueryKey = (params?: GetWatchEntriesParams,) => { + return [ + `/watch-entries`, ...(params ? [params]: []) + ] as const; + } + + +export const getGetWatchEntriesQueryOptions = >, TError = unknown>(params: GetWatchEntriesParams, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetWatchEntriesQueryKey(params); + + + + const queryFn: QueryFunction>> = ({ signal }) => getWatchEntries(params, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetWatchEntriesQueryResult = NonNullable>> +export type GetWatchEntriesQueryError = unknown + + +export function useGetWatchEntries>, TError = unknown>( + params: GetWatchEntriesParams, options: { query:Partial>, TError, TData>> & Pick< + DefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): DefinedUseQueryResult & { queryKey: DataTag } +export function useGetWatchEntries>, TError = unknown>( + params: GetWatchEntriesParams, options?: { query?:Partial>, TError, TData>> & Pick< + UndefinedInitialDataOptions< + Awaited>, + TError, + Awaited> + > , 'initialData' + >, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } +export function useGetWatchEntries>, TError = unknown>( + params: GetWatchEntriesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } + +export function useGetWatchEntries>, TError = unknown>( + params: GetWatchEntriesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetWatchEntriesQueryOptions(params,options) + + const query = useQuery(queryOptions, queryClient) as UseQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + +export const getGetWatchEntriesSuspenseQueryOptions = >, TError = unknown>(params: GetWatchEntriesParams, options?: { query?:Partial>, TError, TData>>, } +) => { + +const {query: queryOptions} = options ?? {}; + + const queryKey = queryOptions?.queryKey ?? getGetWatchEntriesQueryKey(params); + + + + const queryFn: QueryFunction>> = ({ signal }) => getWatchEntries(params, signal); + + + + + + return { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions>, TError, TData> & { queryKey: DataTag } +} + +export type GetWatchEntriesSuspenseQueryResult = NonNullable>> +export type GetWatchEntriesSuspenseQueryError = unknown + + +export function useGetWatchEntriesSuspense>, TError = unknown>( + params: GetWatchEntriesParams, options: { query:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetWatchEntriesSuspense>, TError = unknown>( + params: GetWatchEntriesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } +export function useGetWatchEntriesSuspense>, TError = unknown>( + params: GetWatchEntriesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } + +export function useGetWatchEntriesSuspense>, TError = unknown>( + params: GetWatchEntriesParams, options?: { query?:Partial>, TError, TData>>, } + , queryClient?: QueryClient + ): UseSuspenseQueryResult & { queryKey: DataTag } { + + const queryOptions = getGetWatchEntriesSuspenseQueryOptions(params,options) + + const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult & { queryKey: DataTag }; + + query.queryKey = queryOptions.queryKey ; + + return query; +} + + + + +/** + * Update a watch entry + */ +export const putWatchEntryId = ( + id: string, + putWatchEntryIdBody: PutWatchEntryIdBody, + ) => { + + + return axiosInstance( + {url: `/watch-entry/${id}`, method: 'PUT', + headers: {'Content-Type': 'application/json', }, + data: putWatchEntryIdBody + }, + ); + } + + + +export const getPutWatchEntryIdMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{id: string;data: PutWatchEntryIdBody}, TContext>, } +): UseMutationOptions>, TError,{id: string;data: PutWatchEntryIdBody}, TContext> => { + +const mutationKey = ['putWatchEntryId']; +const {mutation: mutationOptions} = options ? + options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? + options + : {...options, mutation: {...options.mutation, mutationKey}} + : {mutation: { mutationKey, }}; + + + + + const mutationFn: MutationFunction>, {id: string;data: PutWatchEntryIdBody}> = (props) => { + const {id,data} = props ?? {}; + + return putWatchEntryId(id,data,) + } + + + + + return { mutationFn, ...mutationOptions }} + + export type PutWatchEntryIdMutationResult = NonNullable>> + export type PutWatchEntryIdMutationBody = PutWatchEntryIdBody + export type PutWatchEntryIdMutationError = unknown + + export const usePutWatchEntryId = (options?: { mutation?:UseMutationOptions>, TError,{id: string;data: PutWatchEntryIdBody}, TContext>, } + , queryClient?: QueryClient): UseMutationResult< + Awaited>, + TError, + {id: string;data: PutWatchEntryIdBody}, + TContext + > => { + + const mutationOptions = getPutWatchEntryIdMutationOptions(options); + + return useMutation(mutationOptions, queryClient); + } + /** + * Delete a watch entry + */ +export const deleteWatchEntryId = ( + id: string, + ) => { + + + return axiosInstance( + {url: `/watch-entry/${id}`, method: 'DELETE' + }, + ); + } + + + +export const getDeleteWatchEntryIdMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } +): UseMutationOptions>, TError,{id: string}, TContext> => { + +const mutationKey = ['deleteWatchEntryId']; +const {mutation: mutationOptions} = options ? + options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? + options + : {...options, mutation: {...options.mutation, mutationKey}} + : {mutation: { mutationKey, }}; + + + + + const mutationFn: MutationFunction>, {id: string}> = (props) => { + const {id} = props ?? {}; + + return deleteWatchEntryId(id,) + } + + + + + return { mutationFn, ...mutationOptions }} + + export type DeleteWatchEntryIdMutationResult = NonNullable>> + + export type DeleteWatchEntryIdMutationError = unknown + + export const useDeleteWatchEntryId = (options?: { mutation?:UseMutationOptions>, TError,{id: string}, TContext>, } + , queryClient?: QueryClient): UseMutationResult< + Awaited>, + TError, + {id: string}, + TContext + > => { + + const mutationOptions = getDeleteWatchEntryIdMutationOptions(options); + + return useMutation(mutationOptions, queryClient); + } + \ No newline at end of file diff --git a/apps/web/src/api/webhook.ts b/apps/web/src/api/webhook.ts index 906a64b7..976f3229 100644 --- a/apps/web/src/api/webhook.ts +++ b/apps/web/src/api/webhook.ts @@ -1,22 +1,25 @@ /** - * Generated by orval v7.5.0 🍺 + * Generated by orval v7.21.0 🍺 * Do not edit manually. * Plotwist * OpenAPI spec version: 0.1.0 */ import { useMutation -} from '@tanstack/react-query' +} from '@tanstack/react-query'; import type { MutationFunction, + QueryClient, UseMutationOptions, UseMutationResult -} from '@tanstack/react-query' +} from '@tanstack/react-query'; + import { axiosInstance } from '../services/axios-instance'; + /** * Webhook route */ @@ -37,7 +40,7 @@ export const postCompleteStripeSubscription = ( export const getPostCompleteStripeSubscriptionMutationOptions = (options?: { mutation?:UseMutationOptions>, TError,void, TContext>, } ): UseMutationOptions>, TError,void, TContext> => { - + const mutationKey = ['postCompleteStripeSubscription']; const {mutation: mutationOptions} = options ? options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ? @@ -65,7 +68,7 @@ const {mutation: mutationOptions} = options ? export const usePostCompleteStripeSubscription = (options?: { mutation?:UseMutationOptions>, TError,void, TContext>, } -): UseMutationResult< + , queryClient?: QueryClient): UseMutationResult< Awaited>, TError, void, @@ -74,6 +77,6 @@ const {mutation: mutationOptions} = options ? const mutationOptions = getPostCompleteStripeSubscriptionMutationOptions(options); - return useMutation(mutationOptions); + return useMutation(mutationOptions, queryClient); } \ No newline at end of file diff --git a/apps/web/src/app/[lang]/[username]/reviews/_reviews.tsx b/apps/web/src/app/[lang]/[username]/reviews/_reviews.tsx index 59887185..7c8380e0 100644 --- a/apps/web/src/app/[lang]/[username]/reviews/_reviews.tsx +++ b/apps/web/src/app/[lang]/[username]/reviews/_reviews.tsx @@ -1,7 +1,9 @@ 'use client' -import { useGetDetailedReviewsSuspense } from '@/api/reviews' -import { FullReview } from '@/components/full-review' +import { useEffect } from 'react' +import { useInView } from 'react-intersection-observer' +import { useGetDetailedReviewsInfinite } from '@/api/reviews' +import { FullReview, FullReviewSkeleton } from '@/components/full-review' import { useLanguage } from '@/context/language' import { EmptyReview } from '../../home/_components/user-last-review' import { useLayoutContext } from '../_context' @@ -9,20 +11,59 @@ import { useLayoutContext } from '../_context' export const Reviews = () => { const { language } = useLanguage() const { userId } = useLayoutContext() - const { data } = useGetDetailedReviewsSuspense({ - language, - userId, + + const { ref, inView } = useInView({ + threshold: 0, }) - if (data.reviews.length === 0) { + const { data, fetchNextPage, hasNextPage, isFetchingNextPage } = + useGetDetailedReviewsInfinite( + { language, userId, limit: '20' }, + { + query: { + getNextPageParam: lastPage => { + if (!lastPage.pagination?.hasMore) return undefined + return lastPage.pagination.page + 1 + }, + initialPageParam: 1, + }, + } + ) + + useEffect(() => { + if (inView && hasNextPage && !isFetchingNextPage) { + fetchNextPage() + } + }, [inView, hasNextPage, isFetchingNextPage, fetchNextPage]) + + const reviews = data?.pages.flatMap(page => page.reviews) ?? [] + + if (!data) { + return ( +
+ + + +
+ ) + } + + if (reviews.length === 0) { return } return (
- {data.reviews.map(review => ( + {reviews.map(review => ( ))} + + {hasNextPage && ( +
+ + {isFetchingNextPage && } +
+ )}
) } diff --git a/apps/web/src/app/[lang]/[username]/reviews/page.tsx b/apps/web/src/app/[lang]/[username]/reviews/page.tsx index 6e9655fa..6ff06dee 100644 --- a/apps/web/src/app/[lang]/[username]/reviews/page.tsx +++ b/apps/web/src/app/[lang]/[username]/reviews/page.tsx @@ -1,11 +1,5 @@ -import { Suspense } from 'react' -import { FullReviewSkeleton } from '@/components/full-review' import { Reviews } from './_reviews' export default async function ReviewsPage() { - return ( - }> - - - ) + return }