PS-916 stop using bulk for less than 10 subscribers (#627)

* PS-916 stop using bulk for less than 10 subscribers

* PS-916 novu: create topic even if no notification sent

* upgrade novu, remove novu-studio, fix pdf player display context

* remove novu transaction Id which is now interpreted differently

Author: 4rthem

.env

@@ -337,15 +337,14 @@ SOKETI_APP_ID=phrasea
 SOKETI_KEY=__CHANGE_ME_hJBgAG4vnPrT58Ty
 SOKETI_SECRET=__CHANGE_ME_A8PRgk5qpfLxkfLU
 
-NOVU_VERSION=2.1.1
+NOVU_VERSION=2.3.0
 NOTIFY_AUTHOR=0
 NOVU_APPLICATION_IDENTIFIER=
 NOVU_SUBSCRIBER_ID=
 NOVU_API_HOST=api-novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}
 NOVU_API_URL="${NOVU_API_URL:-https://${NOVU_API_HOST}}"
 NOVU_DASHBOARD_URL=https://novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}
 NOVU_WS_URL=https://ws-novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}
-NOVU_STUDIO_URL=https://studio-novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}
 NOVU_BRIDGE_URL=https://bridge-novu.${PHRASEA_DOMAIN}${HTTPS_PORT_PREFIX}
 
 NOVU_REDIS_HOST=redis

bin/dev/install.sh

@@ -2,6 +2,8 @@
 
 . bin/vars.sh
 
+(cd novu/bridge && pnpm install)
+
 pnpm install
 
 bin/dev/sf-all.sh composer install

dashboard/client/config-compiler.js

@@ -35,7 +35,6 @@
         'ZIPPY_URL',
         'SOKETI_USAGE_URL',
         'NOVU_DASHBOARD_URL',
-        'NOVU_STUDIO_URL',
     ];
 
     const e = {};

dashboard/client/src/Dashboard.tsx

@@ -47,7 +47,6 @@ export default function Dashboard({}: Props) {
         TRAEFIK_CONSOLE_URL,
         SOKETI_USAGE_URL,
         NOVU_DASHBOARD_URL,
-        NOVU_STUDIO_URL,
     } = config.env;
 
     const roles = user?.roles ?? [];
@@ -283,17 +282,6 @@ export default function Dashboard({}: Props) {
                             </Link>
                         </Grid>
                     )}
-                    {config.devMode && NOVU_STUDIO_URL && (
-                        <Grid item>
-                            <Link
-                                href={NOVU_STUDIO_URL}
-                                target={'_blank'}
-                                rel={'noreferrer noopener'}
-                            >
-                                Novu Studio
-                            </Link>
-                        </Grid>
-                    )}
                 </Grid>
             )}
         </Container>

dashboard/client/src/config.ts

@@ -28,7 +28,6 @@ declare global {
                 SOKETI_USAGE_URL: string;
                 NOVU_DASHBOARD_URL: string;
                 NOVU_BRIDGE_URL: string;
-                NOVU_STUDIO_URL: string;
             };
         } & WindowConfig;
     }

databox/api/src/Asset/ObjectNotifier.php

@@ -42,9 +42,10 @@ public function notifyObject(
                 }
 
                 if ($object->isAutoSubscribeOwner() && $object->getOwnerId()) {
-                    $this->notifier->addTopicSubscribers($topicKey, [$object->getOwnerId()]);
+                    $this->notifier->addTopicSubscribers($topicKey, [$object->getOwnerId()], direct: true);
                     $shouldNotify = true;
                 } else {
+                    $this->notifier->createTopic($topicKey);
                     $shouldNotify = false;
                 }
 

databox/api/src/Consumer/Handler/Discussion/PostDiscussionMessageHandler.php

@@ -39,9 +39,7 @@ public function __invoke(PostDiscussionMessage $message): void
             return;
         }
 
-        $notificationOptions = [
-            'transactionId' => $message->getId(),
-        ];
+        $notificationOptions = [];
 
         $object = $this->discussionManager->getThreadObject($message->getThread());
         $authorId = $message->getAuthorId();
@@ -88,7 +86,7 @@ public function __invoke(PostDiscussionMessage $message): void
         foreach ($mentions as $userId => $username) {
             $newSubscribers[] = $userId;
         }
-        $this->notifier->addTopicSubscribers($topicKey, array_unique($newSubscribers));
+        $this->notifier->addTopicSubscribers($topicKey, array_unique($newSubscribers), direct: true);
 
         $this->notifier->notifyTopic($topicKey, $authorId, $notificationId, $params, $notificationOptions);
     }

databox/api/src/Controller/Admin/AssetCrudController.php

@@ -19,6 +19,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Config\Filters;
 use EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext;
 use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\BooleanField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\Field;
 use EasyCorp\Bundle\EasyAdminBundle\Field\IntegerField;
@@ -135,5 +136,7 @@ public function configureFields(string $pageName): iterable
             ->onlyOnDetail();
         yield JsonField::new('notificationSettings')
             ->hideOnIndex();
+        yield BooleanField::new('autoSubscribeOwner')
+            ->hideOnIndex();
     }
 }

databox/api/src/Controller/Admin/CollectionCrudController.php

@@ -16,6 +16,7 @@
 use EasyCorp\Bundle\EasyAdminBundle\Dto\EntityDto;
 use EasyCorp\Bundle\EasyAdminBundle\Dto\SearchDto;
 use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\BooleanField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 use EasyCorp\Bundle\EasyAdminBundle\Filter\DateTimeFilter;
@@ -93,6 +94,8 @@ public function configureFields(string $pageName): iterable
             ->onlyOnDetail();
         yield JsonField::new('notificationSettings')
             ->hideOnIndex();
+        yield BooleanField::new('autoSubscribeOwner')
+            ->hideOnIndex();
 
     }
 }

databox/api/src/Controller/Admin/DashboardController.php

@@ -33,6 +33,7 @@
 use App\Entity\Core\Tag;
 use App\Entity\Core\TagFilterRule;
 use App\Entity\Core\Workspace;
+use App\Entity\Discussion\Thread;
 use App\Entity\Integration\IntegrationData;
 use App\Entity\Integration\IntegrationToken;
 use App\Entity\Integration\WorkspaceEnv;
@@ -129,6 +130,10 @@ public function configureMenuItems(): iterable
             MenuItem::linkToCrud('Job State', '', JobState::class),
         ];
 
+        $discussions = [
+            MenuItem::linkToCrud('Threads', '', Thread::class),
+        ];
+
         yield MenuItem::subMenu('Permission', 'fas fa-lock')->setSubItems($submenu1);
         yield MenuItem::subMenu('Core', 'fas fa-database')->setSubItems($submenu2);
         yield MenuItem::subMenu('Basket', 'fas fa-basket-shopping')->setSubItems($basket);
@@ -138,6 +143,7 @@ public function configureMenuItems(): iterable
         yield MenuItem::subMenu('Integration', 'fas fa-gear')->setSubItems($submenu4);
         yield MenuItem::subMenu('Workflow', 'fas fa-gears')->setSubItems($workflows);
         yield MenuItem::subMenu('Webhook', 'fas fa-network-wired')->setSubItems($webhookSubMenu);
+        yield MenuItem::subMenu('Discussions', 'fas fa-message')->setSubItems($discussions);
         yield MenuItem::linkToRoute('Notification', 'fas fa-bell', 'alchemy_notify_admin_index');
         yield MenuItem::linkToCrud('Global Config', 'fa fa-gear', ConfiguratorEntry::class);
         yield $this->createDevMenu();