Merge branch '16111-ssh-help' refs #16111

[arvados-workbench2.git] / src / models / user.ts

diff --git a/src/models/user.ts b/src/models/user.ts
index dfb418892ef363192b73c5e8f6983c887910603b..87a97dfcd1934b057369cee39bcfb82f389c05e0 100644 (file)
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -4,7 +4,7 @@
 
 import { Resource, ResourceKind } from '~/models/resource';
 
-export type userPrefs = {
+export type UserPrefs = {
     profile?: {
         organization?: string,
         organization_email?: string,
@@ -20,25 +20,18 @@ export interface User {
     lastName: string;
     uuid: string;
     ownerUuid: string;
-    identityUrl: string;
-    prefs: userPrefs;
+    username: string;
+    prefs: UserPrefs;
     isAdmin: boolean;
+    isActive: boolean;
 }
 
 export const getUserFullname = (user?: User) => {
     return user ? `${user.firstName} ${user.lastName}` : "";
 };
 
-export interface UserResource extends Resource {
+export interface UserResource extends Resource, User {
     kind: ResourceKind.USER;
-    email: string;
-    username: string;
-    firstName: string;
-    lastName: string;
-    identityUrl: string;
-    isAdmin: boolean;
-    prefs: string;
     defaultOwnerUuid: string;
-    isActive: boolean;
     writableBy: string[];
-}
\ No newline at end of file
+}