@atlaskit/link-datasource 1.27.4 → 1.28.1

package/dist/es2019/ui/table-footer/powered-by-jsm-assets/index.js

@@ -0,0 +1,45 @@
+import React from 'react';
+import { JiraServiceManagementIcon } from '@atlaskit/logo';
+import { Box, xcss } from '@atlaskit/primitives';
+import { useDatasourceAnalyticsEvents } from '../../../analytics';
+const jsmTextStyles = xcss({
+  fontSize: 'small',
+  color: 'color.text.subtle',
+  marginLeft: "var(--ds-space-075, 6px)",
+  ':hover': {
+    color: 'color.link.pressed'
+  }
+});
+const jsmContainerStyles = xcss({
+  display: 'flex',
+  flexDirection: 'row-reverse'
+});
+export const PoweredByJSMAssets = props => {
+  const ASSETS_LINK = '/jira/servicedesk/assets';
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
+  return /*#__PURE__*/React.createElement(Box, {
+    xcss: jsmContainerStyles,
+    padding: "space.150"
+  }, /*#__PURE__*/React.createElement("a", {
+    "data-testid": 'powered-by-jsm-assets-link',
+    onClick: () => fireEvent('ui.link.clicked.poweredBy', {
+      componentHierarchy: 'datasourceTable',
+      extensionKey: 'jsm-cmdb-gateway'
+    }),
+    href: ASSETS_LINK,
+    rel: "noreferrer",
+    target: "_blank",
+    style: {
+      display: 'inline-flex',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React.createElement(JiraServiceManagementIcon, {
+    size: "xsmall",
+    appearance: "brand",
+    label: props.text
+  }), /*#__PURE__*/React.createElement(Box, {
+    xcss: jsmTextStyles
+  }, props.text)));
+};

package/dist/esm/services/mocks.js

@@ -125,4 +125,155 @@ export var mockFieldValuesResponse = {
       }
     }
   }
+};
+export var mockUserRecommendationsResponse = {
+  recommendedUsers: [{
+    entityType: 'USER',
+    id: '5ffe1efc34847e0069446bf8',
+    name: 'Atlassian Assist (staging)',
+    avatarUrl: '',
+    nickname: 'Atlassian Assist (staging)',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '62df272c3aaeedcae755c533',
+    name: 'Atlas for Jira (staging)',
+    avatarUrl: '',
+    nickname: 'Atlas for Jira (staging)',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '6232be743eacc50071fe13ba',
+    name: 'Stephen',
+    email: 'sdemontfort+10@atlassian.com',
+    avatarUrl: '',
+    nickname: 'Stephen',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-GB',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '608b253e2911000071b6e6d6',
+    name: 'Pranay Test 1773',
+    email: 'pmarella+1773@atlassian.com',
+    avatarUrl: '',
+    nickname: 'Pranay Test 1773',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-US',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '6202a8cfc4e2c9006ae620b1',
+    name: 'Jacob Test3',
+    email: 'jbrunson+test3@atlassian.com',
+    avatarUrl: '',
+    nickname: 'Jacob Test3',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-US',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '61428180ff23ba00717b7d78',
+    name: 'Test Themes',
+    avatarUrl: '',
+    nickname: 'Test Themes',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '5d9e2c300d44fc0dca5428bb',
+    name: 'Confluence Connect Test - AP methods',
+    avatarUrl: '',
+    nickname: 'Confluence Connect Test - AP methods',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '655363:1276a696-f0d0-4f3a-a022-636723eb5148',
+    name: 'Confluence Google Drive',
+    avatarUrl: '',
+    nickname: 'Confluence Google Drive',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    userType: 'APP',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '712020:413e43c0-7202-4016-a318-a004892e7f8c',
+    name: 'arthur chen nth user',
+    avatarUrl: '',
+    nickname: 'arthur chen nth user',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-US',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }, {
+    entityType: 'USER',
+    id: '712020:9219bf5f-0358-4782-99dc-bc73258b2ddc',
+    name: 'jeff mellis',
+    avatarUrl: '',
+    nickname: 'jeff mellis',
+    matchPositions: {},
+    accessLevel: 'CONTAINER',
+    accountStatus: 'ACTIVE',
+    notMentionable: false,
+    locale: 'en-US',
+    userType: 'DEFAULT',
+    attributes: {
+      isConfluenceExternalCollaborator: false
+    }
+  }]
 };

