Merge branch 'develop' into master-to-develop

ui/src/components/integrationFormFields/integrationFormFields.jsx

@@ -1,11 +1,12 @@
 import React, { useEffect } from 'react';
-import { LABELS } from '../constans';
+import { LABELS } from '../constants';
+import { btsJiraCloudUrl } from '../utils';
 
 export const IntegrationFormFields = (props) => {
   const { initialize, disabled, initialData, updateMetaData, ...extensionProps } = props;
   const {
     components: { FieldErrorHint, FieldElement, FieldText, FieldTextFlex },
-    validators: { requiredField, btsUrl, btsProjectKey, btsIntegrationName, email },
+    validators: { requiredField, btsProjectKey, btsIntegrationName, email },
     constants: { SECRET_FIELDS_KEY },
   } = extensionProps;
 
@@ -33,7 +34,7 @@ export const IntegrationFormFields = (props) => {
       <FieldElement
         name="url"
         label={LABELS.URL}
-        validate={btsUrl}
+        validate={btsJiraCloudUrl}
         disabled={disabled}
         isRequired
         dataAutomationId="linkToBTSField"

ui/src/components/integrationSettings/integrationSettings.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useDispatch } from 'react-redux';
-import { LABELS } from '../constans';
+import { LABELS } from '../constants';
 
 export const IntegrationSettings = (props) => {
   const { data, goToPreviousPage, onUpdate, isGlobal, ...extensionProps } = props;

ui/src/components/utils.js

@@ -0,0 +1,19 @@
+const regex = (regexStr) => (value) => RegExp(regexStr).test(value);
+const trimValue = (value) => (typeof value === 'string' ? value.trim() : value);
+const isEmpty = (value) => {
+  const trimmedValue = trimValue(value);
+  return trimmedValue === '' || trimmedValue === undefined || trimmedValue === null;
+};
+const isNotEmpty = (value) => !isEmpty(value);
+const composeValidators = (validators) => (value) =>
+  validators.every((validator) => validator(value));
+
+const jiraCloudUrl = composeValidators([
+  isNotEmpty,
+  regex(/https:\/\/[^?]*.atlassian.(net|com)\/.*/),
+]);
+
+const bindMessageToValidator = (validator, errorMessage) => (value) =>
+  !validator(value) ? errorMessage : undefined;
+
+export const btsJiraCloudUrl = bindMessageToValidator(jiraCloudUrl, 'btsUrlHint');