@hestia-earth/api 0.18.0 → 0.18.2

package/dist/files/model/model.d.ts

@@ -144,7 +144,7 @@ export declare const isFolderUpload: (path: string) => boolean;
 export declare const isOwner: (file: Partial<File>, user: User) => boolean;
 export declare const isAuthorized: ({ authorizedUsers }: Partial<File>, user: User) => boolean;
 export declare const canRemove: (file: Partial<File>, user: User) => boolean;
-export declare const canValidate: ({ status, isPrivate, archived }: Partial<File>, { admin }: Partial<User>) => boolean;
+export declare const canValidate: ({ status, isPrivate, archived }: Partial<File>, user: Partial<User>) => boolean;
 export declare const isValidated: ({ validatedAt, status }: Partial<File>) => boolean;
 export declare const canSubmit: (file: Partial<File>, user: User) => boolean;
 export declare const canFeedback: ({ status }: File) => boolean;

package/dist/files/model/model.js

@@ -22,6 +22,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isDraft = exports.canFeedback = exports.canSubmit = exports.isValidated = exports.canValidate = exports.canRemove = exports.isAuthorized = exports.isOwner = exports.isFolderUpload = exports.isAggregation = exports.aggregationFolder = exports.isGlossary = exports.glossaryFolder = exports.analysesFolder = exports.filenameFromPath = exports.rootFolderFromPath = exports.folderFromPath = exports.replaceInvalidChars = exports.validPathChars = exports.fileToExt = exports.filepathSearch = exports.filenameSearch = exports.File = exports.FilePipelineError = exports.FilePipelineProgress = exports.FilePipelineStatus = exports.FileError = exports.FileStatus = exports.FileProgress = exports.HestiaExtensions = exports.finalFormatExtensions = exports.SupportedExtensions = exports.sizeInMb = exports.MAX_SIZE_MB = exports.MAX_SIZE = exports.mb = void 0;
 var model_base_1 = require("../../db/model.base");
+var model_1 = require("../../users/model/model");
 exports.mb = 1048576;
 exports.MAX_SIZE = 2;
 exports.MAX_SIZE_MB = 2 * exports.mb;
@@ -174,7 +175,7 @@ exports.isAuthorized = function (_a, user) {
     return (authorizedUsers || []).map(asString).includes(asString(user));
 };
 exports.canRemove = function (file, user) {
-    return user.admin ||
+    return model_1.isAdmin(user) ||
         !exports.isValidated(file) ||
         file.isPrivate;
 };
@@ -183,10 +184,9 @@ var validateStatuses = [
     FileStatus.indexJsonDone,
     FileError.indexJsonError
 ];
-exports.canValidate = function (_a, _b) {
+exports.canValidate = function (_a, user) {
     var status = _a.status, isPrivate = _a.isPrivate, archived = _a.archived;
-    var admin = _b.admin;
-    return !archived && validateStatuses.includes(status) && (isPrivate || admin);
+    return !archived && validateStatuses.includes(status) && (isPrivate || model_1.isReviewer(user));
 };
 exports.isValidated = function (_a) {
     var validatedAt = _a.validatedAt, status = _a.status;

package/dist/users/model/model.d.ts

@@ -8,6 +8,7 @@ export declare enum MaxUploads {
 export declare enum UserRole {
     Researcher = "default",
     Developer = "developer",
+    Reviewer = "reviewer",
     Admin = "admin"
 }
 export declare class User extends BaseModel {
@@ -42,6 +43,7 @@ export declare class User extends BaseModel {
 }
 export declare const name: ({ firstName, lastName }: Partial<User>) => string;
 export declare const isAdmin: ({ role }: Partial<User>) => boolean;
+export declare const isReviewer: ({ role }: Partial<User>) => boolean;
 export declare const isDeveloper: ({ role }: Partial<User>) => boolean;
 export declare const contains: (users: Partial<User>[], user: Partial<User>) => boolean;
 export declare const actorId: (user: Partial<User>) => string;

package/dist/users/model/model.js

@@ -24,7 +24,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.userToActor = exports.actorId = exports.contains = exports.isDeveloper = exports.isAdmin = exports.name = exports.User = exports.UserRole = exports.MaxUploads = exports.defaultMaxApiCalls = void 0;
+exports.userToActor = exports.actorId = exports.contains = exports.isDeveloper = exports.isReviewer = exports.isAdmin = exports.name = exports.User = exports.UserRole = exports.MaxUploads = exports.defaultMaxApiCalls = void 0;
 var schema_1 = require("@hestia-earth/schema");
 var model_base_1 = require("../../db/model.base");
 exports.defaultMaxApiCalls = 100;
@@ -37,6 +37,7 @@ var UserRole;
 (function (UserRole) {
     UserRole["Researcher"] = "default";
     UserRole["Developer"] = "developer";
+    UserRole["Reviewer"] = "reviewer";
     UserRole["Admin"] = "admin";
 })(UserRole = exports.UserRole || (exports.UserRole = {}));
 var User = (function (_super) {
@@ -57,10 +58,18 @@ exports.isAdmin = function (_a) {
     var role = _a.role;
     return role === UserRole.Admin;
 };
+exports.isReviewer = function (_a) {
+    var role = _a.role;
+    return [
+        UserRole.Reviewer,
+        UserRole.Admin
+    ].includes(role);
+};
 exports.isDeveloper = function (_a) {
     var role = _a.role;
     return [
         UserRole.Developer,
+        UserRole.Reviewer,
         UserRole.Admin
     ].includes(role);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/api",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "description": "Hestia API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -36,7 +36,7 @@
     "@commitlint/cli": "^16.2.4",
     "@commitlint/config-conventional": "^16.2.4",
     "@elastic/elasticsearch": "7.13.0",
-    "@hestia-earth/eslint-config": "^0.0.4",
+    "@hestia-earth/eslint-config": "^0.0.5",
     "@hestia-earth/json-schema": "^14.0.0",
     "@hestia-earth/schema-convert": "^14.0.0",
     "@hestia-earth/schema-validation": "^14.0.0",