From 6ead3342fdd967b7d7dd4d50f90c7c00e3b027e8 Mon Sep 17 00:00:00 2001
From: Artem Astapenko <3767150+Jamakase@users.noreply.github.com>
Date: Tue, 26 Oct 2021 02:12:55 +0300
Subject: [PATCH] Fix codestyle for workspace (#7304)

---
 .../domain/cloudWorkspaces/CloudWorkspacesService.ts  | 11 +----------
 .../cloud/services/workspaces/WorkspacesService.tsx   |  2 +-
 .../WorkspaceSettingsView/WorkspaceSettingsView.tsx   |  7 +++++--
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/airbyte-webapp/src/packages/cloud/lib/domain/cloudWorkspaces/CloudWorkspacesService.ts b/airbyte-webapp/src/packages/cloud/lib/domain/cloudWorkspaces/CloudWorkspacesService.ts
index 66522f3d64c9..110fb18468e1 100644
--- a/airbyte-webapp/src/packages/cloud/lib/domain/cloudWorkspaces/CloudWorkspacesService.ts
+++ b/airbyte-webapp/src/packages/cloud/lib/domain/cloudWorkspaces/CloudWorkspacesService.ts
@@ -15,16 +15,7 @@ class CloudWorkspacesService extends AirbyteRequestService {
     return workspaces;
   }
 
-  public async get(workspaceId?: string | null): Promise<CloudWorkspace> {
-    if (!workspaceId) {
-      return Promise.resolve({
-        name: "",
-        workspaceId: "",
-        billingUserId: "",
-        remainingCredits: 0,
-      });
-    }
-
+  public async get(workspaceId: string): Promise<CloudWorkspace> {
     return await this.fetch<CloudWorkspace>(`${this.url}/get`, {
       workspaceId,
     });
diff --git a/airbyte-webapp/src/packages/cloud/services/workspaces/WorkspacesService.tsx b/airbyte-webapp/src/packages/cloud/services/workspaces/WorkspacesService.tsx
index fc37b86e3902..ed9b79c256bd 100644
--- a/airbyte-webapp/src/packages/cloud/services/workspaces/WorkspacesService.tsx
+++ b/airbyte-webapp/src/packages/cloud/services/workspaces/WorkspacesService.tsx
@@ -125,7 +125,7 @@ export function useRemoveWorkspace() {
   );
 }
 
-export function useGetWorkspace(workspaceId?: string | null) {
+export function useGetWorkspace(workspaceId: string) {
   const service = useGetWorkspaceService();
 
   return useQuery<CloudWorkspace>(
diff --git a/airbyte-webapp/src/packages/cloud/views/workspaces/WorkspaceSettingsView/WorkspaceSettingsView.tsx b/airbyte-webapp/src/packages/cloud/views/workspaces/WorkspaceSettingsView/WorkspaceSettingsView.tsx
index f1cd77bd5be9..e45959bcb899 100644
--- a/airbyte-webapp/src/packages/cloud/views/workspaces/WorkspaceSettingsView/WorkspaceSettingsView.tsx
+++ b/airbyte-webapp/src/packages/cloud/views/workspaces/WorkspaceSettingsView/WorkspaceSettingsView.tsx
@@ -12,6 +12,7 @@ import {
   useGetWorkspace,
   useWorkspaceService,
 } from "packages/cloud/services/workspaces/WorkspacesService";
+import { useCurrentWorkspace } from "hooks/services/useWorkspace";
 
 const Header = styled.div`
   display: flex;
@@ -38,9 +39,11 @@ export const WorkspaceSettingsView: React.FC = () => {
     selectWorkspace,
     removeWorkspace,
     updateWorkspace,
-    currentWorkspaceId,
   } = useWorkspaceService();
-  const { data: workspace, isLoading } = useGetWorkspace(currentWorkspaceId);
+  const currentWorkspace = useCurrentWorkspace();
+  const { data: workspace, isLoading } = useGetWorkspace(
+    currentWorkspace.workspaceId
+  );
 
   return (
     <>