package/dist/esm/services/useBasicFilterAGG.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback, useMemo } from 'react';
 import { request } from '@atlaskit/linking-common';
-import { fieldValuesQuery, hydrateJQLQuery } from './utils';
+import { fieldValuesQuery, hydrateJQLQuery, userQuery } from './utils';
 var AGG_BASE_URL = '/gateway/api/graphql';
 export var useBasicFilterAGG = function useBasicFilterAGG() {
   var requestCall = useCallback( /*#__PURE__*/function () {
@@ -54,10 +54,17 @@ export var useBasicFilterAGG = function useBasicFilterAGG() {
       query: fieldValuesQuery
     });
   }, [requestCall]);
+  var getCurrentUserInfo = useCallback(function () {
+    return requestCall({
+      operationName: 'userQuery',
+      query: userQuery
+    });
+  }, [requestCall]);
   return useMemo(function () {
     return {
       getHydratedJQL: getHydratedJQL,
-      getFieldValues: getFieldValues
+      getFieldValues: getFieldValues,
+      getCurrentUserInfo: getCurrentUserInfo
     };
-  }, [getHydratedJQL, getFieldValues]);
+  }, [getHydratedJQL, getFieldValues, getCurrentUserInfo]);
 };

package/dist/esm/services/utils.js

@@ -6,4 +6,5 @@
  */
 
 export var hydrateJQLQuery = "query hydrate($cloudId: ID!, $jql: String!) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      hydrateJqlQuery(query: $jql) {\n        ... on JiraJqlHydratedQuery {\n          fields {\n            ... on JiraJqlQueryHydratedField {\n              jqlTerm\n              values {\n                ... on JiraJqlQueryHydratedValue {\n                  values {\n                    ... on JiraJqlProjectFieldValue {\n                      jqlTerm\n                      displayName\n                      project {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlStatusFieldValue {\n                      jqlTerm\n                      displayName\n                      statusCategory {\n                        colorName\n                      }\n                    }\n                    ... on JiraJqlIssueTypeFieldValue {\n                      jqlTerm\n                      displayName\n                      issueTypes {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlUserFieldValue {\n                      jqlTerm\n                      displayName\n                      user {\n                        picture\n                      }\n                    }\n                    ... on JiraJqlGroupFieldValue {\n                      jqlTerm\n                      displayName\n                      group {\n                        name\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
-export var fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
+export var fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
+export var userQuery = "query userQuery {\n  me {\n    user {\n      id\n      accountId\n    }\n  }\n}";

package/dist/esm/ui/common/modal/popup-select/formatOptionLabel.js

@@ -73,8 +73,11 @@ var formatOptionLabel = function formatOptionLabel(data) {
       data: data
     });
   }
-  return /*#__PURE__*/React.createElement(IconOptionLabel, {
-    data: data
-  });
+  if (data.optionType === 'iconLabel') {
+    return /*#__PURE__*/React.createElement(IconOptionLabel, {
+      data: data
+    });
+  }
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
 };
 export default formatOptionLabel;

package/dist/esm/ui/common/modal/popup-select/index.js

