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.

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

Usage limits for KoboToolbox-hosted servers #4578

Merged
merged 79 commits into from
Aug 22, 2023
Merged

Usage limits for KoboToolbox-hosted servers #4578

merged 79 commits into from
Aug 22, 2023

Commits on May 17, 2023

  1. Configuration menu
    Copy the full SHA
    acf7c1d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d26df60 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Configuration menu
    Copy the full SHA
    730c791 View commit details
    Browse the repository at this point in the history
  2. clarify variable names

    LMNTL committed May 24, 2023
    Configuration menu
    Copy the full SHA
    522c73a View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Configuration menu
    Copy the full SHA
    a62e3d1 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Configuration menu
    Copy the full SHA
    77ca025 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. get tests passing

    LMNTL committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    9cb6859 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Configuration menu
    Copy the full SHA
    8de282e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a7cd93e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3811d18 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Configuration menu
    Copy the full SHA
    32040f4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    59eee58 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. add yearly count to submissions

    LMNTL committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    01148ab View commit details
    Browse the repository at this point in the history
  2. update API documentation

    LMNTL committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    0faae9d View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Configuration menu
    Copy the full SHA
    38cf422 View commit details
    Browse the repository at this point in the history
  2. added icon

    srartese committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    cce2367 View commit details
    Browse the repository at this point in the history
  3. fixed linting errors

    srartese committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    dac3fdc View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Configuration menu
    Copy the full SHA
    dcb97bc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9ae9a21 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Configuration menu
    Copy the full SHA
    170d781 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4f9c09e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0013796 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f3d70c3 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Merge pull request #4501 from kobotoolbox/feature/add-manage-usage-route

    Add manage usage route to user menu
    LMNTL committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    b0f8cc7 View commit details
    Browse the repository at this point in the history
  2. format changed files

    LMNTL committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    dbfcb24 View commit details
    Browse the repository at this point in the history
  3. squash migrations for trackers

    LMNTL committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    3a728b5 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. fix broken test for trackers

    LMNTL committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    87b2386 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7245072 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Configuration menu
    Copy the full SHA
    75cc413 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. get tests passing

    LMNTL committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    ddec1ba View commit details
    Browse the repository at this point in the history
  2. update api documentation

    LMNTL committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    2d36ed0 View commit details
    Browse the repository at this point in the history
  3. fix broken test

    LMNTL committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    511cace View commit details
    Browse the repository at this point in the history
  4. flesh out some test cases

    LMNTL committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    857920e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2f5f484 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    202533f View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. remove unused import

    LMNTL committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    2793a63 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64ad2a8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    95c1144 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Configuration menu
    Copy the full SHA
    e442ef0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4506 from kobotoolbox/feature/usage-limits-api

    Updating usage endpoints for organizations and subscriptions
    LMNTL committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    c870a8a View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. merge in beta

    LMNTL committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    c2934c9 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Configuration menu
    Copy the full SHA
    0390915 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Restrict MFA based on subscription when Stripe is enabled (#4543)

    * disable MFA section in account settings when user doesn't have subscription and stripe is enabled
    
    * prevent 2FA flow on login for free users when Stripe is enabled
    
    * refactor mfa login tests
    
    * add tests for stripe-specific MFA features
    
    * remove unused import
    
    * refactor MFALoginView.form_valid
    
    * change back a conditional that got hardwired during testing
    
    * refactor hasActiveSubscription
    
    * don't error when checking MFA settings while Stripe is disabled
    
    * fix linting errors in stripe.utils.js
    
    * use @override_settings instead of directly changing settings
    
    * prevent MFA login without subscription when using SSO
    
    * merge in fixes from noliveleger
    
    * add test to ensure that skipped MFA login doesn't create a vulnerability
    
    * don't restrict MFA access for explicitly allowed users
    
    * add test for per-user availability
    LMNTL committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    0f0a713 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Configuration menu
    Copy the full SHA
    0ab3210 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. Configuration menu
    Copy the full SHA
    e3370e4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    30a62ab View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6fe9df2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    88316db View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c81a494 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Configuration menu
    Copy the full SHA
    2c45232 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d0ed88c View commit details
    Browse the repository at this point in the history
  3. update tests

    LMNTL committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    7a0a0b7 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Configuration menu
    Copy the full SHA
    31a88ed View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    03d0a07 View commit details
    Browse the repository at this point in the history
  3. fix missing trailing comma

    LMNTL committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    b9b7d0f View commit details
    Browse the repository at this point in the history
  4. fix typo in error message

    LMNTL committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    561467b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2235e9e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1b7930f View commit details
    Browse the repository at this point in the history
  7. Merge branch 'beta' into feature/usage-limits

     # Conflicts:
     #	kpi/tests/api/test_api_environment.py
     #	kpi/views/environment.py
    noliveleger committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    777afb5 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Show modal when user goes over one or more of their limits (#4532)

    * add button color option for dark blue
    
    * Added props to style koboModal header and footer
    
    * Modal for any limits exceeding and calculating those limits.
    
    * Add translation function
    
    * Add css padding and aria labels
    
    * Linting and formating
    
    * update kobo-common version
    
    * Updated lock file with version kobo-compose
    
    * Updated color and kobo common version to older version
    
    * Bug fix for initial load not rendering update to limits
    
    * ran install to fix build error
    
    * Fixed package lock from merge conflict
    
    * initial style for limit banner
    
    * Add dark red button styles
    
    * updated to use bytes not GB
    
    * Linting and formatting fixes
    
    * Updated banner to only show when dismissed is true and cleaned up some code
    
    * Clean  up and PR updates
    
    * added initial check for constant free_tier_thresholds
    
    * removed console logs
    
    * added line for data being set to submission limits for free tier thresholds
    
    * PR updates to refactor and fix small style bugs
    srartese committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    4dbf682 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ac49e58 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Configuration menu
    Copy the full SHA
    e809de6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4e77a30 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6b061a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Removed header.es6 file

    srartese committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    99f88f4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4571 from kobotoolbox/feature/add-limits-banner-t…

    …o-projects-page
    
    Add Modal and Banner for when user goes over limits to my projects page
    srartese committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    77c0e43 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Configuration menu
    Copy the full SHA
    4cecb2a View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Updated Usage page (#4564)

    * add usage limits to usage page
    
    * add recurring property to price
    
    * add highlights for usage over limits with very basic styling
    
    * add warning icon
    
    * prevent subscriptionStore from sending multiple simultaneous fetches
    
    * install prettybytes
    
    * add amber to icon color options
    
    * update usage page structure to match figma
    
    * fix ts error in subscriptionStore
    
    * allow service_usage to accept POST requests
    
    * refactor getUsage to optionally send organization_id
    
    * update usage page
    
    * show monthly/annual usage data based on plan type, add loading state
    
    * fix some ts/linting errors
    
    * remove unused file dataUsageStore.ts
    
    * extract UsageContainer component
    
    * extract some logic to *.api.* files
    
    * remove unused imports
    
    * add missing usageContainer tsx and scss files
    
    * finalize styling
    
    * get usage by organization in overlimits banners/modal
    
    * extract USAGE_WARNING_RATIO to a constant
    
    * run prettier/eslint
    
    * remove unused imports from subscriptionStore
    
    * try/catch call to getOrganization
    
    * refactor date formatting utils
    
    * use refactored formatDate instead of recreating it
    
    * fix misleading type
    
    * refactor isLoaded to isInitialised
    
    * try/catch in getUsageForOrganization
    
    * extract usage.loaded to separate booleans
    
    * handle null return from getUsageForOrganization
    
    * remove duplicate visuallyhidden class
    
    * refactor RecurringInterval to type instead of enum
    
    * extract AriaText component to common components library
    
    * change dates to use time tags
    
    * add story for AriaText
    
    * use base kobo colors instead of modifying opacity in usageContainer
    
    * remove mobx observables from react dep arrays
    
    * pull truncate into a utility function
    
    * remove some unnecessary brackets around JSX string args
    LMNTL committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    cfff4ae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    598d73a View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Configuration menu
    Copy the full SHA
    6ff7e73 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa6d7b2 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Configuration menu
    Copy the full SHA
    5909462 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d3f4a63 View commit details
    Browse the repository at this point in the history
  3. handle anonymous users

    LMNTL committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    026613e View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Configuration menu
    Copy the full SHA
    8234aa1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9f02409 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4cf4c1d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c23ba82 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5861f0b View commit details
    Browse the repository at this point in the history