🪟 🧹 Move Query Provider (#6289)

airbytehq · May 1, 2023 · b8438c7 · b8438c7
1 parent 0a524ff
commit b8438c7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/airbyte-webapp/src/App.tsx b/airbyte-webapp/src/App.tsx
@@ -6,6 +6,7 @@ import { ThemeProvider } from "styled-components";
 import { ApiErrorBoundary } from "components/common/ApiErrorBoundary";
 
 import { config } from "config";
+import { QueryProvider } from "core/api";
 import { I18nProvider } from "core/i18n";
 import { ServicesProvider } from "core/servicesProvider";
 import { AppMonitoringServiceProvider } from "hooks/services/AppMonitoringService";
@@ -15,7 +16,6 @@ import { FormChangeTrackerService } from "hooks/services/FormChangeTracker";
 import { ModalServiceProvider } from "hooks/services/Modal";
 import { NotificationService } from "hooks/services/Notification";
 import { AnalyticsProvider } from "views/common/AnalyticsProvider";
-import { StoreProvider } from "views/common/StoreProvider";
 
 import LoadingPage from "./components/LoadingPage";
 import { ConfigServiceProvider } from "./config";
@@ -55,7 +55,7 @@ const App: React.FC = () => {
     <React.StrictMode>
       <StyleProvider>
         <I18nProvider locale="en" messages={en}>
-          <StoreProvider>
+          <QueryProvider>
             <ServicesProvider>
               <Suspense fallback={<LoadingPage />}>
                 <ConfigServiceProvider config={config}>
@@ -67,7 +67,7 @@ const App: React.FC = () => {
                 </ConfigServiceProvider>
               </Suspense>
             </ServicesProvider>
-          </StoreProvider>
+          </QueryProvider>
         </I18nProvider>
       </StyleProvider>
     </React.StrictMode>

diff --git a/...webapp/src/views/common/StoreProvider.tsx → ...yte-webapp/src/core/api/QueryProvider.tsx b/...webapp/src/views/common/StoreProvider.tsx → ...yte-webapp/src/core/api/QueryProvider.tsx
@@ -15,7 +15,7 @@ const queryClient = new QueryClient({
   },
 });
 
-const StoreProvider: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => (
+export const QueryProvider: React.FC<React.PropsWithChildren<unknown>> = ({ children }) => (
   <QueryClientProvider client={queryClient}>
     <ReactQueryDevtools
       initialIsOpen={false}
@@ -28,5 +28,3 @@ const StoreProvider: React.FC<React.PropsWithChildren<unknown>> = ({ children })
     {children}
   </QueryClientProvider>
 );
-
-export { StoreProvider };
diff --git a/airbyte-webapp/src/core/api/index.ts b/airbyte-webapp/src/core/api/index.ts
@@ -1,5 +1,6 @@
 export { cloudApiCall, cloudPublicApiCall } from "./apis";
 export { useSuspenseQuery } from "./useSuspenseQuery";
+export { QueryProvider } from "./QueryProvider";
 
 export type { ApiCallOptions } from "./apiCall";
 

diff --git a/airbyte-webapp/src/packages/cloud/App.tsx b/airbyte-webapp/src/packages/cloud/App.tsx
@@ -7,6 +7,7 @@ import { ApiErrorBoundary } from "components/common/ApiErrorBoundary";
 import LoadingPage from "components/LoadingPage";
 
 import { ConfigServiceProvider, config } from "config";
+import { QueryProvider } from "core/api";
 import { I18nProvider } from "core/i18n";
 import { AppMonitoringServiceProvider } from "hooks/services/AppMonitoringService";
 import { ConfirmationModalService } from "hooks/services/ConfirmationModal";
@@ -20,7 +21,6 @@ import cloudLocales from "packages/cloud/locales/en.json";
 import { AuthenticationProvider } from "packages/cloud/services/auth/AuthService";
 import { theme } from "packages/cloud/theme";
 import { AnalyticsProvider } from "views/common/AnalyticsProvider";
-import { StoreProvider } from "views/common/StoreProvider";
 
 import { AppServicesProvider } from "./services/AppServicesProvider";
 import { IntercomProvider } from "./services/thirdParty/intercom/IntercomProvider";
@@ -62,7 +62,7 @@ const App: React.FC = () => {
     <React.StrictMode>
       <StyleProvider>
         <I18nProvider locale="en" messages={messages}>
-          <StoreProvider>
+          <QueryProvider>
             <Suspense fallback={<LoadingPage />}>
               <ConfigServiceProvider config={config}>
                 <Router>
@@ -72,7 +72,7 @@ const App: React.FC = () => {
                 </Router>
               </ConfigServiceProvider>
             </Suspense>
-          </StoreProvider>
+          </QueryProvider>
         </I18nProvider>
       </StyleProvider>
     </React.StrictMode>