Commit Graph

4127 Commits (014048631c1f2b1980b785d7b4406e4a2f5803bb)

Author SHA1 Message Date
Hunter Trujillo 1dce61de45
Merge pull request #2612 from influxdata/2585-accept-days-units
Days is a valid duration value
2017-12-18 17:45:52 -07:00
Luke Morris 0aec18fb77 Repair specs 2017-12-18 16:11:35 -08:00
Jared Scheib 04b5368380 Change logout to log out, because consistency 2017-12-18 15:53:35 -08:00
Luke Morris b982f2ccdf Account for days in formatter matcher 2017-12-18 15:49:45 -08:00
Jared Scheib ceb8fe7a70 Merge branch '1.4.0.x' into multitenancy_ui_userspage_2583 2017-12-18 15:36:26 -08:00
Luke Morris 1074a7f4ea Update regex to accept days as valid input 2017-12-18 15:28:29 -08:00
Jared Scheib 22ee1d4959 Await organizations & users via Promise.all to simplify render logic 2017-12-18 15:23:01 -08:00
Hunter Trujillo dfa4feddd6 Merge branch '1.4.0.x' of github.com:influxdata/chronograf into 1.4.0.x 2017-12-18 16:11:10 -07:00
Hunter Trujillo 66b45093fc Add default uuid to defaultQueryConfig in case it's not supplied. Fix how a new query config is added if there is not one present in the DE. 2017-12-18 16:10:59 -07:00
Jared Scheib ff5b2af5b9 Steve Bang where nhowgo created more bugs 2017-12-18 15:01:48 -08:00
Luke Morris d40a738cb4 Prettier 2017-12-18 14:05:52 -08:00
Nathan Haugo 2d26bcad97 Actually make @stevebang approved 2017-12-18 13:55:32 -08:00
Nathan Haugo 87d8c2c50b Fix login bug 2017-12-18 13:49:30 -08:00
Jared Scheib 2ba29d6937
Merge pull request #2591 from influxdata/multitenancy_no_switch_to_orgs_where_no_role
Allow SuperAdmin to switch to orgs where they have no role
2017-12-18 13:44:21 -08:00
Jared Scheib af920b5423 Add & render EmptyUsersTable if users & organizations are loading
Allow UsersTableHeader to be used in empty state via defaultProps

Signed-off-by: Alex Paxton <thealexpaxton@gmail.com>
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-12-18 12:45:18 -08:00
Jared Scheib 893c4d8c03 Move AdminChronografPage to /admin/chronograf 2017-12-18 12:10:02 -08:00
Jared Scheib c0cac2308d Remove obsolete code that reloaded users upon org switching 2017-12-18 12:08:37 -08:00
Jared Scheib ad98bcdbb0 Refactor AdminChronograf into UsersPage to ensure correct users via AJAX & guard
Move OrganizationsPage into /chronograf & cleanup
2017-12-18 12:08:20 -08:00
Jared Scheib faa32266bd Fix destructuring bug in arg with default value 2017-12-15 16:05:57 -08:00
Jared Scheib 4c5429b2d3 Update copy of notification upon switch & become Admin 2017-12-15 16:05:57 -08:00
Jared Scheib b6af6cf190 Notify SuperAdmin of new Admin role switching to organization where they had no role 2017-12-15 16:05:51 -08:00
Jared Scheib 03c04a393d Revert "Add 'Join' button to the left of Organizations where a SuperAdmin has no role"
This reverts commit dffde0e5371ce82d2a3f2c785bdcdf43cf6a2c3b.
2017-12-15 16:05:45 -08:00
Jared Scheib 139026ce84 Add 'Join' button to the left of Organizations where a SuperAdmin has no role 2017-12-15 16:05:38 -08:00
Jared Scheib ef87d4cee5 Disable 'Switch to' button in OrganizationsTable for any orgs user has no role in
Signed-off-by: Deniz Kusefoglu <denizk@gmail.com>
2017-12-15 16:05:27 -08:00
Jared Scheib e64a625642 Show spinner until UsersTable has users & organizations data 2017-12-15 15:31:58 -08:00
Luke Morris a53cf684df Load admin's organizations when loading users table 2017-12-15 13:57:00 -08:00
Jared Scheib 3227bc0b3e
Merge pull request #2590 from influxdata/2544-missing-dashboard-should-404
Attempting to access missing dashboard should redirect user to `/sources/:sources_id/dashboards`
2017-12-15 11:48:55 -08:00
Luke Morris 22d05eb58a Tell the user what went wrong 2017-12-14 18:36:18 -08:00
Jared Scheib b731bf5aa0 Only attempt to access error.data.message if error is 403'd AJAX
Use lodash to avoid destructuring

