Project Tags

None

Referenced Files

	F117820858: D2371.1775295067.diff
	Fri, Apr 3, 9:31 AM

	F117751552: D2371.1775186092.diff
	Thu, Apr 2, 3:14 AM

	F117748796: D2371.1775178772.diff
	Thu, Apr 2, 1:12 AM

	F117747814: D2371.1775176572.diff
	Thu, Apr 2, 12:36 AM

	F117739784: D2371.1775159280.diff
	Wed, Apr 1, 7:48 PM

Subscribers

mollekopf

Restricted Project

Details

Reviewers

mollekopf

Group Reviewers

Restricted Project

Commits

rKad947512d7ff: Degraded accounts
rK2deb4c185040: Degraded accounts
rK6ffdfb56b891: Degraded accounts
rKb6bf76e1b772: Degraded accounts
rK26edf013bc60: Degraded accounts

Test Plan

./phpunit

Diff Detail

Repository

rK kolab

Branch

dev/status-degraded

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 36800
Build 14636: arc lint + arc unit

Event Timeline

machniak requested review of this revision.Mar 8 2021, 12:19 PM

machniak created this revision.

Harbormaster completed remote builds in B33481: Diff 6580.Mar 8 2021, 12:19 PM

machniak retitled this revision from {WIP] Degraded accounts to [WIP] Degraded accounts.Mar 8 2021, 12:35 PM

Tests

Harbormaster completed remote builds in B33493: Diff 6586.Mar 9 2021, 3:08 PM

Browser tests

Harbormaster completed remote builds in B33502: Diff 6592.Mar 10 2021, 1:42 PM

machniak retitled this revision from [WIP] Degraded accounts to Degraded accounts.Mar 10 2021, 1:53 PM

Fix quota/roles of a degraded user

Harbormaster completed remote builds in B33529: Diff 6598.Mar 11 2021, 8:18 AM

Add degraded status to user:status command
Add degraded status to some cli commands

Harbormaster completed remote builds in B33541: Diff 6604.Mar 12 2021, 11:15 AM

Add periodic reminder mail to degraded accounts

Harbormaster completed remote builds in B33556: Diff 6619.Mar 15 2021, 11:51 AM

Simplify

Harbormaster completed remote builds in B33574: Diff 6637.Mar 17 2021, 1:17 PM

Rebase

Harbormaster completed remote builds in B35401: Diff 7369.Jun 21 2021, 12:18 PM

Merge branch 'master' into dev/status-degraded
Fix regressions regarding tenants
Fix more regressions
Small cleanup

Harbormaster completed remote builds in B35995: Diff 7687.Aug 10 2021, 10:02 AM

Remove unintentionally recovered app/Console/Development/UserStatus.php
Cleanup

Harbormaster completed remote builds in B36001: Diff 7693.Aug 10 2021, 10:21 AM

Merge branch 'master' into dev/status-degraded
Add some French localization

Harbormaster completed remote builds in B36403: Diff 8074.Aug 25 2021, 1:21 PM

mollekopf subscribed.Aug 31 2021, 1:25 PM

mollekopf added inline comments.

src/resources/lang/en/mail.php
28	"Thank you for your business!" / "Thank you for your consideration!" ?
39	Without the ","
42	Without ","
src/resources/lang/en/ui.php
340	Some features have been disabled.
341	"Please make a payment." without the ","

The changes look reasonable to me, haven't tested them though.

Small language fixes

Harbormaster completed remote builds in B36562: Diff 8233.Sep 6 2021, 6:57 AM

Merge branch 'master' into dev/status-degraded

Harbormaster completed remote builds in B36800: Diff 8408.Oct 6 2021, 11:59 AM

Merge branch 'master' into dev/status-degraded

Harbormaster completed remote builds in B36848: Diff 8435.Oct 12 2021, 10:39 AM

Hide create domain button on a degraded account

Harbormaster completed remote builds in B36854: Diff 8441.Oct 12 2021, 10:48 AM

After having another look it doesn't seem like there is a good way to contain the isDegrated logic much more.

As mentioned in the comment, there may be an opportunity to rely more on UsersController::statusInfo, but it's not currently a large problem since there are few degraded checks that can be replaced by it (I still think it could be worthwhile though in the long run).

