feat: display warning and prevent creation on limit #2526

novakzaballa · 2023-07-26T22:16:34Z

Thanks for submitting a PR! Please check the boxes below:

I have run pre-commit to check linting
I have filled in the "Changes" section below?
I have filled in the "How did you test this code" section below?
I have used a Conventional Commit title for this Pull Request

Changes

Add limit Alerts If number of features, segments, and segments Overrides exceeds 90% of the limit or if the API calls exceed 70% of the limit.
The buttons for creating features, segments, and segments overrides are disabled when the limit is reached.
Return limits in the API response for projects and, environments.

How did you test this code?

Unit test added

…and add alertLimit component

vercel · 2023-07-26T22:16:40Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 14, 2023 6:40pm
flagsmith-frontend-preview	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 14, 2023 6:40pm
flagsmith-frontend-staging	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 14, 2023 6:40pm

frontend/web/components/pages/SegmentsPage.tsx

frontend/web/components/pages/FeaturesPage.js

frontend/common/stores/project-store.js

frontend/web/components/LimitAlert.tsx

…-on-limit

github-actions · 2023-07-27T19:13:16Z

Uffizzi Preview deployment-32784 was deleted.

api/environments/models.py

api/projects/models.py

api/projects/tests/test_serializers.py

api/projects/tests/test_views.py

api/projects/views.py

codecov-commenter · 2023-08-01T13:08:18Z

Codecov Report

Patch coverage has no change and project coverage change: -0.07% ⚠️

Comparison is base (34f9a5b) 95.52% compared to head (c6836cd) 95.46%.
Report is 12 commits behind head on main.

❗ Current head c6836cd differs from pull request most recent head c9c2ace. Consider uploading reports for the commit c9c2ace to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2526      +/-   ##
==========================================
- Coverage   95.52%   95.46%   -0.07%     
==========================================
  Files         993      986       -7     
  Lines       28031    27689     -342     
==========================================
- Hits        26778    26434     -344     
- Misses       1253     1255       +2

see 32 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…-on-limit

matthewelwell

This looks good to me now. A minor nitpick would be to ask if we could add a little more margin between the 'Request more API calls' button and the items in the list above it. Maybe even making that button slightly smaller.

kyle-ssg · 2023-09-13T07:39:40Z

frontend/common/dispatcher/app-actions.js

@@ -37,6 +37,12 @@ const AppActions = Object.assign({}, require('./base/_app-actions'), {
      projectId,
    })
  },
