@getjones/test-infra 4.5.5 → 4.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "4.5.5",
+  "version": "4.5.6",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "scripts": {

package/src/common/consts/constantsForRecordsSortingAndFilters.js

@@ -10,10 +10,12 @@ const recordComplianceStatuses = {
 	compliant: 'COMPLIANT_STATUS',
 	notCompliant: 'NOT_COMPLIANT_STATUS',
 	noCOIRequired: 'NO_COI_REQUIRED',
+	awaitingCOI: 'EMPTY_STATUS',
 	awaitingNewCOI: 'WAITING_NEW_COI_STATUS',
 	waived: 'WAIVED_STATUS',
 	underReview: 'UNDER_REVIEW',
 	expired: 'Expired',
+	expiringSoon: 'ExpiringSoon',
 	notResponsive: 'NotResponsive'
 };
 

package/src/factory/users/users.js

@@ -8,26 +8,9 @@ const users = require('../../saas/internal-api/users');
 const { InviteUserModel } = users.models;
 
 const defaultsPassword = credentials.strongPassword;
-const roles = {
-	readOnly: 'Read-only User',
-	inviter: 'Inviter',
-	cm: 'Compliance Manager'
-};
+const { internalApiUserRoles: roles } = require('../../../src/common/consts/userRoles');
 
 const inviteSaasUser = async (username, role, projectIds, context, { hasCompleteAccessPermission } = {}) => {
-	const userResponse = await users.services.getUserByEmail(username, context);
-
-	if (userResponse.data && userResponse.data.id) {
-		const { projectPermissions } = userResponse.data;
-		const projectPermissionsIds = projectPermissions.map(projectPermission => projectPermission.projectId);
-
-		projectIds = projectIds.filter(projectId => !projectPermissionsIds.includes(projectId));
-
-		if (!projectIds.length) {
-			return;
-		}
-	}
-
 	const inviteUserModel = new InviteUserModel(username, role, projectIds, hasCompleteAccessPermission);
 	const inviteResponse = await users.services.inviteUser([inviteUserModel], context);
 

package/src/index.js

@@ -33,6 +33,7 @@ const getInternalAPI = () => {
 	const dashboard = require('./saas/internal-api/dashboard');
 	const accountDirectory = require('./saas/internal-api/accountDirectory');
 	const notificationCenter = require('./saas/internal-api/notificationCenter');
+	const jonesNetworkTab = require('./saas/internal-api/jonesNetworkTab');
 
 	const globalRecord = require('./saas/internal-api/globalRecord');
 	const vendorProfile = require('./saas/internal-api/vendorProfile');
@@ -69,6 +70,7 @@ const getInternalAPI = () => {
 		dashboard,
 		accountDirectory,
 		notificationCenter,
+		jonesNetworkTab,
 		globalRecord,
 		vendorProfile,
 		serviceArea,

package/src/saas/internal-api/accounts/models/settings/update.settings.model.js

@@ -16,7 +16,8 @@ class UpdateAccountSettingsModel {
 			integrations = {},
 			auditSlaHours = 24,
 			shouldReachOutVendors = true,
-			isWithoutAutocompleteDistanceLimitation = false
+			isWithoutAutocompleteDistanceLimitation = false,
+			isJonesNetworkTabEnabled = false
 		} = {}
 	) {
 		this.accountId = accountId;
@@ -35,6 +36,7 @@ class UpdateAccountSettingsModel {
 		this.auditSlaHours = auditSlaHours;
 		this.shouldReachOutVendors = shouldReachOutVendors;
 		this.isWithoutAutocompleteDistanceLimitation = isWithoutAutocompleteDistanceLimitation;
+		this.isJonesNetworkTabEnabled = isJonesNetworkTabEnabled;
 	}
 }
 

package/src/saas/internal-api/coi/api/coi.api.js

@@ -9,6 +9,7 @@ const Endpoints = {
 	submitCoi: `${backendUrl}/coi/merge`,
 	completeScan: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/coi/complete-scan`,
 	getCoiPresignedUrl: fileName => `${backendUrl}/saas/coi/${fileName}`,
+	getCoiPresignedUrlBeforeMerge: fileId => `${backendUrl}/saas/coi-file-before-merge/presigned-url/${fileId}`,
 	getCoiHashes: recordId => `${backendUrl}/jcsc/record/${recordId}/coi/hashes`,
 	combineLastTwoCOIs: `${backendUrl}/saas/auditor/record/coi/merge-last-two`
 };
@@ -34,6 +35,10 @@ const getCoiPreSignedUrl = (coiFileName, context) => {
 	return requests.getRequestHandler(Endpoints.getCoiPresignedUrl(coiFileName), {}, context);
 };
 
+const getCoiPresignedUrlBeforeMerge = (fileId, context) => {
+	return requests.getRequestHandler(Endpoints.getCoiPresignedUrlBeforeMerge(fileId), {}, context);
+};
+
 const getCoiHashes = recordId => {
 	return internalRequests.getRequestHandler(Endpoints.getCoiHashes(recordId));
 };
@@ -42,4 +47,12 @@ const combineLastTwoCOIs = (combineLastTwoCOIsModel, context) => {
 	return requests.postRequestHandler(Endpoints.combineLastTwoCOIs, combineLastTwoCOIsModel, context);
 };
 
-module.exports = { uploadToS3, submitCoi, completeScan, getCoiPreSignedUrl, getCoiHashes, combineLastTwoCOIs };
+module.exports = {
+	uploadToS3,
+	submitCoi,
+	completeScan,
+	getCoiPreSignedUrl,
+	getCoiPresignedUrlBeforeMerge,
+	getCoiHashes,
+	combineLastTwoCOIs
+};

package/src/saas/internal-api/coi/api/coi.service.js

@@ -21,6 +21,20 @@ const getCoiPreSignedUrl = (coiFileName, context) => {
 	return coiApi.getCoiPreSignedUrl(coiFileName, context);
 };
 
+const getCoiPresignedUrlBeforeMerge = async (fileId, context, { expectError } = {}) => {
+	const response = await coiApi.getCoiPresignedUrlBeforeMerge(fileId, context);
+
+	if (expectError) {
+		return response;
+	}
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to get presigned url for file before merge with fileId: ${fileId}`);
+	}
+
+	return response.data.preSignedUrl;
+};
+
 const getCoiHashes = recordId => {
 	return coiApi.getCoiHashes(recordId);
 };
@@ -36,4 +50,12 @@ const combineLastTwoCOIs = async (combineLastTwoCOIsModel, auditorContext) => {
 	return response;
 };
 
-module.exports = { uploadToS3, submitCoi, getCoiPreSignedUrl, completeScan, getCoiHashes, combineLastTwoCOIs };
+module.exports = {
+	uploadToS3,
+	submitCoi,
+	getCoiPreSignedUrl,
+	getCoiPresignedUrlBeforeMerge,
+	completeScan,
+	getCoiHashes,
+	combineLastTwoCOIs
+};

package/src/saas/internal-api/coi/consts/hashes.js

@@ -1,4 +1,5 @@
 const defaultCoiHashValue = '79c8e018c43de2d8f4c6b489dde08cc3e21abe30f3e5f3a26ee4a0bca1ca6226';
 const realCoiHashValue = '71de8e0b212168cb513c9f38af63f6b4f6186f950412b9e1e0ea84e1e54e47ce';
+const secondCoiHashValue = '01d359a1d4ec9336526723e6533b92569515be1dd57115d0d73da7b45b48a827';
 
-module.exports = { defaultCoiHashValue, realCoiHashValue };
+module.exports = { defaultCoiHashValue, realCoiHashValue, secondCoiHashValue };

package/src/saas/internal-api/compliance/api/overrideGap/override.gap.service.js

@@ -93,7 +93,7 @@ const getWaiveModelByGap = (
 	return getWaiveModel(record, policyName, attributeName, reason, note, { userId, userRole, auditId });
 };
 
-const getRetractModel = (record, policyName, attributeName, { isAttributeMultipleComments } = {}) => {
+const getRetractModel = (record, policyName, attributeName) => {
 	const auditIds = getPolicyAuditIdsFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName));
 	const userId = env.getSystemUserIdentity(credentials.superUser).id;
 	const userRole = userTypes.ICS;
@@ -108,7 +108,7 @@ const getRetractModel = (record, policyName, attributeName, { isAttributeMultipl
 		});
 		retractModels.push(model);
 	}
