chore(root): Release 2025-01-23 15:11 (#7573)

novuhq · Jan 23, 2025 · cae0d04 · cae0d04
2 parents ec9c1f4 + 6fea706
commit cae0d04
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 31 deletions.
diff --git a/apps/dashboard/src/components/create-environment-button.tsx b/apps/dashboard/src/components/create-environment-button.tsx
@@ -31,6 +31,8 @@ import { useForm } from 'react-hook-form';
 import { RiAddLine, RiArrowRightSLine } from 'react-icons/ri';
 import { useNavigate } from 'react-router-dom';
 import { z } from 'zod';
+import { useTelemetry } from '../hooks/use-telemetry';
+import { TelemetryEvent } from '../utils/telemetry';
 import { ColorPicker } from './primitives/color-picker';
 import { showErrorToast, showSuccessToast } from './primitives/sonner-helpers';
 import { Tooltip, TooltipContent, TooltipTrigger } from './primitives/tooltip';
@@ -74,10 +76,13 @@ export const CreateEnvironmentButton = (props: CreateEnvironmentButtonProps) =>
   const { mutateAsync, isPending } = useCreateEnvironment();
   const { subscription } = useFetchSubscription();
   const navigate = useNavigate();
+  const track = useTelemetry();
 
-  const isBusinessTier = subscription?.apiServiceLevel === ApiServiceLevelEnum.BUSINESS;
+  const isPaidTier =
+    subscription?.apiServiceLevel === ApiServiceLevelEnum.BUSINESS ||
+    subscription?.apiServiceLevel === ApiServiceLevelEnum.ENTERPRISE;
   const isTrialActive = subscription?.trial?.isActive;
-  const canCreateEnvironment = isBusinessTier && !isTrialActive;
+  const canCreateEnvironment = isPaidTier && !isTrialActive;
 
   const form = useForm<CreateEnvironmentFormData>({
     resolver: zodResolver(createEnvironmentSchema),
@@ -109,6 +114,10 @@ export const CreateEnvironmentButton = (props: CreateEnvironmentButtonProps) =>
   };
 
   const handleClick = () => {
+    track(TelemetryEvent.CREATE_ENVIRONMENT_CLICK, {
+      createAllowed: !!canCreateEnvironment,
+    });
+
     if (!canCreateEnvironment) {
       navigate(ROUTES.SETTINGS_BILLING);
       return;

diff --git a/apps/dashboard/src/components/workflow-editor/steps/digest/digest-control-values.tsx b/apps/dashboard/src/components/workflow-editor/steps/digest/digest-control-values.tsx
@@ -12,11 +12,11 @@ export const DigestControlValues = () => {
     return null;
   }
 
-  const { ['amount']: amount, ['unit']: unit, ['cron']: cron } = uiSchema.properties ?? {};
+  const { ['amount']: amount, ['digestKey']: digestKey, ['unit']: unit, ['cron']: cron } = uiSchema.properties ?? {};
 
   return (
     <div className="flex flex-col">
-      {/* {digestKey && (
+      {digestKey && (
         <>
           <SidebarContent size="lg">
             {getComponentByType({
@@ -25,7 +25,7 @@ export const DigestControlValues = () => {
           </SidebarContent>
           <Separator />
         </>
-      )} */}
+      )}
       {((amount && unit) || cron) && (
         <>
           <SidebarContent size="lg">

diff --git a/apps/dashboard/src/pages/environments.tsx b/apps/dashboard/src/pages/environments.tsx
@@ -1,9 +1,18 @@
 import { PageMeta } from '@/components/page-meta';
+import { useEffect } from 'react';
 import { CreateEnvironmentButton } from '../components/create-environment-button';
 import { DashboardLayout } from '../components/dashboard-layout';
 import { EnvironmentsList } from '../components/environments-list';
+import { useTelemetry } from '../hooks/use-telemetry';
+import { TelemetryEvent } from '../utils/telemetry';
 
 export function EnvironmentsPage() {
+  const track = useTelemetry();
+
+  useEffect(() => {
+    track(TelemetryEvent.ENVIRONMENTS_PAGE_VIEWED);
+  }, [track]);
+
   return (
     <>
       <PageMeta title={`Environments`} />

diff --git a/apps/dashboard/src/pages/workflows.tsx b/apps/dashboard/src/pages/workflows.tsx
@@ -115,7 +115,7 @@ export const WorkflowsPage = () => {
       buildRoute(ROUTES.TEMPLATE_STORE_CREATE_WORKFLOW, {
         environmentSlug: environmentSlug || '',
         templateId: template.id,
-      })
+      }) + '?source=template-store-card-row'
     );
   };
 
@@ -183,14 +183,13 @@ export const WorkflowsPage = () => {
                       </DropdownMenuItem>
                       <DropdownMenuItem
                         className="cursor-pointer"
-                        onSelect={() =>
+                        onSelect={() => {
                           navigate(
                             buildRoute(ROUTES.TEMPLATE_STORE, {
                               environmentSlug: environmentSlug || '',
-                              source: 'create-workflow-dropdown',
-                            })
-                          )
-                        }
+                            }) + '?source=create-workflow-dropdown'
+                          );
+                        }}
                       >
                         <RiFileMarkedLine />
                         View Workflow Gallery
@@ -224,8 +223,7 @@ export const WorkflowsPage = () => {
                     navigate(
                       buildRoute(ROUTES.TEMPLATE_STORE, {
                         environmentSlug: environmentSlug || '',
-                        source: 'start-with',
-                      })
+                      }) + '?source=start-with'
                     )
                   }
                   trailingIcon={RiArrowRightSLine}

