Merge branch 'main' into fix/chat-name-generation

# Conflicts:
#	packages/server/api/src/app/ai/chat/ai-mcp-chat.controller.ts

Author: Roman Snapko

.env.template

@@ -66,6 +66,7 @@ OPS_LOGZIO_TOKEN=
 OPS_LOGZIO_METRICS_TOKEN=
 OPS_LOG_LEVEL=debug
 OPS_LOG_PRETTY=true
+OPS_LOG_REDACTION=false
 OPS_TELEMETRY_MODE=COLLECTOR
 OPS_TELEMETRY_COLLECTOR_URL=https://telemetry.openops.com/save
 

packages/engine/src/lib/services/progress.service.ts

@@ -107,9 +107,15 @@ const sendUpdateRunRequest = async (flowRunId: FlowRunId): Promise<void> => {
       } as BodyAccessKeyRequest,
       {
         retries: MAX_RETRIES,
-        retryCondition: (error: AxiosError) => {
+        retryCondition: async (error: AxiosError) => {
           throwIfExecutionTimeExceeded();
-          return isRetryableError(error);
+
+          if (!isRetryableError(error)) {
+            return false;
+          }
+
+          await updateRequestBody(request, error);
+          return true;
         },
         retryDelay: (retryCount: number) => (retryCount + 1) * 200, // 200ms, 400ms, 600ms
       },
@@ -129,6 +135,22 @@ const sendUpdateRunRequest = async (flowRunId: FlowRunId): Promise<void> => {
   logger.debug(`Progress update request for ${flowRunId} took ${duration}ms`);
 };
 
+async function updateRequestBody(
+  request: UpdateRunProgressRequest,
+  error: AxiosError,
+): Promise<void> {
+  try {
+    if (error.config) {
+      const newBodyAccessKey = await saveRequestBody(request);
+      error.config.data = JSON.stringify({
+        bodyAccessKey: newBodyAccessKey,
+      });
+    }
+  } catch (e) {
+    logger.info('Failed to update progress request body.', e);
+  }
+}
+
 type UpdateStepProgressParams = {
   engineConstants: EngineConstants;
   flowExecutorContext: FlowExecutorContext;

packages/openops/src/lib/openops-tables/types/table-workspace.ts

@@ -1,4 +1,4 @@
-type User = {
+export type WorkspaceUser = {
   id: number;
   name: string;
   email: string;
@@ -12,7 +12,7 @@ type User = {
 export type TableWorkspace = {
   id: number;
   name: string;
-  users: User[];
+  users: WorkspaceUser[];
   order: number;
   permissions: string;
   unread_notifications_count: number;

packages/react-ui/src/app/app-bootstrap.tsx

@@ -1,5 +1,6 @@
-import { LoadingSpinner } from '@openops/components/ui';
 import { useEffect, useState } from 'react';
+
+import { FullPageSpinner } from './common/components/full-page-spinner';
 import { QueryKeys } from './constants/query-keys';
 import { flagsApi, FlagsMap } from './lib/flags-api';
 import { initializeInternal } from './lib/initialize-internal';
@@ -51,11 +52,7 @@ export function AppBootstrap({ children }: Readonly<AppBootstrapProps>) {
   }, []);
 
   if (state.status === 'loading') {
-    return (
-      <div className="flex h-screen w-screen items-center justify-center">
-        <LoadingSpinner size={50} />
-      </div>
-    );
+    return <FullPageSpinner />;
   }
 
   if (state.status === 'error') {

packages/react-ui/src/app/common/components/full-page-spinner.tsx

@@ -0,0 +1,11 @@
+import { LoadingSpinner } from '@openops/components/ui';
+
+type FullPageSpinnerProps = {
+  size?: number;
+};
+
+export const FullPageSpinner = ({ size = 50 }: FullPageSpinnerProps) => (
+  <div className="bg-background flex h-screen w-screen items-center justify-center">
+    <LoadingSpinner size={size} />
+  </div>
+);

packages/react-ui/src/app/common/guards/allow-logged-in-user-only-guard.tsx

@@ -1,10 +1,10 @@
-import { LoadingSpinner } from '@openops/components/ui';
 import dayjs from 'dayjs';
 import { jwtDecode } from 'jwt-decode';
 import { Suspense, useEffect } from 'react';
 import { Navigate, useLocation, useNavigate } from 'react-router-dom';
 
 import { getFederatedUrlBasedOnFlags } from '@/app/common/auth/lib/utils';
+import { FullPageSpinner } from '@/app/common/components/full-page-spinner';
 import { flagsHooks } from '@/app/common/hooks/flags-hooks';
 import { platformHooks } from '@/app/common/hooks/platform-hooks';
 import { projectHooks } from '@/app/common/hooks/project-hooks';
@@ -46,13 +46,7 @@ const LoggedIn = ({ children }: { children: React.ReactNode }) => {
   appConnectionsHooks.useConnectionsMetadata();
 
   return (
-    <Suspense
-      fallback={
-        <div className=" flex h-screen w-screen items-center justify-center ">
-          <LoadingSpinner size={50}></LoadingSpinner>
-        </div>
-      }
-    >
+    <Suspense fallback={<FullPageSpinner />}>
       <SocketProvider>{children}</SocketProvider>
     </Suspense>
   );

packages/react-ui/src/app/common/guards/intial-data-guard.tsx

@@ -1,8 +1,11 @@
-import { LoadingSpinner } from '@openops/components/ui';
-import { Suspense, useEffect } from 'react';
+import { Suspense, useEffect, useState } from 'react';
 
+import { FullPageSpinner } from '@/app/common/components/full-page-spinner';
 import { flagsHooks } from '@/app/common/hooks/flags-hooks';
-import { setupResponseInterceptor } from '@/app/interceptors';
+import {
+  setupRequestInterceptor,
+  setupResponseInterceptor,
+} from '@/app/interceptors';
 
 type InitialDataGuardProps = {
   children: React.ReactNode;
@@ -11,25 +14,26 @@ export const InitialDataGuard = ({
   children,
 }: Readonly<InitialDataGuardProps>) => {
   const { data: flags } = flagsHooks.useFlags();
+  const [interceptorsReady, setInterceptorsReady] = useState(false);
 
   useEffect(() => {
     if (!flags) {
       console.error('Missing flags for response interceptor configuration');
+      return;
     }
+    const isFederatedAuth = Boolean(flags?.FEDERATED_LOGIN_ENABLED);
+    setupRequestInterceptor({
+      isFederatedAuth,
+    });
     setupResponseInterceptor({
-      isFederatedAuth: Boolean(flags?.FEDERATED_LOGIN_ENABLED),
+      isFederatedAuth,
     });
+    setInterceptorsReady(true);
   }, [flags]);
 
-  return (
-    <Suspense
-      fallback={
-        <div className="bg-background flex h-screen w-screen items-center justify-center ">
-          <LoadingSpinner size={50}></LoadingSpinner>
-        </div>
-      }
-    >
-      {children}
-    </Suspense>
-  );
+  if (!interceptorsReady) {
+    return <FullPageSpinner />;
+  }
+
+  return <Suspense fallback={<FullPageSpinner />}>{children}</Suspense>;
 };

packages/react-ui/src/app/features/templates/components/public-flow-template-filter-sidebar-wrapper.tsx

@@ -20,6 +20,7 @@ export type FlowTemplateFilterSidebarProps = {
   setSelectedServices: (services: string[]) => void;
   selectedCategories: string[];
   setSelectedCategories: (categories: string[]) => void;
+  newDomains?: string[];
 };
 
 export const FlowTemplateFilterSidebarSkeletonLoader: React.FC<{
@@ -53,6 +54,7 @@ const PublicFlowTemplateFilterSidebarWrapper = ({
   setSelectedCategories,
   setSelectedBlocks,
   showDomains = true,
+  newDomains = [],
 }: FlowTemplateFilterSidebarProps & { showDomains?: boolean }) => {
   const useCloudTemplates = flagsHooks.useShouldFetchCloudTemplates();
 
@@ -175,6 +177,7 @@ const PublicFlowTemplateFilterSidebarWrapper = ({
       selectedCategories={selectedCategories}
       categoryLogos={categoryLogos}
       showDomains={showDomains}
+      newDomains={newDomains}
     />
   );
 };

packages/react-ui/src/app/features/templates/components/select-flow-template-dialog-content.tsx

@@ -150,6 +150,7 @@ const SelectFlowTemplateDialogContent = ({
             selectedCategories={selectedCategories}
             setSelectedCategories={setSelectedCategories}
             showDomains={isFullCatalog}
+            newDomains={['Policy & Governance']}
           />
         ) : (
           <PrivateFlowTemplateFilterSidebarWrapper />

packages/react-ui/src/app/interceptors/index.ts

@@ -9,22 +9,22 @@ import {
 let requestInterceptorId: number | null = null;
 let responseInterceptorId: number | null = null;
 
-function setupRequestInterceptor(): void {
+type InterceptorOptions = {
+  isFederatedAuth: boolean;
+};
+
+export function setupRequestInterceptor({
+  isFederatedAuth,
+}: InterceptorOptions): void {
   if (requestInterceptorId === null) {
     const requestInterceptor = createRequestInterceptor();
     requestInterceptorId = axios.interceptors.request.use(requestInterceptor);
   }
 }
 
-setupRequestInterceptor();
-
-type ResponseInterceptorOptions = {
-  isFederatedAuth: boolean;
-};
-
 export function setupResponseInterceptor({
   isFederatedAuth,
-}: ResponseInterceptorOptions): void {
+}: InterceptorOptions): void {
   if (responseInterceptorId === null) {
     const responseInterceptor = isFederatedAuth
       ? createFederatedResponseInterceptor()