@atlaskit/smart-card 43.1.0 → 43.1.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/smart-card
 
+## 43.1.2
+
+### Patch Changes
+
+- [`52a78935ac6ef`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/52a78935ac6ef) -
+  Adjust experiment exposure logic for platform*linking_bluelink_connect*{product} logic so that the
+  experiment related logic only happens behind the gate.
+- Updated dependencies
+
+## 43.1.1
+
+### Patch Changes
+
+- [`9fa4acd606891`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9fa4acd606891) -
+  Remove experiment gate for sharepoint and google hyperlink resolve
+- Updated dependencies
+
 ## 43.1.0
 
 ### Minor Changes

package/dist/cjs/state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator.js

@@ -1,36 +1,25 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSharePointDomain = exports.isGoogleDomain = exports.default = void 0;
+exports.shouldResolveUrl = exports.default = void 0;
 var _react = require("react");
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _linkProvider = require("@atlaskit/link-provider");
-var isSharePointDomain = exports.isSharePointDomain = function isSharePointDomain(href) {
+var allowedHostnames = ['sharepoint.com', 'onedrive.live.com', 'docs.google.com', 'drive.google.com'];
+var shouldResolveUrl = exports.shouldResolveUrl = function shouldResolveUrl(href) {
   try {
     var hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('sharepoint.com') || hostname.includes('onedrive.live.com');
+    return allowedHostnames.some(function (allowedHostname) {
+      return hostname.includes(allowedHostname);
+    });
   } catch (_unused) {
     return false;
   }
 };
-var isGoogleDomain = exports.isGoogleDomain = function isGoogleDomain(href) {
-  try {
-    var hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('docs.google.com') || hostname.includes('drive.google.com');
-  } catch (_unused2) {
-    return false;
-  }
-};
 var useResolveHyperlinkValidator = function useResolveHyperlinkValidator() {
   var href = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var hasSmartCardProvider = !!(0, _react.useContext)(_linkProvider.SmartCardContext);
-  var isSharePointResolveEnabled = _featureGateJsClient.default.getExperimentValue('platform_editor_resolve_hyperlinks_confluence', 'isEnabled', false) || _featureGateJsClient.default.getExperimentValue('platform_editor_resolve_hyperlinks_jira', 'isEnabled', false);
-  var isGoogleResolveEnabled = _featureGateJsClient.default.getExperimentValue('platform_editor_resolve_google_hyperlinks', 'isEnabled', false);
-  var shouldResolveSharePoint = isSharePointDomain(href) && isSharePointResolveEnabled;
-  var shouldResolveGoogle = isGoogleDomain(href) && isGoogleResolveEnabled;
-  return hasSmartCardProvider && (shouldResolveSharePoint || shouldResolveGoogle);
+  return hasSmartCardProvider && shouldResolveUrl(href);
 };
 var _default = exports.default = useResolveHyperlinkValidator;

package/dist/cjs/view/HoverCard/components/HoverCardComponent.js

@@ -230,7 +230,7 @@ var HoverCardComponent = exports.HoverCardComponent = function HoverCardComponen
     return /*#__PURE__*/_react.default.createElement("span", {
       ref: parentSpan
     }, /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({}, triggerProps, {
-      // eslint-disable-next-line jsx-a11y/mouse-events-have-key-events, @atlassian/a11y/mouse-events-have-key-events
+      // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
       onMouseOver: initShowCard
       // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
       ,

package/dist/cjs/view/LinkUrl/HyperlinkResolver/index.js

@@ -43,7 +43,6 @@ var HyperlinkWithSmartLinkResolverInner = function HyperlinkWithSmartLinkResolve
   var services = (0, _helpers.getServices)(state === null || state === void 0 ? void 0 : state.details);
   var thirdPartyARI = (0, _helpers.getThirdPartyARI)(state === null || state === void 0 ? void 0 : state.details);
   var firstPartyIdentifier = (0, _helpers.getFirstPartyIdentifier)();
-  var isConnectButtonExperimentEnabled = _featureGateJsClient.default.getExperimentValue('platform_linking_bluelink_connect_CONFLUENCE', 'isEnabled', false) || _featureGateJsClient.default.getExperimentValue('platform_linking_bluelink_connect_JIRA', 'isEnabled', false);
   var fire3PClickEvent = (0, _platformFeatureFlags.fg)('platform_smartlink_3pclick_analytics') ?
   // eslint-disable-next-line react-hooks/rules-of-hooks
   (0, _useSmartLinkEvents.useFire3PWorkflowsClickEvent)(firstPartyIdentifier, thirdPartyARI) : undefined;
@@ -56,26 +55,17 @@ var HyperlinkWithSmartLinkResolverInner = function HyperlinkWithSmartLinkResolve
     }
     onClickCallback === null || onClickCallback === void 0 || onClickCallback(e);
   }, [onClickCallback, fire3PClickEvent, state === null || state === void 0 ? void 0 : state.status]);
-  var onAuthorize = isConnectButtonExperimentEnabled ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _react.useCallback)(function () {
+  var onAuthorize = (0, _react.useCallback)(function () {
     return actions.authorize('hyperlink');
-  }, [actions]) : undefined;
-  if (isConnectButtonExperimentEnabled) {
-    switch (state === null || state === void 0 ? void 0 : state.status) {
-      case 'unauthorized':
-        var provider = (0, _linkExtractors.extractSmartLinkProvider)(state === null || state === void 0 ? void 0 : state.details);
-        return /*#__PURE__*/_react.default.createElement(_unauthorizeView.default, (0, _extends2.default)({}, props, {
-          onAuthorize: services !== null && services !== void 0 && services.length ? onAuthorize : undefined,
-          onClick: onClick,
-          showConnectBtn: (services === null || services === void 0 ? void 0 : services.length) > 0,
-          provider: provider
-        }));
-      default:
-        return /*#__PURE__*/_react.default.createElement(_Hyperlink.default, (0, _extends2.default)({}, props, {
-          onClick: onClick
-        }));
-    }
+  }, [actions]);
+  if ((state === null || state === void 0 ? void 0 : state.status) === 'unauthorized' && (_featureGateJsClient.default.getExperimentValue('platform_linking_bluelink_connect_confluence', 'isEnabled', false) || _featureGateJsClient.default.getExperimentValue('platform_linking_bluelink_connect_jira', 'isEnabled', false))) {
+    var provider = (0, _linkExtractors.extractSmartLinkProvider)(state === null || state === void 0 ? void 0 : state.details);
+    return /*#__PURE__*/_react.default.createElement(_unauthorizeView.default, (0, _extends2.default)({}, props, {
+      onAuthorize: services !== null && services !== void 0 && services.length ? onAuthorize : undefined,
+      onClick: onClick,
+      showConnectBtn: (services === null || services === void 0 ? void 0 : services.length) > 0,
+      provider: provider
+    }));
   }
   return /*#__PURE__*/_react.default.createElement(_Hyperlink.default, (0, _extends2.default)({}, props, {
     onClick: onClick

package/dist/es2019/state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator.js

@@ -1,28 +1,16 @@
 import { useContext } from 'react';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { SmartCardContext } from '@atlaskit/link-provider';
-export const isSharePointDomain = href => {
+const allowedHostnames = ['sharepoint.com', 'onedrive.live.com', 'docs.google.com', 'drive.google.com'];
+export const shouldResolveUrl = href => {
   try {
     const hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('sharepoint.com') || hostname.includes('onedrive.live.com');
-  } catch {
-    return false;
-  }
-};
-export const isGoogleDomain = href => {
-  try {
-    const hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('docs.google.com') || hostname.includes('drive.google.com');
+    return allowedHostnames.some(allowedHostname => hostname.includes(allowedHostname));
   } catch {
     return false;
   }
 };
 const useResolveHyperlinkValidator = (href = '') => {
   const hasSmartCardProvider = !!useContext(SmartCardContext);
-  const isSharePointResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_confluence', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_jira', 'isEnabled', false);
-  const isGoogleResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_google_hyperlinks', 'isEnabled', false);
-  const shouldResolveSharePoint = isSharePointDomain(href) && isSharePointResolveEnabled;
-  const shouldResolveGoogle = isGoogleDomain(href) && isGoogleResolveEnabled;
-  return hasSmartCardProvider && (shouldResolveSharePoint || shouldResolveGoogle);
+  return hasSmartCardProvider && shouldResolveUrl(href);
 };
 export default useResolveHyperlinkValidator;

package/dist/es2019/view/HoverCard/components/HoverCardComponent.js

@@ -207,7 +207,7 @@ export const HoverCardComponent = ({
   }) => /*#__PURE__*/React.createElement("span", {
     ref: parentSpan
   }, /*#__PURE__*/React.createElement("span", _extends({}, triggerProps, {
-    // eslint-disable-next-line jsx-a11y/mouse-events-have-key-events, @atlassian/a11y/mouse-events-have-key-events
+    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
     onMouseOver: initShowCard
     // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
     ,

package/dist/es2019/view/LinkUrl/HyperlinkResolver/index.js

@@ -30,7 +30,6 @@ const HyperlinkWithSmartLinkResolverInner = ({
   const services = getServices(state === null || state === void 0 ? void 0 : state.details);
   const thirdPartyARI = getThirdPartyARI(state === null || state === void 0 ? void 0 : state.details);
   const firstPartyIdentifier = getFirstPartyIdentifier();
-  const isConnectButtonExperimentEnabled = FeatureGates.getExperimentValue('platform_linking_bluelink_connect_CONFLUENCE', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_linking_bluelink_connect_JIRA', 'isEnabled', false);
   const fire3PClickEvent = fg('platform_smartlink_3pclick_analytics') ?
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useFire3PWorkflowsClickEvent(firstPartyIdentifier, thirdPartyARI) : undefined;
@@ -43,24 +42,15 @@ const HyperlinkWithSmartLinkResolverInner = ({
     }
     onClickCallback === null || onClickCallback === void 0 ? void 0 : onClickCallback(e);
   }, [onClickCallback, fire3PClickEvent, state === null || state === void 0 ? void 0 : state.status]);
-  const onAuthorize = isConnectButtonExperimentEnabled ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useCallback(() => actions.authorize('hyperlink'), [actions]) : undefined;
-  if (isConnectButtonExperimentEnabled) {
-    switch (state === null || state === void 0 ? void 0 : state.status) {
-      case 'unauthorized':
-        const provider = extractSmartLinkProvider(state === null || state === void 0 ? void 0 : state.details);
-        return /*#__PURE__*/React.createElement(HyperlinkUnauthorizedView, _extends({}, props, {
-          onAuthorize: services !== null && services !== void 0 && services.length ? onAuthorize : undefined,
-          onClick: onClick,
-          showConnectBtn: (services === null || services === void 0 ? void 0 : services.length) > 0,
-          provider: provider
-        }));
-      default:
-        return /*#__PURE__*/React.createElement(Hyperlink, _extends({}, props, {
-          onClick: onClick
-        }));
-    }
+  const onAuthorize = useCallback(() => actions.authorize('hyperlink'), [actions]);
+  if ((state === null || state === void 0 ? void 0 : state.status) === 'unauthorized' && (FeatureGates.getExperimentValue('platform_linking_bluelink_connect_confluence', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_linking_bluelink_connect_jira', 'isEnabled', false))) {
+    const provider = extractSmartLinkProvider(state === null || state === void 0 ? void 0 : state.details);
+    return /*#__PURE__*/React.createElement(HyperlinkUnauthorizedView, _extends({}, props, {
+      onAuthorize: services !== null && services !== void 0 && services.length ? onAuthorize : undefined,
+      onClick: onClick,
+      showConnectBtn: (services === null || services === void 0 ? void 0 : services.length) > 0,
+      provider: provider
+    }));
   }
   return /*#__PURE__*/React.createElement(Hyperlink, _extends({}, props, {
     onClick: onClick

package/dist/esm/state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator.js

@@ -1,29 +1,19 @@
 import { useContext } from 'react';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { SmartCardContext } from '@atlaskit/link-provider';
-export var isSharePointDomain = function isSharePointDomain(href) {
+var allowedHostnames = ['sharepoint.com', 'onedrive.live.com', 'docs.google.com', 'drive.google.com'];
+export var shouldResolveUrl = function shouldResolveUrl(href) {
   try {
     var hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('sharepoint.com') || hostname.includes('onedrive.live.com');
+    return allowedHostnames.some(function (allowedHostname) {
+      return hostname.includes(allowedHostname);
+    });
   } catch (_unused) {
     return false;
   }
 };
-export var isGoogleDomain = function isGoogleDomain(href) {
-  try {
-    var hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('docs.google.com') || hostname.includes('drive.google.com');
-  } catch (_unused2) {
-    return false;
-  }
-};
 var useResolveHyperlinkValidator = function useResolveHyperlinkValidator() {
   var href = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var hasSmartCardProvider = !!useContext(SmartCardContext);
-  var isSharePointResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_confluence', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_jira', 'isEnabled', false);
-  var isGoogleResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_google_hyperlinks', 'isEnabled', false);
-  var shouldResolveSharePoint = isSharePointDomain(href) && isSharePointResolveEnabled;
-  var shouldResolveGoogle = isGoogleDomain(href) && isGoogleResolveEnabled;
-  return hasSmartCardProvider && (shouldResolveSharePoint || shouldResolveGoogle);
+  return hasSmartCardProvider && shouldResolveUrl(href);
 };
 export default useResolveHyperlinkValidator;

package/dist/esm/view/HoverCard/components/HoverCardComponent.js

@@ -221,7 +221,7 @@ export var HoverCardComponent = function HoverCardComponent(_ref) {
     return /*#__PURE__*/React.createElement("span", {
       ref: parentSpan
     }, /*#__PURE__*/React.createElement("span", _extends({}, triggerProps, {
-      // eslint-disable-next-line jsx-a11y/mouse-events-have-key-events, @atlassian/a11y/mouse-events-have-key-events
+      // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
       onMouseOver: initShowCard
       // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
       ,

package/dist/esm/view/LinkUrl/HyperlinkResolver/index.js

@@ -34,7 +34,6 @@ var HyperlinkWithSmartLinkResolverInner = function HyperlinkWithSmartLinkResolve
   var services = getServices(state === null || state === void 0 ? void 0 : state.details);
   var thirdPartyARI = getThirdPartyARI(state === null || state === void 0 ? void 0 : state.details);
   var firstPartyIdentifier = getFirstPartyIdentifier();
-  var isConnectButtonExperimentEnabled = FeatureGates.getExperimentValue('platform_linking_bluelink_connect_CONFLUENCE', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_linking_bluelink_connect_JIRA', 'isEnabled', false);
   var fire3PClickEvent = fg('platform_smartlink_3pclick_analytics') ?
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useFire3PWorkflowsClickEvent(firstPartyIdentifier, thirdPartyARI) : undefined;
@@ -47,26 +46,17 @@ var HyperlinkWithSmartLinkResolverInner = function HyperlinkWithSmartLinkResolve
     }
     onClickCallback === null || onClickCallback === void 0 || onClickCallback(e);
   }, [onClickCallback, fire3PClickEvent, state === null || state === void 0 ? void 0 : state.status]);
-  var onAuthorize = isConnectButtonExperimentEnabled ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useCallback(function () {
+  var onAuthorize = useCallback(function () {
     return actions.authorize('hyperlink');
-  }, [actions]) : undefined;
-  if (isConnectButtonExperimentEnabled) {
-    switch (state === null || state === void 0 ? void 0 : state.status) {
-      case 'unauthorized':
-        var provider = extractSmartLinkProvider(state === null || state === void 0 ? void 0 : state.details);
-        return /*#__PURE__*/React.createElement(HyperlinkUnauthorizedView, _extends({}, props, {
-          onAuthorize: services !== null && services !== void 0 && services.length ? onAuthorize : undefined,
-          onClick: onClick,
-          showConnectBtn: (services === null || services === void 0 ? void 0 : services.length) > 0,
-          provider: provider
-        }));
-      default:
-        return /*#__PURE__*/React.createElement(Hyperlink, _extends({}, props, {
-          onClick: onClick
-        }));
-    }
+  }, [actions]);
+  if ((state === null || state === void 0 ? void 0 : state.status) === 'unauthorized' && (FeatureGates.getExperimentValue('platform_linking_bluelink_connect_confluence', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_linking_bluelink_connect_jira', 'isEnabled', false))) {
+    var provider = extractSmartLinkProvider(state === null || state === void 0 ? void 0 : state.details);
+    return /*#__PURE__*/React.createElement(HyperlinkUnauthorizedView, _extends({}, props, {
+      onAuthorize: services !== null && services !== void 0 && services.length ? onAuthorize : undefined,
+      onClick: onClick,
+      showConnectBtn: (services === null || services === void 0 ? void 0 : services.length) > 0,
+      provider: provider
+    }));
   }
   return /*#__PURE__*/React.createElement(Hyperlink, _extends({}, props, {
     onClick: onClick

package/dist/types/state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator.d.ts

@@ -1,4 +1,3 @@
-export declare const isSharePointDomain: (href: string) => boolean;
-export declare const isGoogleDomain: (href: string) => boolean;
+export declare const shouldResolveUrl: (href: string) => boolean;
 declare const useResolveHyperlinkValidator: (href?: string) => boolean;
 export default useResolveHyperlinkValidator;

package/dist/types-ts4.5/state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator.d.ts

@@ -1,4 +1,3 @@
-export declare const isSharePointDomain: (href: string) => boolean;
-export declare const isGoogleDomain: (href: string) => boolean;
+export declare const shouldResolveUrl: (href: string) => boolean;
 declare const useResolveHyperlinkValidator: (href?: string) => boolean;
 export default useResolveHyperlinkValidator;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "43.1.0",
+	"version": "43.1.2",
 	"description": "Smart card component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 		"@atlaskit/afm-i18n-platform-linking-platform-smart-card": "2.6.0",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-next": "^11.1.0",
-		"@atlaskit/avatar": "^25.3.0",
+		"@atlaskit/avatar": "^25.4.0",
 		"@atlaskit/avatar-group": "^12.3.0",
 		"@atlaskit/badge": "^18.2.0",
 		"@atlaskit/button": "^23.5.0",
@@ -59,7 +59,7 @@
 		"@atlaskit/logo": "^19.9.0",
 		"@atlaskit/lozenge": "^13.0.0",
 		"@atlaskit/menu": "^8.4.0",
-		"@atlaskit/modal-dialog": "^14.4.0",
+		"@atlaskit/modal-dialog": "^14.5.0",
 		"@atlaskit/outbound-auth-flow-client": "^3.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/popup": "^4.4.0",