diff --git a/apps/dashboard/src/utils/telemetry.ts b/apps/dashboard/src/utils/telemetry.ts
@@ -45,4 +45,6 @@ export enum TelemetryEvent {
   CREATE_WORKFLOW_CLICK = 'Create Workflow Click',
   GENERATE_WORKFLOW_CLICK = 'Generate Workflow Click',
   TEMPLATE_WORKFLOW_CLICK = 'Template Workflow Click',
+  ENVIRONMENTS_PAGE_VIEWED = 'Environments Page Viewed',
+  CREATE_ENVIRONMENT_CLICK = 'Create Environment Click',
 }
diff --git a/apps/worker/src/app/workflow/usecases/add-job/add-job.usecase.ts b/apps/worker/src/app/workflow/usecases/add-job/add-job.usecase.ts
@@ -261,12 +261,14 @@ export class AddJob {
   private async updateMetadata(response: ExecuteOutput, command: AddJobCommand) {
     let metadata = {} as IWorkflowStepMetadata;
     const outputs = response.outputs as DigestOutput;
+    // digest value is pre-computed by framework and passed as digestKey
+    const outputDigestValue = outputs?.digestKey;
     const digestType = getDigestType(outputs);
 
     if (isTimedDigestOutput(outputs)) {
       metadata = {
         type: DigestTypeEnum.TIMED,
-        digestKey: outputs?.digestKey,
+        digestValue: outputDigestValue,
         timed: { cronExpression: outputs?.cron },
       } as IDigestTimedMetadata;
 
@@ -278,7 +280,7 @@ export class AddJob {
         {
           $set: {
             'digest.type': metadata.type,
-            'digest.digestKey': metadata.digestKey,
+            'digest.digestValue': metadata.digestValue,
             'digest.amount': metadata.amount,
             'digest.unit': metadata.unit,
             'digest.timed.cronExpression': metadata.timed?.cronExpression,
@@ -291,7 +293,7 @@ export class AddJob {
       metadata = {
         type: digestType,
         amount: outputs?.amount,
-        digestKey: outputs?.digestKey,
+        digestValue: outputDigestValue,
         unit: outputs.unit ? castUnitToDigestUnitEnum(outputs?.unit) : undefined,
         backoff: digestType === DigestTypeEnum.BACKOFF,
         backoffAmount: outputs.lookBackWindow?.amount,
@@ -306,7 +308,7 @@ export class AddJob {
         {
           $set: {
             'digest.type': metadata.type,
-            'digest.digestKey': metadata.digestKey,
+            'digest.digestValue': metadata.digestValue,
             'digest.amount': metadata.amount,
             'digest.unit': metadata.unit,
             'digest.backoff': metadata.backoff,
@@ -321,7 +323,7 @@ export class AddJob {
       metadata = {
         type: digestType,
         amount: outputs?.amount,
-        digestKey: outputs?.digestKey,
+        digestValue: outputDigestValue,
         unit: outputs.unit ? castUnitToDigestUnitEnum(outputs?.unit) : undefined,
       } as IDigestRegularMetadata;
 
@@ -333,7 +335,7 @@ export class AddJob {
         {
           $set: {
             'digest.type': metadata.type,
-            'digest.digestKey': metadata.digestKey,
+            'digest.digestValue': metadata.digestValue,
             'digest.amount': metadata.amount,
             'digest.unit': metadata.unit,
           },

diff --git a/apps/worker/src/app/workflow/usecases/add-job/merge-or-create-digest.usecase.ts b/apps/worker/src/app/workflow/usecases/add-job/merge-or-create-digest.usecase.ts
@@ -47,7 +47,7 @@ export class MergeOrCreateDigest {
 
     const digestMeta = job.digest as IDigestBaseMetadata;
     const digestKey = digestMeta?.digestKey;
-    const digestValue = getNestedValue(job.payload, digestKey);
+    const digestValue = digestMeta?.digestValue ?? getNestedValue(job.payload, digestKey);
 
     const digestAction = command.filtered
       ? { digestResult: DigestCreationResultEnum.SKIPPED }
@@ -150,9 +150,13 @@ export class MergeOrCreateDigest {
   }
 
   private getLockKey(job: JobEntity, digestKey: string | undefined, digestValue: string | number | undefined): string {
-    let resource = `environment:${job._environmentId}:template:${job._templateId}:subscriber:${job._subscriberId}`;
+    const resource = `environment:${job._environmentId}:template:${job._templateId}:subscriber:${job._subscriberId}`;
     if (digestKey && digestValue) {
-      resource = `${resource}:digestKey:${digestKey}:digestValue:${digestValue}`;
+      return `${resource}:digestKey:${digestKey}:digestValue:${digestValue}`;
+    }
+
+    if (digestValue) {
+      return `${resource}:digestValue:${digestValue}`;
     }
 
     return resource;

diff --git a/libs/dal/src/repositories/job/job.repository.ts b/libs/dal/src/repositories/job/job.repository.ts
@@ -189,9 +189,10 @@ export class JobRepository extends BaseRepository<JobDBModel, JobEntity, Enforce
       job.digest?.type === DigestTypeEnum.BACKOFF ||
       (job.digest as IDigestRegularMetadata)?.backoff ||
       (digestMeta?.backoff && digestMeta?.backoff);
+    const digestQuery = this.buildDigestQuery(digestKey, digestValue);
 
     if (isBackoff) {
-      const trigger = await this.getTrigger(job, digestMeta, digestKey, digestValue);
+      const trigger = await this.getTriggerJob(job, digestMeta, digestQuery);
       if (!trigger) {
         return {
           digestResult: DigestCreationResultEnum.SKIPPED,
@@ -219,7 +220,7 @@ export class JobRepository extends BaseRepository<JobDBModel, JobEntity, Enforce
         _templateId: job._templateId,
         _environmentId: this.convertStringToObjectId(job._environmentId),
         _subscriberId: this.convertStringToObjectId(job._subscriberId),
-        ...(digestKey && { [`payload.${digestKey}`]: digestValue }),
+        ...digestQuery,
       },
       '_id _notificationId'
     );
@@ -252,18 +253,22 @@ export class JobRepository extends BaseRepository<JobDBModel, JobEntity, Enforce
     };
   }
 
+  private buildDigestQuery(digestKey: string | undefined, digestValue: string | number | undefined) {
+    const digestQueryV1 = digestKey ? { [`payload.${digestKey}`]: digestValue } : null;
+    // Digest key parsing is handled by the framework, leaving only the digest value available here
+    const digestQueryV2 = !digestKey && digestValue ? { [`digest.digestValue`]: digestValue } : null;
+    const digestQuery = digestQueryV1 || digestQueryV2;
+
+    return digestQuery || {};
+  }
+
   private getBackoffDate(metadata: IDigestRegularMetadata | undefined) {
     return sub(new Date(), {
       [metadata?.backoffUnit as string]: metadata?.backoffAmount,
     });
   }
 
-  private getTrigger(
-    job: JobEntity,
-    metadata?: IDigestRegularMetadata,
-    digestKey?: string,
-    digestValue?: string | number
-  ) {
+  private getTriggerJob(job: JobEntity, metadata?: IDigestRegularMetadata, digestQuery?: Record<string, unknown>) {
     const query = {
       updatedAt: {
         $gte: this.getBackoffDate(metadata),
@@ -276,7 +281,7 @@ export class JobRepository extends BaseRepository<JobDBModel, JobEntity, Enforce
       type: StepTypeEnum.TRIGGER,
       _environmentId: job._environmentId,
       _subscriberId: job._subscriberId,
-      ...(digestKey && { [`payload.${digestKey}`]: digestValue }),
+      ...digestQuery,
     };
 
     return this.findOne(query);

diff --git a/libs/dal/src/repositories/job/job.schema.ts b/libs/dal/src/repositories/job/job.schema.ts
@@ -79,6 +79,9 @@ const jobSchema = new Schema<JobDBModel>(
       digestKey: {
         type: Schema.Types.String,
       },
+      digestValue: {
+        type: Schema.Types.String,
+      },
       type: {
         type: Schema.Types.String,
       },

diff --git a/packages/shared/src/entities/step/index.ts b/packages/shared/src/entities/step/index.ts
@@ -88,6 +88,7 @@ export interface IAmountAndUnitDigest {
 
 export interface IDigestBaseMetadata extends IAmountAndUnitDigest {
   digestKey?: string;
+  digestValue?: string;
 }
 
 export interface IDigestRegularMetadata extends IDigestBaseMetadata {