Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion OMICRON_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
161aa6b612a9f05bf708de306293c06d300b3234
22ad5a9f832f3588090f9ebdf982872ec042b11c
49 changes: 27 additions & 22 deletions app/api/__generated__/Api.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/api/__generated__/OMICRON_VERSION

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions app/api/__generated__/msw-handlers.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 24 additions & 23 deletions app/api/__generated__/validate.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions app/api/roles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ type UserAccessRow = {
name: string
roleName: RoleKey
roleSource: string
timeCreated: Date | undefined
timeModified: Date | undefined
}

/**
Expand Down Expand Up @@ -110,6 +112,8 @@ export function useUserRows(
name: usersDict[ra.identityId]?.displayName || '', // placeholder until we get names, obviously
roleName: ra.roleName,
roleSource,
timeCreated: usersDict[ra.identityId]?.timeCreated,
timeModified: usersDict[ra.identityId]?.timeModified,
}))
}, [roleAssignments, roleSource, users, groups])
}
Expand Down
19 changes: 19 additions & 0 deletions app/pages/SiloAccessPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { confirmDelete } from '~/stores/confirm-delete'
import { getActionsCol } from '~/table/columns/action-col'
import { Table } from '~/table/Table'
import { CreateButton } from '~/ui/lib/CreateButton'
import { DateTime } from '~/ui/lib/DateTime'
import { EmptyMessage } from '~/ui/lib/EmptyMessage'
import { PageHeader, PageTitle } from '~/ui/lib/PageHeader'
import { TableActions, TableEmptyBox } from '~/ui/lib/Table'
Expand Down Expand Up @@ -75,6 +76,8 @@ type UserRow = {
name: string
siloRole: RoleKey | undefined
effectiveRole: RoleKey
timeCreated: Date | undefined
timeModified: Date | undefined
}

const colHelper = createColumnHelper<UserRow>()
Expand Down Expand Up @@ -102,6 +105,8 @@ export default function SiloAccessPage() {
siloRole,
// we know there has to be at least one
effectiveRole: getEffectiveRole(roles)!,
timeCreated: userAssignments[0].timeCreated,
timeModified: userAssignments[0].timeModified,
}

return row
Expand Down Expand Up @@ -131,6 +136,20 @@ export default function SiloAccessPage() {
return role ? <Badge color={roleColor[role]}>silo.{role}</Badge> : null
},
}),
colHelper.accessor('timeCreated', {
header: 'created',
cell: (info) => {
const date = info.getValue()
return date ? <DateTime date={date} /> : null
},
}),
colHelper.accessor('timeModified', {
header: 'updated',
cell: (info) => {
const date = info.getValue()
return date ? <DateTime date={date} /> : null
},
}),
// TODO: tooltips on disabled elements explaining why
getActionsCol((row: UserRow) => [
{
Expand Down
20 changes: 20 additions & 0 deletions app/pages/project/access/ProjectAccessPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import { addToast } from '~/stores/toast'
import { getActionsCol } from '~/table/columns/action-col'
import { Table } from '~/table/Table'
import { CreateButton } from '~/ui/lib/CreateButton'
import { DateTime } from '~/ui/lib/DateTime'
import { EmptyMessage } from '~/ui/lib/EmptyMessage'
import { PageHeader, PageTitle } from '~/ui/lib/PageHeader'
import { TableActions, TableEmptyBox } from '~/ui/lib/Table'
Expand Down Expand Up @@ -87,6 +88,8 @@ type UserRow = {
name: string
projectRole: RoleKey | undefined
roleBadges: { roleSource: string; roleName: RoleKey }[]
timeCreated: Date | undefined
timeModified: Date | undefined
}

const colHelper = createColumnHelper<UserRow>()
Expand Down Expand Up @@ -121,6 +124,8 @@ export default function ProjectAccessPage() {
name,
projectRole: projectAccessRow?.roleName,
roleBadges,
timeCreated: userAssignments[0].timeCreated,
timeModified: userAssignments[0].timeModified,
} satisfies UserRow
})
.sort(byGroupThenName)
Expand Down Expand Up @@ -165,6 +170,21 @@ export default function ProjectAccessPage() {
),
}),

colHelper.accessor('timeCreated', {
header: 'created',
cell: (info) => {
const date = info.getValue()
return date ? <DateTime date={date} /> : null
},
}),
colHelper.accessor('timeModified', {
header: 'updated',
cell: (info) => {
const date = info.getValue()
return date ? <DateTime date={date} /> : null
},
}),

// TODO: tooltips on disabled elements explaining why
getActionsCol((row: UserRow) => [
{
Expand Down
2 changes: 1 addition & 1 deletion mock-api/msw/handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2292,7 +2292,6 @@ export const handlers = makeHandlers({
siloSubnetPoolList: NotImplemented,
siloUserList: NotImplemented,
siloUserView: NotImplemented,
sledAdd: NotImplemented,
sledListUninitialized: NotImplemented,
sledSetProvisionPolicy: NotImplemented,
systemSubnetPoolCreate: NotImplemented,
Expand Down Expand Up @@ -2322,6 +2321,7 @@ export const handlers = makeHandlers({
systemPolicyUpdate: NotImplemented,
systemQuotasList: NotImplemented,
systemTimeseriesSchemaList: NotImplemented,
systemUpdateRecoveryFinish: NotImplemented,
systemUpdateRepositoryView: NotImplemented,
systemUpdateTrustRootCreate: NotImplemented,
systemUpdateTrustRootDelete: NotImplemented,
Expand Down
Loading
Loading