@@ -23,7 +23,8 @@ var noFilterOptions = function noFilterOptions() {
 };
 export var FilterPopupSelect = function FilterPopupSelect(_ref) {
   var filterName = _ref.filterName,
-    totalCount = _ref.totalCount,
+    _ref$totalCount = _ref.totalCount,
+    totalCount = _ref$totalCount === void 0 ? 0 : _ref$totalCount,
     status = _ref.status,
     buttonLabel = _ref.buttonLabel,
     _ref$showLoading = _ref.showLoading,

package/dist/esm/ui/common/modal/popup-select/trigger.js

@@ -8,8 +8,7 @@ import { Box, Flex, xcss } from '@atlaskit/primitives';
 import Spinner from '@atlaskit/spinner';
 var triggerButtonLabelStyles = xcss({
   textOverflow: 'ellipsis',
-  overflow: 'hidden',
-  maxWidth: '150px'
+  overflow: 'hidden'
 });
 var badgeStyles = xcss({
   marginLeft: 'space.050'

package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.js

@@ -0,0 +1,9 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { forwardRef } from 'react';
+import { PopupComponentContainer } from './styled';
+export var PopupComponent = /*#__PURE__*/forwardRef(function (props, ref) {
+  return /*#__PURE__*/React.createElement(PopupComponentContainer, _extends({}, props, {
+    "data-testId": 'confluence-search-datasource-popup-container',
+    ref: ref
+  }));
+});

package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.js

@@ -0,0 +1,79 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { useCallback, useState } from 'react';
+import { FormattedMessage, useIntl } from 'react-intl-next';
+import Popup from '@atlaskit/popup';
+import { layers } from '@atlaskit/theme/constants';
+import { CLOLBasicFilters } from '../../types';
+import { dateRangeMessages } from './messages';
+import { PopupComponent } from './PopupComponent';
+import { CustomDropdown, CustomDropdownItem } from './styled';
+import { PopupTrigger } from './trigger';
+var lastModifiedValues = ['anyTime', 'today', 'yesterday', 'past7Days', 'past30Days', 'pastYear', 'custom'];
+var defaultOptionValue = 'anyTime';
+var filterName = CLOLBasicFilters.lastModified;
+export var DateRangePicker = function DateRangePicker(_ref) {
+  var onSelectionChange = _ref.onSelectionChange;
+  var _useState = useState(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentOption = _useState2[0],
+    setCurrentOption = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isPickerOpen = _useState4[0],
+    setIsPickerOpen = _useState4[1];
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var onClickFilterOption = useCallback(function (option) {
+    setCurrentOption(option);
+    setIsPickerOpen(false);
+    onSelectionChange(filterName, [{
+      optionType: 'defaultOption',
+      label: option,
+      value: option
+    }]);
+  }, [onSelectionChange]);
+  var handleTogglePopup = useCallback(function () {
+    setIsPickerOpen(!isPickerOpen);
+  }, [isPickerOpen]);
+  return /*#__PURE__*/React.createElement(Popup, {
+    isOpen: isPickerOpen,
+    onClose: handleTogglePopup,
+    popupComponent: PopupComponent,
+    zIndex: layers.modal(),
+    content: function content() {
+      return /*#__PURE__*/React.createElement(CustomDropdown, null, lastModifiedValues.map(function (option) {
+        return /*#__PURE__*/React.createElement(CustomDropdownItem, {
+          key: option
+          //want to show Anytime as selected if none of the other options are selected
+          ,
+          isSelected: currentOption ? option === currentOption : option === defaultOptionValue,
+          onClick: function onClick() {
+            return onClickFilterOption(option);
+          }
+        }, /*#__PURE__*/React.createElement(FormattedMessage, getCurrentOptionLabel(option)));
+      }));
+    },
+    placement: "bottom-start",
+    trigger: function trigger(triggerProps) {
+      return /*#__PURE__*/React.createElement(PopupTrigger, {
+        triggerProps: triggerProps,
+        optionSelected: !!currentOption,
+        label: formatMessage(dateRangeMessages.dateRangeTitle),
+        selectedLabel: formatMessage(getCurrentOptionLabel(currentOption)),
+        onClickButton: handleTogglePopup
+      });
+    }
+  });
+};
+var getCurrentOptionLabel = function getCurrentOptionLabel(option) {
+  var mapping = {
+    anyTime: 'dateRangeAnyTime',
+    today: 'dateRangeToday',
+    yesterday: 'dateRangeYesterday',
+    past7Days: 'dateRangeLastWeek',
+    past30Days: 'dateRangeLastMonth',
+    pastYear: 'dateRangeLastYear',
+    custom: 'dateRangeCustom'
+  };
+  return option ? dateRangeMessages[mapping[option]] : dateRangeMessages[mapping['anyTime']];
+};

package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/messages.js

@@ -0,0 +1,43 @@
+import { defineMessages } from 'react-intl-next';
+export var dateRangeMessages = defineMessages({
+  dateRangeTitle: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.title',
+    defaultMessage: 'Last updated',
+    description: 'Filter by the date content was modified'
+  },
+  dateRangeAnyTime: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.any.time',
+    defaultMessage: 'Anytime',
+    description: 'Option to show content from any time'
+  },
+  dateRangeToday: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.today',
+    defaultMessage: 'Today',
+    description: 'Date range of content modified today'
+  },
+  dateRangeYesterday: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.yesterday',
+    defaultMessage: 'Yesterday',
+    description: 'Date range of content modified yesterday'
+  },
+  dateRangeLastWeek: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.last.week',
+    defaultMessage: 'Past 7 days',
+    description: 'Date range of content modified in the last 7 days'
+  },
+  dateRangeLastMonth: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.last.month',
+    defaultMessage: 'Past 30 days',
+    description: 'Date range of content modified in the last 30 days'
+  },
+  dateRangeLastYear: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.last.year',
+    defaultMessage: 'Past year',
+    description: 'Date range of content modified in the last 365 days'
+  },
+  dateRangeCustom: {
+    id: 'linkDataSource.confluence-search.configmodal.date.range.custom',
+    defaultMessage: 'Custom',
+    description: 'Custom date range'
+  }
+});

package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/styled.js

@@ -0,0 +1,68 @@
+import styled from '@emotion/styled';
+import { B400, B50, N0, N20, N30, R400 } from '@atlaskit/theme/colors';
+export var PopupComponentContainer = styled.div({
+  boxSizing: 'border-box',
+  display: 'block',
+  flex: '1 1 auto',
+  overflow: 'visible',
+  background: "var(--ds-background-input, ".concat(N0, ")"),
+  ':focus': {
+    outline: 'none'
+  },
+  boxShadow: "var(--ds-shadow-overlay, 0px 0px 1px 0px rgba(9, 30, 66, 0.31), 0px 3px 5px 0px rgba(9, 30, 66, 0.20))"
+});
+export var CustomDropdown = styled.div({
+  width: '360px',
+  background: "var(--ds-background-input, ".concat(N0, ")"),
+  borderRadius: '3px',
+  boxShadow: "var(--ds-shadow-overlay, 0px 0px 1px 0px rgba(9, 30, 66, 0.31), 0px 3px 5px 0px rgba(9, 30, 66, 0.20))",
+  zIndex: '900'
+});
+export var CustomDropdownItem = styled.div(function (props) {
+  return {
+    height: '36px',
+    width: '100%',
+    display: 'flex',
+    justifyContent: 'flex-start',
+    alignItems: 'center',
+    paddingLeft: props.isSelected ? '15px' : '16px',
+    boxSizing: 'border-box',
+    color: props.isSelected ? "var(--ds-text-selected, ".concat(B400, ")") : 'inherit',
+    background: props.isSelected ? "var(--ds-background-accent-blue-subtlest, ".concat(B50, ")") : 'transparent',
+    borderLeft: props.isSelected ? "2px solid ".concat("var(--ds-text-selected, ".concat(B400, ")")) : 'none',
+    '&:hover': {
+      background: props.isSelected ? "var(--ds-background-accent-blue-subtlest, ".concat(B50, ")") : "var(--ds-background-input-hovered, ".concat(N20, ")"),
+      cursor: 'default'
+    }
+  };
+});
+export var CustomDateWrapper = styled.div({
+  padding: "var(--ds-space-150, 12px)",
+  boxSizing: 'border-box'
+});
+export var DatePickersWrapper = styled.div({
+  display: 'flex',
+  justifyContent: 'space-between',
+  alignItems: 'center',
+  width: '100%'
+});
+export var SelectDateRangeButton = styled.button({
+  background: "var(--ds-background-accent-gray-subtler, ".concat(N20, ")"),
+  border: 'none',
+  font: 'inherit',
+  width: '70px',
+  height: '40px',
+  marginTop: "var(--ds-space-150, 12px)",
+  borderRadius: '3px',
+  '&:hover': {
+    background: "var(--ds-background-accent-gray-subtler, ".concat(N30, ")"),
+    cursor: 'pointer'
+  }
+});
+export var DateRangeErrorMessage = styled.div({
+  display: 'flex',
+  lineHeight: 1.3333,
+  marginTop: "var(--ds-space-050, 4px)",
+  fontSize: '12px',
+  color: "var(--ds-text-danger, ".concat(R400, ")")
+});

