feat(api-service): add activity feed link to trigger response

apps/api/src/app/environments-v1/usecases/get-my-environments/get-my-environments.usecase.ts

@@ -48,7 +48,7 @@ export class GetMyEnvironments {
   }
 }
 
-function shortenEnvironmentName(name: string): string {
+export function shortenEnvironmentName(name: string): string {
   const mapToShotEnvName: Record<EnvironmentEnum, string> = {
     [EnvironmentEnum.PRODUCTION]: 'prod',
     [EnvironmentEnum.DEVELOPMENT]: 'dev',

apps/api/src/app/events/dtos/trigger-event-response.dto.ts

@@ -37,6 +37,15 @@ export class TriggerEventResponseDto {
   @IsString()
   transactionId?: string;
 
+  @ApiProperty({
+    description: 'Link to the activity feed for this trigger event',
+    type: String,
+    required: false,
+  })
+  @IsOptional()
+  @IsString()
+  activityFeedLink?: string;
+
   @IsOptional()
   jobData?: IWorkflowDataDto;
 }

apps/api/src/app/events/events.controller.ts

@@ -10,7 +10,6 @@ import {
   TriggerRequestCategoryEnum,
   UserSessionData,
 } from '@novu/shared';
-import { v4 as uuidv4 } from 'uuid';
 import { PayloadValidationExceptionDto } from '../../error-dto';
 import { RequireAuthentication } from '../auth/framework/auth.decorator';
 import { ExternalApiAccessible } from '../auth/framework/external-api.decorator';
@@ -178,8 +177,6 @@ export class EventsController {
     @Body() body: TriggerEventToAllRequestDto,
     @Req() req: RequestWithReqId
   ): Promise<TriggerEventResponseDto> {
-    const transactionId = body.transactionId || uuidv4();
-
     return this.triggerEventToAll.execute(
       TriggerEventToAllCommand.create({
         userId: user._id,
@@ -188,7 +185,7 @@ export class EventsController {
         identifier: body.name,
         payload: body.payload,
         tenant: body.tenant,
-        transactionId,
+        transactionId: body.transactionId,
         overrides: body.overrides || {},
         actor: body.actor,
         context: body.context,

apps/api/src/app/events/usecases/parse-event-request/parse-event-request.usecase.ts

@@ -379,10 +379,12 @@ export class ParseEventRequest {
       );
     }
 
+    const activityFeedLink = `${process.env.FRONT_BASE_URL}/env/${command.environmentId}/activity/requests?selectedLogId=${requestId}`;
     return {
       acknowledged: true,
       status: TriggerEventStatusEnum.PROCESSED,
       transactionId,
+      activityFeedLink,
       jobData: command.skipQueueInsertion ? jobData : undefined,
     };
   }

apps/api/src/app/events/usecases/trigger-event-to-all/trigger-event-to-all.command.ts

@@ -13,8 +13,8 @@ export class TriggerEventToAllCommand extends EnvironmentWithUserCommand {
   payload: any;
 
   @IsString()
-  @IsDefined()
-  transactionId: string;
+  @IsOptional()
+  transactionId?: string;
 
   @IsObject()
   @IsOptional()

apps/api/src/app/events/usecases/trigger-event-to-all/trigger-event-to-all.usecase.ts

@@ -8,7 +8,7 @@ export class TriggerEventToAll {
   constructor(private parseEventRequest: ParseEventRequest) {}
 
   public async execute(command: TriggerEventToAllCommand) {
-    await this.parseEventRequest.execute(
+    const result = await this.parseEventRequest.execute(
       ParseEventRequestBroadcastCommand.create({
         userId: command.userId,
         environmentId: command.environmentId,
@@ -27,10 +27,6 @@ export class TriggerEventToAll {
       })
     );
 
-    return {
-      acknowledged: true,
-      status: TriggerEventStatusEnum.PROCESSED,
-      transactionId: command.transactionId,
-    };
+    return result;
   }
 }

apps/api/src/app/shared/helpers/build-slug.ts

@@ -7,6 +7,6 @@ const SLUG_DELIMITER = '_';
  * Builds a slug for a step based on the step name, the short prefix and the internal ID.
  * @returns The slug for the entity, example:  slug: "workflow-name_wf_AbC1Xyz9KlmNOpQr"
  */
-export function buildSlug(entityName: string, shortIsPrefix: ShortIsPrefixEnum, internalId: string): Slug {
-  return `${slugify(entityName)}${SLUG_DELIMITER}${shortIsPrefix}${encodeBase62(internalId)}`;
+export function buildSlug(entityName: string, shortIdPrefix: ShortIsPrefixEnum, internalId: string): Slug {
+  return `${slugify(entityName)}${SLUG_DELIMITER}${shortIdPrefix}${encodeBase62(internalId)}`;
 }

apps/dashboard/src/context/environment/environment-provider.tsx

@@ -19,8 +19,11 @@ function selectEnvironment(
   let environment: IEnvironment | undefined;
 
   // Find the environment based on the current user's last environment
+  // Support both slug and _id
   if (selectedEnvironmentSlug) {
-    environment = environments.find((env) => env.slug === selectedEnvironmentSlug);
+    environment = environments.find(
+      (env) => env.slug === selectedEnvironmentSlug || env._id === selectedEnvironmentSlug
+    );
   }
 
   // If no environment slug in URL, try to load the last selected environment from storage
@@ -49,7 +52,8 @@ function selectEnvironment(
 export function EnvironmentProvider({ children }: { children: React.ReactNode }) {
   const { currentOrganization } = useAuth();
   const navigate = useNavigate();
-  const { pathname } = useLocation();
+  const location = useLocation();
+  const { pathname, search, hash } = location;
   const { environmentSlug: paramsEnvironmentSlug } = useParams<{ environmentSlug?: string }>();
   const [currentEnvironment, setCurrentEnvironment] = useState<IEnvironment>();
 
@@ -58,7 +62,8 @@ export function EnvironmentProvider({ children }: { children: React.ReactNode })
       const selectedEnvironment = selectEnvironment(allEnvironments, environmentSlug, currentOrganization?._id);
       setCurrentEnvironment(selectedEnvironment);
       const newEnvironmentSlug = selectedEnvironment.slug;
-      const isNewEnvironmentDifferent = paramsEnvironmentSlug !== selectedEnvironment.slug;
+      const isNewEnvironmentDifferent =
+        paramsEnvironmentSlug !== selectedEnvironment.slug && paramsEnvironmentSlug !== selectedEnvironment._id;
 
       // Save the selected environment to localStorage for persistence
       if (currentOrganization?._id && newEnvironmentSlug) {
@@ -70,14 +75,13 @@ export function EnvironmentProvider({ children }: { children: React.ReactNode })
       }
 
       if (pathname === ROUTES.ROOT || pathname === ROUTES.ENV || pathname === `${ROUTES.ENV}/`) {
-        // TODO: check if this ROUTES is correct
         navigate(buildRoute(ROUTES.WORKFLOWS, { environmentSlug: newEnvironmentSlug ?? '' }));
       } else if (pathname.includes(ROUTES.ENV) && isNewEnvironmentDifferent) {
         const newPath = pathname.replace(/\/env\/[^/]+(\/|$)/, `${ROUTES.ENV}/${newEnvironmentSlug}$1`);
-        navigate(newPath);
+        navigate(`${newPath}${search}${hash}`);
       }
     },
-    [navigate, pathname, paramsEnvironmentSlug, currentOrganization?._id]
+    [navigate, pathname, search, hash, paramsEnvironmentSlug, currentOrganization?._id]
   );
 
   const { environments, areEnvironmentsInitialLoading } = useFetchEnvironments({