Merge branch '15020-collection-with-the-same-content-adress'

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

diff --git a/src/models/user.ts b/src/models/user.ts
index b0f004c31e2ad4d450628b3c96c59d7ff27d3545..2497864507787cef09d6d3914780b79136090d77 100644 (file)
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -4,13 +4,26 @@
 
 import { Resource, ResourceKind } from '~/models/resource';
 
+export type UserPrefs = {
+    profile?: {
+        organization?: string,
+        organization_email?: string,
+        lab?: string,
+        website_url?: string,
+        role?: string
+    }
+};
+
 export interface User {
     email: string;
     firstName: string;
     lastName: string;
     uuid: string;
     ownerUuid: string;
+    username: string;
+    prefs: UserPrefs;
     isAdmin: boolean;
+    isActive: boolean;
 }
 
 export const getUserFullname = (user?: User) => {
@@ -23,20 +36,9 @@ export interface UserResource extends Resource {
     username: string;
     firstName: string;
     lastName: string;
-    identityUrl: string;
     isAdmin: boolean;
     prefs: UserPrefs;
     defaultOwnerUuid: string;
     isActive: boolean;
     writableBy: string[];
 }
-
-export interface UserPrefs {
-    profile: {
-        lab: string;
-        organization: string;
-        organizationEmail: string;
-        role: string;
-        websiteUrl: string;
-    };
-}
\ No newline at end of file