error.data.message should only exist for failed AJAX requests.
Currently we only handle 403 (HTTP_FORBIDDEN) here.
2017-12-14 18:19:29 -08:00
Luke Morris 8d2eb6a90e Should abort DashboardPage mount immediately after redirect 2017-12-14 17:38:22 -08:00
Luke Morris 9ecda985e1 If dashboard is missing, redirect to dashboards index 2017-12-14 17:36:44 -08:00
Nathan Haugo 971156edf0 Bump version to 1.4.0.0-beta2 2017-12-14 12:45:44 -08:00
Nathan Haugo 951fcf57c0
Merge branch '1.4.0.x' into fix-optin-cursor 2017-12-14 12:05:58 -08:00
Jared Scheib b85b14437f Remove superAdmin toggle & data when creating a new user
Signed-off-by: Alex Paxton <thealexpaxton@gmail.com>
2017-12-14 11:15:34 -08:00
Jared Scheib 456488f0ac
Merge pull request #2355 from influxdata/multitenancy_all_users_superadmin_toggle
UI Toggle & API for SuperAdminFirstUserOnly server config
2017-12-14 10:54:18 -08:00
Nathan Haugo 7f0d6f6937
Merge pull request #2571 from influxdata/switch-orgs-from-manage-sources-rebased
Switch orgs from manage sources rebased
2017-12-13 17:49:34 -08:00
Nathan Haugo 688fef1185
Merge pull request #2572 from influxdata/bugfix/user-role-public-org
Fix organization default role being stale on chrono users page
2017-12-13 17:41:47 -08:00
Andrew Watkins 75af1a1a28 Remove cruft 2017-12-13 17:30:32 -08:00
Nathan Haugo 3a953d99bc
Merge pull request #2563 from influxdata/bugfix/y-axis-undefined
y axis title undefined
2017-12-13 17:29:00 -08:00
Nathan Haugo e3fe3c6405
Merge pull request #2564 from influxdata/2561-invert-only-user-nav
Invert only the user nav; leave alerting/admin untouched
2017-12-13 17:28:10 -08:00
Jared Scheib b7ad5b9fd8 Refactor handleChangeAuthConfig to be simpler & more modular 2017-12-13 17:23:30 -08:00
Andrew Watkins eed16d8173
Merge branch '1.4.0.x' into bugfix/y-axis-undefined 2017-12-13 17:21:48 -08:00
Andrew Watkins 537d2448c7 Update placeholder if y-axis default title is empty 2017-12-13 17:15:58 -08:00
Andrew Watkins e69dc3d057 Do not return a label if provided with empty query config 2017-12-13 17:15:58 -08:00
Nathan Haugo a74a764397 Fix tool tip verbiage and master the art of css 2017-12-13 16:58:44 -08:00
Andrew Watkins 62874bacd6 Use organizations state instead of me: currentOrganization 2017-12-13 16:06:13 -08:00
Andrew Watkins 1db7817a02 Fix organization default role being stale on chrono users page
The 'currentOrganization' namespaced in the auth reducer does not get
updated when chronograf organizations reducer gets updated.  This
results in temporary stale state until `/me` is hit and the 'me auth'
state trickles through the application.
2017-12-13 15:43:57 -08:00
Jared Scheib f23075cbc4 Rename superAdminFirstUserOnly to superAdminNewUsers & flip default logic accordingly
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-12-13 14:49:49 -08:00
deniz kusefoglu 5058fe1a91 Make switch-orgs button take users to purgatory 2017-12-13 14:17:38 -08:00
Alex P 70e1be9e8b Change design to be consistent with Purgatory logout button 2017-12-13 14:17:38 -08:00