@atlaskit/link-datasource 1.1.3 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.1.4
+
+### Patch Changes
+
+- [`067fe62a1dc`](https://bitbucket.org/atlassian/atlassian-frontend/commits/067fe62a1dc) - [ux] Updated logic for site selector to default to current site
+
 ## 1.1.3
 
 ### Patch Changes

package/dist/cjs/analytics/constants.js

@@ -8,6 +8,6 @@ var EVENT_CHANNEL = 'media';
 exports.EVENT_CHANNEL = EVENT_CHANNEL;
 var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.1.3"
+  packageVersion: "1.1.4"
 };
 exports.packageMetaData = packageMetaData;

package/dist/cjs/ui/assets-modal/modal/index.js

@@ -231,7 +231,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.1.3",
+  packageVersion: "1.1.4",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {

package/dist/cjs/ui/jira-issues-modal/modal/index.js

@@ -146,9 +146,18 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var selectedJiraSite = (0, _react.useMemo)(function () {
-    return availableSites.find(function (jiraSite) {
-      return jiraSite.cloudId === cloudId;
-    }) || availableSites[0];
+    if (cloudId) {
+      // if the cloud id we're editing isn't in available sites then user is likely unauthorized for that site
+      // TODO: unauthorized to edit flow https://product-fabric.atlassian.net/browse/EDM-7216
+      return availableSites.find(function (jiraSite) {
+        return jiraSite.cloudId === cloudId;
+      }) || availableSites[0];
+    } else {
+      var currentlyLoggedInSiteUrl = window.location.origin;
+      return availableSites.find(function (jiraSite) {
+        return jiraSite.url === currentlyLoggedInSiteUrl;
+      }) || availableSites[0];
+    }
   }, [availableSites, cloudId]);
   var buttonClickedAnalyticsPayload = (0, _react.useMemo)(function () {
     return {
@@ -196,7 +205,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     void fetchSiteDisplayNames();
   }, [fireEvent]);
   (0, _react.useEffect)(function () {
-    if (!cloudId && selectedJiraSite) {
+    if (selectedJiraSite && (!cloudId || cloudId !== selectedJiraSite.cloudId)) {
       setCloudId(selectedJiraSite.cloudId);
     }
   }, [cloudId, selectedJiraSite]);

package/dist/es2019/analytics/constants.js

@@ -1,5 +1,5 @@
 export const EVENT_CHANNEL = 'media';
 export const packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.1.3"
+  packageVersion: "1.1.4"
 };

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -205,7 +205,7 @@ const analyticsContextAttributes = {
 };
 const analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.1.3",
+  packageVersion: "1.1.4",
   source: 'datasourceConfigModal'
 };
 const contextData = {

package/dist/es2019/ui/jira-issues-modal/modal/index.js

@@ -116,7 +116,16 @@ export const PlainJiraIssuesConfigModal = props => {
   const {
     fireEvent
   } = useDatasourceAnalyticsEvents();
-  const selectedJiraSite = useMemo(() => availableSites.find(jiraSite => jiraSite.cloudId === cloudId) || availableSites[0], [availableSites, cloudId]);
+  const selectedJiraSite = useMemo(() => {
+    if (cloudId) {
+      // if the cloud id we're editing isn't in available sites then user is likely unauthorized for that site
+      // TODO: unauthorized to edit flow https://product-fabric.atlassian.net/browse/EDM-7216
+      return availableSites.find(jiraSite => jiraSite.cloudId === cloudId) || availableSites[0];
+    } else {
+      const currentlyLoggedInSiteUrl = window.location.origin;
+      return availableSites.find(jiraSite => jiraSite.url === currentlyLoggedInSiteUrl) || availableSites[0];
+    }
+  }, [availableSites, cloudId]);
   const buttonClickedAnalyticsPayload = useMemo(() => {
     return {
       extensionKey: extensionKey,
@@ -146,7 +155,7 @@ export const PlainJiraIssuesConfigModal = props => {
     void fetchSiteDisplayNames();
   }, [fireEvent]);
   useEffect(() => {
-    if (!cloudId && selectedJiraSite) {
+    if (selectedJiraSite && (!cloudId || cloudId !== selectedJiraSite.cloudId)) {
       setCloudId(selectedJiraSite.cloudId);
     }
   }, [cloudId, selectedJiraSite]);

package/dist/esm/analytics/constants.js

@@ -1,5 +1,5 @@
 export var EVENT_CHANNEL = 'media';
 export var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.1.3"
+  packageVersion: "1.1.4"
 };

package/dist/esm/ui/assets-modal/modal/index.js

@@ -222,7 +222,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.1.3",
+  packageVersion: "1.1.4",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {

package/dist/esm/ui/jira-issues-modal/modal/index.js

@@ -136,9 +136,18 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var selectedJiraSite = useMemo(function () {
-    return availableSites.find(function (jiraSite) {
-      return jiraSite.cloudId === cloudId;
-    }) || availableSites[0];
+    if (cloudId) {
+      // if the cloud id we're editing isn't in available sites then user is likely unauthorized for that site
+      // TODO: unauthorized to edit flow https://product-fabric.atlassian.net/browse/EDM-7216
+      return availableSites.find(function (jiraSite) {
+        return jiraSite.cloudId === cloudId;
+      }) || availableSites[0];
+    } else {
+      var currentlyLoggedInSiteUrl = window.location.origin;
+      return availableSites.find(function (jiraSite) {
+        return jiraSite.url === currentlyLoggedInSiteUrl;
+      }) || availableSites[0];
+    }
   }, [availableSites, cloudId]);
   var buttonClickedAnalyticsPayload = useMemo(function () {
     return {
@@ -186,7 +195,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     void fetchSiteDisplayNames();
   }, [fireEvent]);
   useEffect(function () {
-    if (!cloudId && selectedJiraSite) {
+    if (selectedJiraSite && (!cloudId || cloudId !== selectedJiraSite.cloudId)) {
       setCloudId(selectedJiraSite.cloudId);
     }
   }, [cloudId, selectedJiraSite]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"