@noatgnu/cupcake-core 1.2.2 → 1.2.4

package/fesm2022/noatgnu-cupcake-core.mjs

@@ -149,26 +149,41 @@ class AuthService {
             return true;
         }
     }
+    convertUserFromSnakeToCamel(user) {
+        return {
+            id: user.id || user.user_id,
+            username: user.username || '',
+            email: user.email || '',
+            firstName: user.firstName || user.first_name || '',
+            lastName: user.lastName || user.last_name || '',
+            isStaff: user.isStaff !== undefined ? user.isStaff : (user.is_staff || false),
+            isSuperuser: user.isSuperuser !== undefined ? user.isSuperuser : (user.is_superuser || false),
+            isActive: user.isActive !== undefined ? user.isActive : (user.is_active !== undefined ? user.is_active : true),
+            dateJoined: user.dateJoined || user.date_joined || '',
+            lastLogin: user.lastLogin || user.last_login || null,
+            hasOrcid: user.hasOrcid !== undefined ? user.hasOrcid : (user.orcid_id ? true : false),
+            orcidId: user.orcidId || user.orcid_id
+        };
+    }
     getUserFromToken() {
         const token = this.getAccessToken();
         if (!token)
             return null;
         try {
             const payload = JSON.parse(atob(token.split('.')[1]));
-            return {
+            return this.convertUserFromSnakeToCamel({
                 id: payload.user_id,
-                username: payload.username || '',
-                email: payload.email || '',
-                firstName: payload.first_name || '',
-                lastName: payload.last_name || '',
-                isStaff: payload.is_staff || false,
-                isSuperuser: payload.is_superuser || false,
-                isActive: payload.is_active || true,
-                dateJoined: payload.date_joined || '',
-                lastLogin: payload.last_login || null,
-                hasOrcid: payload.orcid_id ? true : false,
-                orcidId: payload.orcid_id
-            };
+                username: payload.username,
+                email: payload.email,
+                first_name: payload.first_name,
+                last_name: payload.last_name,
+                is_staff: payload.is_staff,
+                is_superuser: payload.is_superuser,
+                is_active: payload.is_active,
+                date_joined: payload.date_joined,
+                last_login: payload.last_login,
+                orcid_id: payload.orcid_id
+            });
         }
         catch {
             return null;
@@ -218,10 +233,10 @@ class AuthService {
     }
     fetchUserProfile() {
         return this.http.get(`${this.apiUrl}/auth/profile/`)
-            .pipe(tap(response => {
-            this.currentUserSubject.next(response.user);
+            .pipe(map(response => this.convertUserFromSnakeToCamel(response.user)), tap(user => {
+            this.currentUserSubject.next(user);
             this.isAuthenticatedSubject.next(true);
-        }), map(response => response.user));
+        }));
     }
     getCurrentUser() {
         return this.currentUserSubject.value;
@@ -240,7 +255,8 @@ class AuthService {
         const refreshToken = response.refreshToken || response.refresh_token || response.refresh;
         localStorage.setItem('ccvAccessToken', accessToken);
         localStorage.setItem('ccvRefreshToken', refreshToken);
-        this.currentUserSubject.next(response.user);
+        const convertedUser = this.convertUserFromSnakeToCamel(response.user);
+        this.currentUserSubject.next(convertedUser);
         this.isAuthenticatedSubject.next(true);
     }
     tryRefreshToken() {
@@ -568,10 +584,10 @@ class ApiService {
             httpParams = httpParams.set('is_active', params.isActive.toString());
         if (params?.search)
             httpParams = httpParams.set('search', params.search);
-        if (params?.page)
-            httpParams = httpParams.set('page', params.page.toString());
-        if (params?.pageSize)
-            httpParams = httpParams.set('page_size', params.pageSize.toString());
+        if (params?.limit)
+            httpParams = httpParams.set('limit', params.limit.toString());
+        if (params?.offset !== undefined)
+            httpParams = httpParams.set('offset', params.offset.toString());
         return this.http.get(`${this.apiUrl}/users/`, { params: httpParams });
     }
     getUser(id) {
@@ -1684,6 +1700,13 @@ class LabGroupService extends BaseApiService {
     removeMemberFromLabGroup(id, userId) {
         return this.post(`${this.apiUrl}/lab-groups/${id}/remove_member/`, { userId });
     }
+    getRootLabGroups(params) {
+        const httpParams = this.buildHttpParams({ ...params, parentGroup__isnull: 'true' });
+        return this.get(`${this.apiUrl}/lab-groups/`, { params: httpParams });
+    }
+    getSubGroups(parentGroupId, params) {
+        return this.getLabGroups({ ...params, parentGroup: parentGroupId });
+    }
     // LAB GROUP INVITATIONS
     getLabGroupInvitations(params) {
         const httpParams = this.buildHttpParams(params);
@@ -2385,12 +2408,13 @@ class UserManagementComponent {
     loadUsers() {
         this.isLoading.set(true);
         this.errorMessage.set('');
+        const offset = (this.currentPage() - 1) * this.pageSize();
         const searchParams = {
             search: this.searchTerm() || undefined,
             isStaff: this.staffFilter() !== '' ? this.staffFilter() === 'true' : undefined,
             isActive: this.activeFilter() !== '' ? this.activeFilter() === 'true' : undefined,
-            page: this.currentPage(),
-            pageSize: this.pageSize()
+            limit: this.pageSize(),
+            offset: offset
         };
         this.userManagementService.getUsers(searchParams).subscribe({
             next: (response) => {