package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/trigger.js

@@ -0,0 +1,25 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import Button from '@atlaskit/button/standard-button';
+import ChevronDownIcon from '@atlaskit/icon/glyph/chevron-down';
+export var PopupTrigger = function PopupTrigger(_ref) {
+  var triggerProps = _ref.triggerProps,
+    optionSelected = _ref.optionSelected,
+    label = _ref.label,
+    selectedLabel = _ref.selectedLabel,
+    onClickButton = _ref.onClickButton;
+  return /*#__PURE__*/React.createElement(Button, _extends({}, triggerProps, {
+    testId: 'confluence-search-modal--date-range-button',
+    onClick: onClickButton,
+    isSelected: optionSelected,
+    iconAfter: /*#__PURE__*/React.createElement("span", {
+      style: {
+        display: 'flex',
+        alignItems: 'center'
+      }
+    }, /*#__PURE__*/React.createElement(ChevronDownIcon, {
+      size: "medium",
+      label: ""
+    }))
+  }), label, selectedLabel ? ": ".concat(selectedLabel) : '');
+};

package/dist/esm/ui/confluence-search-modal/basic-filters/filters/edited-or-created-by/index.js

@@ -0,0 +1,100 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import React, { useCallback, useState } from 'react';
+import { useIntl } from 'react-intl-next';
+import { useDebouncedCallback } from 'use-debounce';
+import { FilterPopupSelect } from '../../../../common/modal/popup-select';
+import { SEARCH_DEBOUNCE_MS } from '../../../../common/modal/popup-select/constants';
+import { useCurrentUserInfo } from '../../hooks/useCurrentUserInfo';
+import useRecommendation from '../../hooks/useRecommendation';
+import { CLOLBasicFilters } from '../../types';
+import { editedOrCreatedByMessage } from './messages';
+var filterName = "clol-basic-filter-".concat(CLOLBasicFilters.editedOrCreatedBy);
+var EditedOrCreatedByFilter = function EditedOrCreatedByFilter(_ref) {
+  var cloudId = _ref.cloudId,
+    onSelectionChange = _ref.onSelectionChange,
+    _ref$selection = _ref.selection,
+    selection = _ref$selection === void 0 ? [] : _ref$selection;
+  var _useCurrentUserInfo = useCurrentUserInfo(),
+    user = _useCurrentUserInfo.user;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var _useRecommendation = useRecommendation(),
+    status = _useRecommendation.status,
+    filterOptions = _useRecommendation.filterOptions,
+    fetchFilterOptions = _useRecommendation.fetchFilterOptions,
+    errors = _useRecommendation.errors;
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    searchTerm = _useState2[0],
+    setSearchTerm = _useState2[1];
+  var _useDebouncedCallback = useDebouncedCallback(function (searchTerm) {
+      if (cloudId && user !== null && user !== void 0 && user.accountId) {
+        fetchFilterOptions({
+          searchTerm: searchTerm,
+          cloudId: cloudId,
+          userId: user.accountId
+        });
+      }
+    }, SEARCH_DEBOUNCE_MS),
+    _useDebouncedCallback2 = _slicedToArray(_useDebouncedCallback, 1),
+    handleDebouncedFetchFilterOptions = _useDebouncedCallback2[0];
+  var handleInputChange = useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(newSearchTerm) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setSearchTerm(newSearchTerm);
+            handleDebouncedFetchFilterOptions(newSearchTerm);
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [handleDebouncedFetchFilterOptions]);
+  var handleOptionSelection = useCallback(function (newValue) {
+    onSelectionChange(CLOLBasicFilters.editedOrCreatedBy, newValue);
+  }, [onSelectionChange]);
+  var handleMenuOpen = useCallback(function () {
+    if ((status === 'empty' || status === 'rejected') && cloudId && user !== null && user !== void 0 && user.accountId) {
+      // if user searches and gets status as rejected, we want the dropdown to try load the request with searchString when the user reopens the dropdown
+      fetchFilterOptions({
+        cloudId: cloudId,
+        userId: user.accountId,
+        searchTerm: searchTerm
+      });
+    }
+  }, [fetchFilterOptions, status, cloudId, user === null || user === void 0 ? void 0 : user.accountId, searchTerm]);
+  var filterOptionsLength = filterOptions.length;
+  var isError = status === 'rejected';
+  var isLoading = status === 'loading' || status === 'empty';
+  var isEmpty = status === 'resolved' && filterOptionsLength === 0;
+  var isDisabled = !cloudId || !(user !== null && user !== void 0 && user.accountId);
+  return /*#__PURE__*/React.createElement(FilterPopupSelect, {
+    buttonLabel: formatMessage(editedOrCreatedByMessage.buttonLabel),
+    filterName: filterName,
+    isDisabled: isDisabled,
+    options: filterOptions,
+    showLoading: isLoading,
+    selectedOptions: selection,
+    onSelectionChange: handleOptionSelection,
+    onInputChange: handleInputChange,
+    showHydrating: false,
+    shouldShowFooter: false,
+    status: status,
+    onMenuOpen: handleMenuOpen,
+    menuListProps: {
+      filterName: filterName,
+      errors: errors,
+      isLoading: isLoading,
+      isError: isError,
+      isEmpty: isEmpty
+    }
+  });
+};
+export default EditedOrCreatedByFilter;

