@singularlogic/coreplatts 0.0.18 → 0.0.20

package/dist/index.d.ts

@@ -138,6 +138,20 @@ interface Group {
         [key: string]: any[];
     };
 }
+interface DisplayGroup {
+    id: string;
+    name: string;
+    description?: string;
+    tags?: string[];
+    numberOfDatasets?: number;
+    numberOfResources?: number;
+    totalSize?: number;
+    numUsers?: number;
+    users?: string[];
+}
+type UsersPart = Pick<DisplayGroup, "id" | "name" | "numUsers" | "users">;
+type StatsPart = Omit<DisplayGroup, "numUsers" | "users">;
+declare function mergeGroupsByIdName(stats: StatsPart[], users: UsersPart[]): DisplayGroup[];
 declare enum Role {
     ADMIN,
     MEMBER
@@ -163,7 +177,7 @@ type TokenProvider = () => string | Promise<string>;
 interface IClient$1 {
     login(email: string, password: string): Promise<OidcToken>;
     myUser(token?: string): Promise<User>;
-    allOrganizations(token?: string): Promise<Group[]>;
+    allOrganizations(token?: string): Promise<DisplayGroup[]>;
     myOrganizations(token?: string): Promise<Group[]>;
     organizationByID(id: string, token?: string): Promise<Group>;
     organizationByName(name: string, token?: string): Promise<Group>;
@@ -217,7 +231,7 @@ declare class Client implements IClient$1 {
      */
     totalInfo(): Promise<TotalInfo>;
     myUser(token?: string): Promise<User>;
-    allOrganizations(token?: string): Promise<Group[]>;
+    allOrganizations(token?: string): Promise<DisplayGroup[]>;
     myOrganizations(token?: string): Promise<Group[]>;
     organizationByID(id: string, token?: string): Promise<Group>;
     organizationByName(name: string, token?: string): Promise<Group>;
@@ -237,4 +251,4 @@ declare class Client implements IClient$1 {
 
 type IClient = IClient$1;
 
-export { type Bucket, Client, type ErrorReport, type FileModel, type FolderList, type FolderModel, type Group, type IClient, type Meta, type MultipartWrapper, type OidcToken, type PartInfo, Role, type TotalInfo, type Updated, type User, type UserRoles };
+export { type Bucket, Client, type DisplayGroup, type ErrorReport, type FileModel, type FolderList, type FolderModel, type Group, type IClient, type Meta, type MultipartWrapper, type OidcToken, type PartInfo, Role, type StatsPart, type TotalInfo, type Updated, type User, type UserRoles, type UsersPart, mergeGroupsByIdName };

package/dist/index.js

@@ -68,11 +68,32 @@ var __async = (__this, __arguments, generator) => {
 var index_exports = {};
 __export(index_exports, {
   Client: () => Client,
-  Role: () => Role
+  Role: () => Role,
+  mergeGroupsByIdName: () => mergeGroupsByIdName
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/models/group.account.models.ts
+function mergeGroupsByIdName(stats, users) {
+  const byKey = /* @__PURE__ */ new Map();
+  const key = (g) => {
+    var _a, _b;
+    return `${(_a = g.id) != null ? _a : ""}||${(_b = g.name) != null ? _b : ""}`;
+  };
+  for (const g of stats) {
+    byKey.set(key(g), __spreadValues({}, g));
+  }
+  for (const u of users) {
+    const k = key(u);
+    const existing = byKey.get(k);
+    if (existing) {
+      byKey.set(k, __spreadProps(__spreadValues({}, existing), { users: u.users, numUsers: u.numUsers }));
+    } else {
+      byKey.set(k, __spreadValues({}, u));
+    }
+  }
+  return Array.from(byKey.values());
+}
 var Role = /* @__PURE__ */ ((Role2) => {
   Role2["ADMIN"] = "admin";
   Role2["MEMBER"] = "member";
@@ -222,6 +243,14 @@ var GroupConsumer = class extends BaseConsumer {
   getAllGroups(token) {
     return this.getMany("all", null, token);
   }
+  getGroupUsers(gname, gid, token) {
+    let addPath = "";
+    addPath = addPath + (gname ? `?name=${gname}` : "") + (gid ? `?id=${gid}` : "");
+    return this._httpClient.get(this.path + "/describe" + addPath, { headers: { "Authorization": "Bearer " + token } }).then((resp) => resp.data).catch((error) => {
+      console.error(`\u274C Error in posting:`, error);
+      return null;
+    });
+  }
   getUserGroups(token) {
     return this.getMany("", null, token);
   }
@@ -277,6 +306,13 @@ var BucketConsumer = class extends BaseConsumer {
   deleteBucket(id, token) {
     return this.delete("/" + id, token);
   }
+  getBucketInfo(gid, token) {
+    let addPath = gid ? `?id=${gid}` : "";
+    return this._httpClient.get(this.path + addPath, { headers: { "Authorization": "Bearer " + token } }).then((resp) => resp.data).catch((error) => {
+      console.error(`\u274C Error in posting:`, error);
+      return null;
+    });
+  }
 };
 
 // src/utils/utils.ts
@@ -897,7 +933,12 @@ var Client = class {
     return this._userConsumer.getUser(token);
   }
   allOrganizations(token) {
-    return this._groupConsumer.getAllGroups(token);
+    return Promise.all([
+      this._bucketConsumer.getBucketInfo(void 0, token),
+      this._groupConsumer.getGroupUsers(void 0, void 0, token)
+    ]).then(
+      ([stats, users]) => mergeGroupsByIdName(stats != null ? stats : [], users != null ? users : [])
+    );
   }
   myOrganizations(token) {
     return this._groupConsumer.getUserGroups(token);
@@ -966,5 +1007,6 @@ var Client = class {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Client,
-  Role
+  Role,
+  mergeGroupsByIdName
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularlogic/coreplatts",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [