Merge branch 'main' of github.com:PROCEED-Labs/proceed into fix/caching-related-bugs

Author: jjoderis

src/management-system-v2/app/(auth)/signin/page.tsx

@@ -3,10 +3,10 @@ import { getCurrentUser } from '@/components/auth';
 import { redirect } from 'next/navigation';
 import SignIn from './signin';
 import { generateGuestReferenceToken } from '@/lib/reference-guest-user-token';
-import { env } from '@/lib/ms-config/env-vars';
 import db from '@/lib/data/db';
 import { connection } from 'next/server';
 import { Suspense } from 'react';
+import { getMSConfig } from '@/lib/ms-config/ms-config';
 
 const dayInMS = 1000 * 60 * 60 * 24;
 
@@ -60,7 +60,8 @@ const Deferred: React.FC<{}> = async ({}) => {
   else userType = isGuest ? ('guest' as const) : ('user' as const);
 
   let logoUrl;
-  if (env.PROCEED_PUBLIC_IAM_ONLY_ONE_ORGANIZATIONAL_SPACE) {
+  const config = await getMSConfig();
+  if (config.PROCEED_PUBLIC_IAM_ONLY_ONE_ORGANIZATIONAL_SPACE) {
     const org = await db.space.findFirst({
       where: {
         isOrganization: true,

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/[processId]/instance-helpers.ts

@@ -1,6 +1,7 @@
 import { StoredDeployment } from '@/lib/data/deployment';
 import { ExtendedInstanceInfo } from '@/lib/data/instance';
 import { InstanceInfo } from '@/lib/engines/deployment';
+import { Version } from '@prisma/client';
 import { convertISODurationToMiliseconds } from '@proceed/bpmn-helper/src/getters';
 import type { ElementLike } from 'diagram-js/lib/core/Types';
 
@@ -179,15 +180,15 @@ export function getVersionInstances(instances: ExtendedInstanceInfo[], version?:
   return instances.filter((instance) => instance.processVersion === version);
 }
 
-export function getLatestDeployment(deployments: StoredDeployment[]) {
-  return deployments.reduce(
+export function getLatestVersion(versions: Version[]) {
+  return versions.reduce(
     (latest, curr) => {
-      if (!latest || latest.deployTime.getTime() > curr.deployTime.getTime()) {
+      if (!latest || latest.createdOn.getTime() < curr.createdOn.getTime()) {
         return curr;
       }
       return latest;
     },
-    undefined as undefined | StoredDeployment,
+    undefined as undefined | Version,
   );
 }
 

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/[processId]/page.tsx

@@ -7,7 +7,7 @@ import { isUserErrorResponse } from '@/lib/user-error';
 import { getProcessDeployments } from '@/lib/data/deployment';
 
 async function Deployment({ processId, spaceId }: { processId: string; spaceId: string }) {
-  const deployments = await getProcessDeployments(spaceId, processId);
+  const deployments = await getProcessDeployments(spaceId, processId, undefined, true, true);
 
   if (isUserErrorResponse(deployments)) {
     return (

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/[processId]/process-deployment-view.tsx

@@ -26,7 +26,7 @@ import { ColorOptions, colorOptions } from './instance-coloring';
 import { RemoveReadOnly, truthyFilter } from '@/lib/typescript-utils';
 import type { ElementLike } from 'diagram-js/lib/core/Types';
 import { wrapServerCall } from '@/lib/wrap-server-call';
-import { getLatestDeployment, getVersionInstances, getYoungestInstance } from './instance-helpers';
+import { getLatestVersion, getVersionInstances, getYoungestInstance } from './instance-helpers';
 
 import useColors from './use-colors';
 import useTokens from './use-tokens';
@@ -53,8 +53,8 @@ import { useQuery } from '@tanstack/react-query';
 import { getProcessDeployments } from '@/lib/data/deployment';
 import { isSuccessResponse, isUserErrorResponse, userError } from '@/lib/user-error';
 import { getInstance } from '@/lib/data/instance';
-import { asyncMap, pick } from '@/lib/helpers/javascriptHelpers';
-import { getProcessBPMN } from '@/lib/data/processes';
+import { asyncFilter, asyncMap, pick } from '@/lib/helpers/javascriptHelpers';
+import { getVersions } from '@/lib/data/processes';
 import { enableInstanceCSVExport } from 'FeatureFlags';
 import jsonToCsvExport from 'json-to-csv-export';
 
@@ -80,10 +80,40 @@ export default function ProcessDeploymentView({ processId }: { processId: string
   const canvasRef = useRef<BPMNCanvasRef>(null);
   const [infoPanelOpen, setInfoPanelOpen] = useState(false);
 
+  const isExecutableVersionMap = useRef<Record<string, boolean>>({});
+
+  const { data: versions } = useQuery({
+    queryFn: async () => {
+      let versions = await getVersions(spaceId, processId);
+      if (isUserErrorResponse(versions)) return [];
+
+      // filter out all versions that are not executable
+      versions = await asyncFilter(versions, async (version) => {
+        if (version.id in isExecutableVersionMap.current) {
+          return isExecutableVersionMap.current[version.id];
+        }
+
+        const bpmnObj = await toBpmnObject(version.bpmn);
+        const processes = getElementsByTagName(bpmnObj, 'bpmn:Process');
+        if (!processes.length) return false;
+        isExecutableVersionMap.current[version.id] = processes[0].isExecutable;
+        return processes[0].isExecutable;
+      });
+
+      versions.sort((a, b) => {
+        return b.createdOn.getTime() - a.createdOn.getTime();
+      });
+
+      return versions;
+    },
+    queryKey: ['processVersions', spaceId, processId],
+    refetchInterval: 1000,
+  });
+
   // get information where the process is deployed and which instances exist
   const { data: deployments, refetch: refetchDeployments } = useQuery({
     queryFn: async () => {
-      const deployments = await getProcessDeployments(spaceId, processId);
+      const deployments = await getProcessDeployments(spaceId, processId, undefined, true, true);
       if (isUserErrorResponse(deployments)) return null;
       return deployments;
     },
@@ -130,8 +160,8 @@ export default function ProcessDeploymentView({ processId }: { processId: string
   const { selectedVersion, versionInstances, currentVersion } = useMemo(() => {
     let selectedVersion, versionInstances, currentVersion;
 
-    if (deployments?.length) {
-      selectedVersion = deployments.find((d) => d.versionId === selectedVersionId)?.version;
+    if (versions?.length) {
+      selectedVersion = versions.find((v) => v.id === selectedVersionId);
 
       // sort instances newest first
       const rawInstances = getVersionInstances(knownInstances, selectedVersionId);
@@ -143,21 +173,21 @@ export default function ProcessDeploymentView({ processId }: { processId: string
         ? versionInstances.find((i) => i.processInstanceId === selectedInstanceId)
         : undefined;
 
-      let currentVersionId = getLatestDeployment(deployments)!.versionId;
+      let currentVersionId = getLatestVersion(versions)!.id;
       if (selectedInstance) {
         currentVersionId = selectedInstance.processVersion;
       } else if (selectedVersionId) {
         currentVersionId = selectedVersionId;
       }
-      currentVersion = deployments.find((d) => d.versionId === currentVersionId)!.version;
+      currentVersion = versions.find((v) => v.id === currentVersionId);
     }
 
     return {
       selectedVersion,
       versionInstances,
       currentVersion,
     };
-  }, [deployments, knownInstances, selectedVersionId, selectedInstanceId]);
+  }, [versions, knownInstances, selectedVersionId, selectedInstanceId]);
 
   const { data: currentInstance, refetch: refetchCurrentInstance } = useQuery({
     queryKey: ['processDeployments', spaceId, processId, 'instance', selectedInstanceId],
@@ -179,9 +209,7 @@ export default function ProcessDeploymentView({ processId }: { processId: string
 
   const { data: selectedBpmn } = useQuery({
     queryFn: async () => {
-      const bpmn = await getProcessBPMN(processId, spaceId, currentVersion?.id);
-      if (isUserErrorResponse(bpmn)) return undefined;
-      return { bpmn };
+      return { bpmn: currentVersion?.bpmn || '' };
     },
     queryKey: ['space', spaceId, 'process', processId, 'version', currentVersion?.id || '', 'bpmn'],
   });
@@ -320,11 +348,11 @@ export default function ProcessDeploymentView({ processId }: { processId: string
                             },
                           ]
                         : []),
-                      ...deployments.map(({ version }) => ({
-                        label: version.name,
-                        key: `${version.id}`,
+                      ...(versions?.map((v) => ({
+                        key: v.id,
+                        label: v.name,
                         disabled: false,
-                      })),
+                      })) || []),
                     ],
                     selectable: true,
                     onSelect: ({ key }) => {
@@ -375,14 +403,7 @@ export default function ProcessDeploymentView({ processId }: { processId: string
                       setStartingInstance(true);
                       await wrapServerCall({
                         fn: async () => {
-                          const latestDeployment = getLatestDeployment(deployments);
-                          if (!latestDeployment) {
-                            return userError(
-                              'The current process does not seem to be deployed anymore.',
-                            );
-                          }
-
-                          const { versionId } = latestDeployment;
+                          const { id: versionId } = currentVersion!;
 
                           let startForm = await getProcessStartForm(spaceId, processId, versionId);
 
@@ -454,7 +475,7 @@ export default function ProcessDeploymentView({ processId }: { processId: string
                     onClick={async () => {
                       setTogglingActivation(true);
                       const nextState = !isProcessActivated;
-                      const versionId = getLatestDeployment(deployments)!.versionId;
+                      const versionId = currentVersion!.id;
                       await wrapServerCall({
                         fn: () =>
                           changeDeploymentActivation(processId, spaceId, versionId, nextState),
@@ -644,10 +665,10 @@ export default function ProcessDeploymentView({ processId }: { processId: string
             // start the instance with the initial variable values from the start form
             await wrapServerCall({
               fn: async () => {
-                const deployment = getLatestDeployment(deployments);
-
-                if (!deployment) {
-                  return userError('The current process does not seem to be deployed.');
+                if (!currentVersion) {
+                  return userError(
+                    'The current process does not seem to have versions to execute.',
+                  );
                 }
 
                 const mappedVariables: Record<string, { value: any }> = {};
@@ -659,8 +680,8 @@ export default function ProcessDeploymentView({ processId }: { processId: string
 
                 return startInstance(
                   spaceId,
-                  deployment.processId,
-                  deployment.version.id,
+                  currentVersion.processId,
+                  currentVersion.id,
                   mappedVariables,
                   true,
                 );

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/[processId]/status-tag.tsx

@@ -0,0 +1,61 @@
+import React, { ReactNode } from 'react';
+import { statusToType } from './instance-helpers';
+import type { ElementLike } from 'diagram-js/lib/core/Types';
+import { ExtendedInstanceInfo } from '@/lib/data/instance';
+import {
+  CheckCircleOutlined,
+  ClockCircleOutlined,
+  CloseCircleOutlined,
+  ExclamationCircleOutlined,
+  SyncOutlined,
+} from '@ant-design/icons';
+import { Tag } from 'antd';
+
+export const StatusTag = ({
+  processId,
+  element,
+  instance,
+}: {
+  processId: string;
+  element?: ElementLike;
+  instance?: ExtendedInstanceInfo;
+}) => {
+  // Element status
+  const isRootElement = element && element.type === 'bpmn:Process';
+  let status = undefined;
+  if (isRootElement && instance) {
+    status = instance.instanceState.reduce((overallState, state) => {
+      return ['ENDED', 'STOPPED'].includes(overallState) ? state : overallState;
+    });
+  } else if (element && instance) {
+    const elementInfo = instance.log.find((l) => l.flowElementId == element.id);
+    if (elementInfo) {
+      status = elementInfo.executionState;
+    } else {
+      const tokenInfo = instance.tokens.find((l) => l.currentFlowElementId == element.id);
+      status = tokenInfo ? tokenInfo.currentFlowNodeState : 'WAITING';
+    }
+  }
+  const statusType = status && statusToType(status);
+  const presets: Record<string, ReactNode> = {
+    READY: <CheckCircleOutlined />,
+    COMPLETED: <CheckCircleOutlined />,
+    RUNNING: <SyncOutlined spin />,
+    info: <ExclamationCircleOutlined />,
+    warning: <ExclamationCircleOutlined />,
+    STOPPED: <CloseCircleOutlined />,
+    WAITING: <ClockCircleOutlined />,
+  };
+  return (
+    status &&
+    statusType && (
+      <Tag
+        key={status}
+        color={statusType}
+        icon={status ? presets[status] : <ClockCircleOutlined />}
+      >
+        {status}
+      </Tag>
+    )
+  );
+};

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/deployments-list.tsx

@@ -11,7 +11,7 @@ import processListStyles from '@/components/process-icon-list.module.scss';
 type InputItem = {
   id: string;
   name: string;
-  versions: { id: string; name: string }[];
+  versions: { id: string; name: string; deployed: boolean }[];
   instances: string[];
 };
 export type DeployedProcessListProcess = ReplaceKeysWithHighlighted<InputItem, 'name'>;
@@ -95,9 +95,13 @@ const DeploymentsList = ({
       dataIndex: 'id',
       key: 'Meta Data Button',
       title: '',
-      render: () => {
+      render: (_, record) => {
         return (
-          <Button style={{ float: 'right' }} type="text">
+          <Button
+            style={{ float: 'right' }}
+            type="text"
+            disabled={record.versions.every((v) => !v.deployed)}
+          >
             <DeleteOutlined color="red" />
           </Button>
         );
@@ -138,6 +142,7 @@ const DeploymentsList = ({
                   style={{ float: 'right' }}
                   type="text"
                   onClick={() => removeDeployment(record.id)}
+                  disabled={record.versions.every((v) => !v.deployed)}
                 >
                   <DeleteOutlined color="red" />
                 </Button>