Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stacked PR's Branch for Tenants Support #3889

Merged
merged 40 commits into from
Aug 1, 2023
Merged

Stacked PR's Branch for Tenants Support #3889

merged 40 commits into from
Aug 1, 2023

Commits on Jul 24, 2023

  1. feat: tenant feature flag hook

    @djabarovgeorge
    djabarovgeorge committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    f1d3ba7 View commit details
    Browse the repository at this point in the history

  2. feat: add tenants route and shell page component

    @djabarovgeorge
    djabarovgeorge committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    e1f49d1 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. feat: update tenants nav icon

    @djabarovgeorge
    djabarovgeorge committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    d2a74e9 View commit details
    Browse the repository at this point in the history

  2. refactor: curr file structure

    @djabarovgeorge
    djabarovgeorge committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    d8e0fe2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3847 from novuhq/NV-2560-tenants-page-route-and-s… 

    …hell

feat: add tenants route and shell page component
    @djabarovgeorge
    djabarovgeorge authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    36ad13d View commit details
    Browse the repository at this point in the history

  4. feat: add initial tenants ui

    @djabarovgeorge
    djabarovgeorge committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    fc75970 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. feat: refactor to es6

    @djabarovgeorge
    djabarovgeorge committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    ca82905 View commit details
    Browse the repository at this point in the history

  2. feat: add empty state

    @djabarovgeorge
    djabarovgeorge committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    c25ddb8 View commit details
    Browse the repository at this point in the history

  3. feat: update after pr comments

    @djabarovgeorge
    djabarovgeorge committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    e557d61 View commit details
    Browse the repository at this point in the history

  4. feat: add tenants minimal pagination

    @djabarovgeorge
    djabarovgeorge committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    939f5c0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3846 from novuhq/NV-2601-add-support-in-the-clien… 

    …t-for-tenant-feature

NV-2601 - Add support in the client for tenant feature
    @djabarovgeorge
    djabarovgeorge authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    19cfdd9 View commit details
    Browse the repository at this point in the history

  6. feat: update after pr comments

    @djabarovgeorge
    djabarovgeorge committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4cd0206 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'NV-2611-initial-tenants-page-ui' into NV-2612-tenant-pa… 

    …ge-empty-state

# Conflicts:
#	apps/web/src/pages/tenants/components/list/TenantsList.tsx
    @djabarovgeorge
    djabarovgeorge committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    d39dc46 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'NV-2612-tenant-page-empty-state' into NV-2613-tenant-pa… 

    …ge-pagination

# Conflicts:
#	apps/web/src/pages/tenants/components/list/TenantsList.tsx
    @djabarovgeorge
    djabarovgeorge committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    3b50977 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #3855 from novuhq/NV-2611-initial-tenants-page-ui 

    feat: add initial tenants ui
    @djabarovgeorge
    djabarovgeorge authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    0c7a917 View commit details
    Browse the repository at this point in the history

  10. feat: create and update tenant sidebar

    @ainouzgali
    ainouzgali committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    5cc66a0 View commit details
    Browse the repository at this point in the history

  11. feat: hide tenants under feature flag

    @djabarovgeorge
    djabarovgeorge committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    53c7f75 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #3857 from novuhq/NV-2612-tenant-page-empty-state 

    Nv 2612 - Tenant Page Empty State
    @djabarovgeorge
    djabarovgeorge authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    0c79c30 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Merge remote-tracking branch 'origin/stacked-tenants-support' into nv… 

    …-2452-tenant-create-a-tenant-sidebar

# Conflicts:
#	apps/web/src/pages/tenants/components/list/TenantsList.tsx
    @ainouzgali
    ainouzgali committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    0e1d220 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3859 from novuhq/NV-2613-tenant-page-pagination 

    NV 2613 - Tenant Page Pagination
    @djabarovgeorge
    djabarovgeorge authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    eb55742 View commit details
    Browse the repository at this point in the history

  3. feat: update after pr comments

    @djabarovgeorge
    djabarovgeorge committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    69a447b View commit details
    Browse the repository at this point in the history

  4. fix: tenants order

    @djabarovgeorge
    djabarovgeorge committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    e92099a View commit details
    Browse the repository at this point in the history

  5. fix: tests with the new pagination order

    @djabarovgeorge
    djabarovgeorge committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    b0eb86c View commit details
    Browse the repository at this point in the history

  6. feat: after pr comments

    @ainouzgali
    ainouzgali committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    247ad91 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/stacked-tenants-support' into nv… 

    …-2452-tenant-create-a-tenant-sidebar

# Conflicts:
#	apps/web/src/pages/tenants/components/list/TenantsList.tsx
    @ainouzgali
    ainouzgali committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    19c17cf View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2023

  1. 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
    @djabarovgeorge
    djabarovgeorge authored Jul 30, 2023
    Configuration menu
    Copy the full SHA
    5dcfd48 View commit details
    Browse the repository at this point in the history

  2. fix: allow return 'data' as response prop

    @djabarovgeorge
    djabarovgeorge committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    6e60c64 View commit details
    Browse the repository at this point in the history

  3. feat: add comment with for the new condition

    @djabarovgeorge
    djabarovgeorge committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    a124733 View commit details
    Browse the repository at this point in the history

  4. feat: add tenant page tests

    @djabarovgeorge
    djabarovgeorge committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    d94f88d View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. fix: typo

    @djabarovgeorge
    djabarovgeorge committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    c05230c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3876 from novuhq/fix-response-interceptor-to-retu… 

    …rn-data-as-a-prop

fix: allow return 'data' as response prop
    @djabarovgeorge
    djabarovgeorge authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    4a7999e View commit details
    Browse the repository at this point in the history

  3. feat: add tenants analytics

    @djabarovgeorge
    djabarovgeorge committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    3694368 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3863 from novuhq/nv-2452-tenant-create-a-tenant-s… 

    …idebar

Nv 2452 tenant create + update a tenant sidebar
    @ainouzgali
    ainouzgali authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    a1f9d6c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3877 from novuhq/NV-2618-cypress-tests-tenants-ui 

    feat: add tenant page tests
    @djabarovgeorge
    djabarovgeorge authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    780df22 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3879 from novuhq/add-tenants-analytics 

    [Tenants] - Add Tenants Analytics
    @djabarovgeorge
    djabarovgeorge authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    847fc24 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'next' into stacked-tenants-support

    @djabarovgeorge
    djabarovgeorge authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    45183a1 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. feat: add organization to the scheme

    @djabarovgeorge
    djabarovgeorge committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    68ebeca View commit details
    Browse the repository at this point in the history

  2. feat: update index for pagination

    @djabarovgeorge
    djabarovgeorge committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    55ec8a9 View commit details
    Browse the repository at this point in the history

  3. feat: add organization id on shared tenant entity

    @djabarovgeorge
    djabarovgeorge committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    29b2674 View commit details
    Browse the repository at this point in the history

  4. fix: add missing org passing in the creation

    @djabarovgeorge
    djabarovgeorge committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    0e92b1a View commit details
    Browse the repository at this point in the history