+  getEnv(environmentId) {


Is there a reason why we need to get the environment this way? It adds to tech debt, ideally it would be an action in useEnvironment.ts

kyle-ssg · 2023-09-13T07:41:45Z

frontend/web/components/Aside.js

@@ -77,6 +78,7 @@ const Aside = class extends Component {
              ? {}
              : { live_from_after: new Date().toISOString() },
          )
+          AppActions.getEnv(this.props.environmentId)


I'm confused by this, we're already getting the project's environments in AppActions.getProject

This is triggered every time we change environments. It is done this way because we need to save the response to the store so we can use its data to determine the content of the alert and whether it will be displayed.

We use the environment endpoint because the project one doesn't have the limits information we need, and Matt asked to keep it this way since it will be more efficient in terms of querying the DB

After our conversation, I think this can now be removed.

kyle-ssg · 2023-09-13T18:14:03Z

frontend/web/components/App.js

@@ -484,6 +507,31 @@ const App = class extends Component {
                        </div>
                      ) : (
                        <Fragment>
+                          <Row>
+                            {user &&


As mentioned on slack, I think this should be componentised so that you can use hooks to get the data.

kyle-ssg · 2023-09-14T14:52:01Z

frontend/common/stores/project-store.js

@@ -83,6 +84,14 @@ const controller = {
      store.saved()
    })
  },
+  getEnv: (envId) => {
+    data.get(`${Project.api}environments/${envId}/`).then((environment) => {


Is this used anymore?

kyle-ssg · 2023-09-14T14:52:23Z

frontend/web/components/Aside.js

@@ -50,6 +50,7 @@ const Aside = class extends Component {
              ? {}
              : { live_from_after: new Date().toISOString() },
          )
+          AppActions.getEnv(this.props.environmentId)


Do we need to do this

kyle-ssg · 2023-09-14T14:52:34Z

frontend/web/components/App.js

@@ -288,6 +299,17 @@ const App = class extends Component {
    )
    const dismissed = flagsmith.getTrait('dismissed_announcement')
    const showBanner = !dismissed || dismissed !== announcementValue.id
+    const maxApiCallsPercentage = Utils.calculateRemainingLimitsPercentage(


Is this used anymore

kyle-ssg · 2023-09-14T14:52:42Z

frontend/web/components/App.js

@@ -70,6 +74,13 @@ const App = class extends Component {
      AccountStore.getOrganisation()?.id &&
      this.state.activeOrganisation !== AccountStore.getOrganisation().id
    ) {
+      getSubscriptionMetadata(getStore(), {


Is this used anymore

novakzaballa added 5 commits July 25, 2023 18:49

Return limits and maxs in the API response, validate disable button, …

1398479

…and add alertLimit component

Add validation for limit alerts

d92fa99

Update serializers

273a07b

Add Test

03c8642

Update serializers

cbc4d49

github-actions bot added front-end Issue related to the React Front End Dashboard api Issue related to the REST API labels Jul 26, 2023

kyle-ssg reviewed Jul 27, 2023

View reviewed changes

frontend/web/components/pages/SegmentsPage.tsx Outdated Show resolved Hide resolved

kyle-ssg reviewed Jul 27, 2023

View reviewed changes

frontend/web/components/pages/FeaturesPage.js Outdated Show resolved Hide resolved

kyle-ssg reviewed Jul 27, 2023

View reviewed changes

frontend/common/stores/project-store.js Show resolved Hide resolved

kyle-ssg reviewed Jul 27, 2023

View reviewed changes

frontend/web/components/LimitAlert.tsx Outdated Show resolved Hide resolved

Merge branch 'main' into feature/display-warning-and-prevent-creation…

d00a307

…-on-limit

novakzaballa changed the title ~~feature: display warning and prevent creation on limit~~ feat: display warning and prevent creation on limit Jul 27, 2023

Add alert_warning design system, add read_only_fields

244f2c4

vercel bot deployed to Preview – flagsmith-frontend-preview July 27, 2023 19:09 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging July 27, 2023 19:11 View deployment

vercel bot deployed to Preview – docs July 27, 2023 19:12 View deployment

novakzaballa requested review from a team, gagantrivedi, kyle-ssg and matthewelwell July 27, 2023 21:19

matthewelwell requested changes Jul 31, 2023

View reviewed changes

Use annotate for calculate totals, move and rename test

420a7f4

vercel bot deployed to Preview – docs August 1, 2023 13:07 View deployment

vercel bot deployed to Preview – flagsmith-frontend-preview August 1, 2023 13:09 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging August 1, 2023 13:12 View deployment

Update env view

33004fa

Remove upgrade icon

75558d4

vercel bot deployed to Preview – flagsmith-frontend-staging September 11, 2023 17:22 View deployment

vercel bot deployed to Preview – flagsmith-frontend-preview September 11, 2023 17:23 View deployment

vercel bot deployed to Preview – docs September 11, 2023 17:24 View deployment

novakzaballa added 2 commits September 12, 2023 12:23

Merge branch 'main' into feature/display-warning-and-prevent-creation…

62d2a4b

…-on-limit

feat: Change max api calls alert banner

6d30b9d

vercel bot deployed to Preview – flagsmith-frontend-preview September 12, 2023 20:43 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging September 12, 2023 20:45 View deployment

vercel bot deployed to Preview – docs September 12, 2023 20:46 View deployment

matthewelwell approved these changes Sep 12, 2023

View reviewed changes

kyle-ssg reviewed Sep 13, 2023

View reviewed changes

kyle-ssg and others added 2 commits September 13, 2023 19:59

Migrate changes to RTK

16b7f8b

fix: Add SegmentOverridesLimit

6586b7d

vercel bot deployed to Preview – docs September 14, 2023 13:19 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging September 14, 2023 13:21 View deployment

vercel bot deployed to Preview – flagsmith-frontend-preview September 14, 2023 13:23 View deployment

kyle-ssg reviewed Sep 14, 2023

View reviewed changes

Fix: Delete unnecessary code

c9c2ace

vercel bot deployed to Preview – docs September 14, 2023 18:36 View deployment

vercel bot deployed to Preview – flagsmith-frontend-preview September 14, 2023 18:38 View deployment

vercel bot deployed to Preview – flagsmith-frontend-staging September 14, 2023 18:40 View deployment

kyle-ssg approved these changes Sep 15, 2023

View reviewed changes

novakzaballa merged commit 000be2b into main Sep 18, 2023

novakzaballa deleted the feature/display-warning-and-prevent-creation-on-limit branch September 18, 2023 15:29

dabeeeenster mentioned this pull request Sep 18, 2023

chore(main): release 2.72.0 #2764

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: display warning and prevent creation on limit #2526

feat: display warning and prevent creation on limit #2526

novakzaballa commented Jul 26, 2023 •

edited

Loading

vercel bot commented Jul 26, 2023 •

edited

Loading

github-actions bot commented Jul 27, 2023 •

edited

Loading

codecov-commenter commented Aug 1, 2023 •

edited

Loading

matthewelwell left a comment

kyle-ssg Sep 13, 2023

kyle-ssg Sep 13, 2023

novakzaballa Sep 13, 2023

novakzaballa Sep 13, 2023

kyle-ssg Sep 14, 2023

kyle-ssg Sep 13, 2023

kyle-ssg Sep 14, 2023

kyle-ssg Sep 14, 2023

kyle-ssg Sep 14, 2023

kyle-ssg Sep 14, 2023

feat: display warning and prevent creation on limit #2526

feat: display warning and prevent creation on limit #2526

Conversation

novakzaballa commented Jul 26, 2023 • edited Loading

Changes

How did you test this code?

vercel bot commented Jul 26, 2023 • edited Loading

github-actions bot commented Jul 27, 2023 • edited Loading

codecov-commenter commented Aug 1, 2023 • edited Loading

Codecov Report

matthewelwell left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

novakzaballa commented Jul 26, 2023 •

edited

Loading

vercel bot commented Jul 26, 2023 •

edited

Loading

github-actions bot commented Jul 27, 2023 •

edited

Loading

codecov-commenter commented Aug 1, 2023 •

edited

Loading