Merge pull request #3860 from novuhq/NV-2602-hide-tenant-functionalit…

…y-under-the-feature-flag NV 2602 - Hide Tenant functionality under the feature flag
novuhq · Jul 30, 2023 · 5dcfd48 · 5dcfd48
2 parents eb55742 + b0eb86c
commit 5dcfd48
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/apps/api/src/app/tenant/e2e/get-tenants.e2e.ts b/apps/api/src/app/tenant/e2e/get-tenants.e2e.ts
@@ -31,8 +31,8 @@ describe('Get Tenants List- /tenants (GET)', function () {
     expect(data.pageSize).to.equal(10);
     expect(data.hasMore).to.equal(false);
     expect(data.data.length).to.equal(5);
-    expect(data.data[0].identifier).to.equal('identifier_0');
-    expect(data.data[4].identifier).to.equal('identifier_4');
+    expect(data.data[0].identifier).to.equal('identifier_4');
+    expect(data.data[4].identifier).to.equal('identifier_0');
   });
 
   it('should get second page of tenants', async function () {
@@ -53,8 +53,8 @@ describe('Get Tenants List- /tenants (GET)', function () {
     expect(data.pageSize).to.equal(5);
     expect(data.hasMore).to.equal(false);
     expect(data.data.length).to.equal(4);
-    expect(data.data[0].identifier).to.equal('identifier_5');
-    expect(data.data[3].identifier).to.equal('identifier_8');
+    expect(data.data[0].identifier).to.equal('identifier_3');
+    expect(data.data[3].identifier).to.equal('identifier_0');
   });
 
   it('should get tenants by pagination', async function () {

diff --git a/apps/api/src/app/tenant/usecases/get-tenants/get-tenants.usecase.ts b/apps/api/src/app/tenant/usecases/get-tenants/get-tenants.usecase.ts
@@ -27,6 +27,7 @@ export class GetTenants {
       {
         limit: command.limit,
         skip: command.page * command.limit,
+        sort: { createdAt: -1 },
       }
     );
 

diff --git a/apps/web/src/components/layout/components/SideNav.tsx b/apps/web/src/components/layout/components/SideNav.tsx
@@ -24,7 +24,7 @@ import {
   Buildings,
 } from '../../../design-system/icons';
 import { ChangesCountBadge } from './ChangesCountBadge';
-import { useEnvController } from '../../../hooks';
+import { useEnvController, useIsMultiTenancyEnabled } from '../../../hooks';
 import OrganizationSelect from './OrganizationSelect';
 import { useSpotlightContext } from '../../providers/SpotlightProvider';
 import { HEADER_HEIGHT } from '../constants';
@@ -62,6 +62,7 @@ export function SideNav({}: Props) {
   const dark = colorScheme === 'dark';
   const { addItem, removeItems } = useSpotlightContext();
   const { classes } = usePopoverStyles();
+  const isMultiTenancyEnabled = useIsMultiTenancyEnabled();
 
   useEffect(() => {
     removeItems(['toggle-environment']);
@@ -89,7 +90,13 @@ export function SideNav({}: Props) {
       testId: 'side-nav-quickstart-link',
     },
     { icon: <Bolt />, link: ROUTES.WORKFLOWS, label: 'Workflows', testId: 'side-nav-templates-link' },
-    { icon: <Buildings />, link: ROUTES.TENANTS, label: 'Tenants', testId: 'side-nav-tenants-link' },
+    {
+      condition: isMultiTenancyEnabled,
+      icon: <Buildings />,
+      link: ROUTES.TENANTS,
+      label: 'Tenants',
+      testId: 'side-nav-tenants-link',
+    },
     {
       icon: <Team />,
       link: ROUTES.SUBSCRIBERS,
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ export class GetTenants { @@
           {
             limit: command.limit,
             skip: command.page * command.limit,
+            sort: { createdAt: -1 },
           }
         );
@@ Expand Down @@