src/resources/vue/Rooms.vue
44	How about moving the isDegraded check to hasSKU instead? Or even more centrally in UsersController::statusInfo, which seems to be where we decide who can view what. Same goes for all the checks above, so something different than hasSKU is perhaps required: hasCapability("identifier") or so.

Merge branch 'master' into dev/status-degraded
Merge branch 'master' into dev/status-degraded
Also hide Create list button in degraded mode

Harbormaster completed remote builds in B37118: Diff 8657.Nov 18 2021, 12:51 PM

Remove merge artefacts

Harbormaster completed remote builds in B37124: Diff 8663.Nov 18 2021, 1:28 PM

machniak added inline comments.Nov 18 2021, 1:39 PM

src/resources/vue/Rooms.vue
44	I would agree that we could do something better in statusInfo, but I don't think we have to do this here. hasSKU + isDegraded is used in one place. In other places we have to just hide some elements like Create buttons. So, it would not give us much. When we decide to do something more sophisticated with the UI we might get to that. Diff has been rebased.

mollekopf accepted this revision.Dec 17 2021, 10:43 AM

This revision is now accepted and ready to land.Dec 17 2021, 10:43 AM

Merge branch 'master' into dev/status-degraded
Hide more create buttons
Fix test regression
Fix regression
Cleanup

Harbormaster completed remote builds in B37394: Diff 8921.Dec 17 2021, 12:25 PM

Closed by commit rKad947512d7ff: Degraded accounts. · Explain WhyDec 17 2021, 12:31 PM

This revision was automatically updated to reflect the committed changes.

Degraded accountsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 8408

src/app/Backends/LDAP.php

src/app/Console/Commands/User/DegradeCommand.php

src/app/Console/Commands/User/StatusCommand.php

src/app/Console/Commands/User/UndegradeCommand.php

src/app/Console/Commands/Wallet/ChargeCommand.php

src/app/Http/Controllers/API/V4/OpenViduController.php

src/app/Http/Controllers/API/V4/UsersController.php

src/app/Jobs/WalletCheck.php

src/app/Mail/DegradedAccountReminder.php

src/app/Mail/NegativeBalanceDegraded.php

src/app/Mail/NegativeBalanceReminderDegrade.php

src/app/Observers/EntitlementObserver.php

src/app/Observers/UserObserver.php

src/app/Observers/WalletObserver.php

src/app/User.php

src/app/Wallet.php

src/config/app.php

src/resources/js/app.js

src/resources/lang/en/mail.php

src/resources/lang/en/ui.php

src/resources/lang/fr/mail.php

src/resources/lang/fr/ui.php

src/resources/views/emails/html/degraded_account_reminder.blade.php

src/resources/views/emails/html/negative_balance_degraded.blade.php

src/resources/views/emails/html/negative_balance_reminder_degrade.blade.php

src/resources/views/emails/plain/degraded_account_reminder.blade.php

src/resources/views/emails/plain/negative_balance_degraded.blade.php

src/resources/views/emails/plain/negative_balance_reminder_degrade.blade.php

src/resources/vue/App.vue

src/resources/vue/Dashboard.vue

src/resources/vue/Rooms.vue

src/resources/vue/User/List.vue

src/tests/Browser/DegradedAccountTest.php

src/tests/Feature/Backends/LDAPTest.php

src/tests/Feature/Console/User/DegradeTest.php

src/tests/Feature/Console/User/UndegradeTest.php

src/tests/Feature/Controller/UsersTest.php

src/tests/Feature/EntitlementTest.php

src/tests/Feature/Jobs/WalletCheckTest.php

src/tests/Feature/UserTest.php

src/tests/Feature/WalletTest.php

src/tests/TestCaseTrait.php

src/tests/Unit/Mail/DegradedAccountReminderTest.php

src/tests/Unit/Mail/NegativeBalanceDegradedTest.php

src/tests/Unit/Mail/NegativeBalanceReminderDegradeTest.php

src/tests/Unit/UserTest.php

Degraded accounts
ClosedPublic
Actions

Revision Contents
Changeset List