package/dist/esm/ui/confluence-search-modal/basic-filters/filters/edited-or-created-by/messages.js

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export var editedOrCreatedByMessage = defineMessages({
+  buttonLabel: {
+    id: 'linkDataSource.clol-basic-filter.editedOrCreatedBy.label',
+    description: 'Label to be displayed for "Edited or created by" filter dropdown button.',
+    defaultMessage: 'Edited or created by'
+  }
+});

package/dist/esm/ui/confluence-search-modal/basic-filters/hooks/useCurrentUserInfo.js

@@ -0,0 +1,41 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useCallback, useEffect, useState } from 'react';
+import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+export var useCurrentUserInfo = function useCurrentUserInfo() {
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    user = _useState2[0],
+    setUser = _useState2[1];
+  var _useBasicFilterAGG = useBasicFilterAGG(),
+    getCurrentUserInfoFromAGG = _useBasicFilterAGG.getCurrentUserInfo;
+  var getCurrentUserInfo = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _user$data;
+    var user, _user$data2;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return getCurrentUserInfoFromAGG();
+        case 2:
+          user = _context.sent;
+          if (user !== null && user !== void 0 && (_user$data = user.data) !== null && _user$data !== void 0 && _user$data.me.user) {
+            setUser((_user$data2 = user.data) === null || _user$data2 === void 0 ? void 0 : _user$data2.me.user);
+          } else {
+            setUser(undefined);
+          }
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), [getCurrentUserInfoFromAGG]);
+  useEffect(function () {
+    getCurrentUserInfo();
+  }, [getCurrentUserInfo]);
+  return {
+    user: user,
+    getCurrentUserInfo: getCurrentUserInfo
+  };
+};