-	return isAttributeMultipleComments ? retractModels : retractModels[0];
+	return retractModels.length > 1 ? retractModels : retractModels[0];
 };
 
 const getPolicyAuditIdsFromRecord = (record, policyName, attributeName) => {

package/src/saas/internal-api/jonesNetworkTab/api/jones.network.tab.api.js

@@ -0,0 +1,14 @@
+const requests = require('../../../../common/requests/cookieAuth/requests');
+const { backendUrl } = require('../../../../env').getEnv();
+
+const Endpoints = {
+	isNetworkTabEnabledForUser: `${backendUrl}/saas/account/user/jones-network-enabled/setting`
+};
+
+const isNetworkTabEnabledForUser = async context => {
+	return requests.getRequestHandler(Endpoints.isNetworkTabEnabledForUser, { }, context);
+};
+
+module.exports = {
+	isNetworkTabEnabledForUser
+};

package/src/saas/internal-api/jonesNetworkTab/api/jones.network.tab.service.js

@@ -0,0 +1,16 @@
+const networkTabApi = require('./jones.network.tab.api');
+const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
+
+const isNetworkTabEnabledForUser = async context => {
+	const notificationPageResponse = await networkTabApi.isNetworkTabEnabledForUser(context);
+
+	if (notificationPageResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to get network tab enable settings status, cause by: ${notificationPageResponse.message}`);
+	}
+
+	return notificationPageResponse.data;
+};
+
+module.exports = {
+	isNetworkTabEnabledForUser
+};

package/src/saas/internal-api/jonesNetworkTab/index.js

@@ -0,0 +1,3 @@
+const services = require('./api/jones.network.tab.service');
+
+module.exports = { services };