Skip to content

feat: add "dormant" user state #8644

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

Merged
merged 80 commits into from
Aug 2, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
30b71d0
WIP
mtojek Jul 21, 2023
0091738
generated
mtojek Jul 21, 2023
6771255
make gen
mtojek Jul 21, 2023
57547ae
Dormant API
mtojek Jul 21, 2023
f699e6f
WIP
mtojek Jul 21, 2023
3376a0f
make gen
mtojek Jul 21, 2023
4fbc5d9
userauth
mtojek Jul 21, 2023
67c4e96
fix: lint
mtojek Jul 21, 2023
daa025f
UsersFilter.tsx
mtojek Jul 21, 2023
b86f636
Site UI changes
mtojek Jul 21, 2023
05cd577
make fmt
mtojek Jul 21, 2023
7d4ad5c
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Jul 24, 2023
738441b
CLI changes
mtojek Jul 24, 2023
3ff2962
CLI fix
mtojek Jul 25, 2023
08b9cbb
UI fixes
mtojek Jul 25, 2023
a3b3f65
FIXME pubsub
mtojek Jul 25, 2023
e63f7a8
Add learn more link2
mtojek Jul 25, 2023
d6d9dac
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Jul 25, 2023
1454cb0
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Jul 25, 2023
b7a870e
Fix: migrations
mtojek Jul 25, 2023
d90ea27
dump.sql
mtojek Jul 26, 2023
83b8f63
FIXME
mtojek Jul 26, 2023
1553871
CLI tests
mtojek Jul 26, 2023
6a959d6
oss
mtojek Jul 26, 2023
f7d3061
next fixes
mtojek Jul 26, 2023
4a530ae
Unit test: dormant to active after login
mtojek Jul 26, 2023
c359d9f
More tests
mtojek Jul 26, 2023
5b4e76f
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Jul 26, 2023
972c807
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Jul 27, 2023
a771d35
More tests fixed
mtojek Jul 27, 2023
5694c08
Fix migrations
mtojek Jul 27, 2023
157b6bf
Fix: OIDC callback
mtojek Jul 27, 2023
41ac4d5
Fix: refresh account status
mtojek Jul 27, 2023
bd87560
Another fix
mtojek Jul 27, 2023
9b7c40e
More fixes
mtojek Jul 27, 2023
09b7a18
docs
mtojek Jul 27, 2023
ac43fcf
make gen
mtojek Jul 27, 2023
7b02cee
Fix: dbgen
mtojek Jul 27, 2023
c3dc08d
More fixes
mtojek Jul 27, 2023
4997479
Fix: entitlements tests
mtojek Jul 27, 2023
8f1ef7b
Fix
mtojek Jul 27, 2023
ec6e294
Users Table
mtojek Jul 27, 2023
d04c6f2
TS tests
mtojek Jul 27, 2023
4f2cdc3
Docs
mtojek Jul 27, 2023
87645cb
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Jul 28, 2023
63eadcb
Fix: apikey
mtojek Jul 28, 2023
699ff5a
lint
mtojek Jul 28, 2023
e0b33b3
fix?
mtojek Jul 28, 2023
db9769f
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Jul 31, 2023
0eb910a
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Aug 1, 2023
eb1aaa0
fix
mtojek Aug 1, 2023
6fcec6c
Rip: update user status to dormant
mtojek Aug 1, 2023
2b20a26
More trimming
mtojek Aug 1, 2023
adaecab
More trimming
mtojek Aug 1, 2023
e0a6b2f
User story
mtojek Aug 1, 2023
8765449
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Aug 1, 2023
74c70a1
make update-golden-files
mtojek Aug 1, 2023
b010271
cleanup
mtojek Aug 1, 2023
8add519
bring back coder.env
mtojek Aug 1, 2023
37f9e8f
fix: migration down: update dormant users to active
mtojek Aug 1, 2023
d9da865
fix
mtojek Aug 1, 2023
2749c91
Fix: migration
mtojek Aug 1, 2023
cdbc50e
Implement job
mtojek Aug 1, 2023
916d807
fix
mtojek Aug 1, 2023
32723cf
WIP
mtojek Aug 2, 2023
f9ae3c9
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Aug 2, 2023
e145b74
Write unit test for job
mtojek Aug 2, 2023
187e866
Fix
mtojek Aug 2, 2023
82b791a
info
mtojek Aug 2, 2023
4545cb6
Address PR feedback
mtojek Aug 2, 2023
85d6fae
t.Helper
mtojek Aug 2, 2023
d71ba7f
Address PR comments
mtojek Aug 2, 2023
f7ab39d
Fix: populate UpdatedAt
mtojek Aug 2, 2023
76d24c7
Update interval
mtojek Aug 2, 2023
f6890db
or dormant
mtojek Aug 2, 2023
811c637
Merge branch 'main' into 8128-new-user-state-dormant
mtojek Aug 2, 2023
d34e06c
update docs
mtojek Aug 2, 2023
67f3b17
docs fix
mtojek Aug 2, 2023
67c5500
fix
mtojek Aug 2, 2023
11143ca
docs rephrase
mtojek Aug 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make fmt
  • Loading branch information
mtojek committed Jul 21, 2023
commit 05cd577d5d25a7c44b5408b0d8bf93f06d28eddc
7 changes: 4 additions & 3 deletions site/src/components/UsersTable/UsersTableBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ export const UsersTableBody: FC<
) as React.ReactNode,
onClick: onMarkUserDormant,
disabled: user.id === actorID,
}
},
]
: user.status === "suspended"
? [
? [
{
label: t(
"activateMenuItem",
Expand All @@ -196,7 +196,8 @@ export const UsersTableBody: FC<
disabled: false,
},
]
: [ // User account is dormant
: [
// User account is dormant
{
label: t(
"activateMenuItem",
Expand Down
3 changes: 2 additions & 1 deletion site/src/pages/UsersPage/UsersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export const Language = {
activateDialogMessagePrefix: "Do you want to activate the user",
markUserDormantDialogTitle: "Mark user dormant",
markUserDormantDialogAction: "Mark dormant",
markUserDormantDialogMessagePrefix: "Do you want to mark the user account dormant",
markUserDormantDialogMessagePrefix:
"Do you want to mark the user account dormant",
}

const getSelectedUser = (id: string, users?: User[]) =>
Expand Down