@atlaskit/link-datasource 1.11.0 → 1.12.0

package/dist/esm/ui/jira-issues-modal/basic-filters/mocks/fieldValuesExpectedResponseForAssignees.js

@@ -0,0 +1,149 @@
+export var fieldValuesResponseForAssignees = {
+  data: {
+    jira: {
+      jqlBuilder: {
+        fieldValues: {
+          totalCount: 21,
+          pageInfo: {
+            endCursor: 'YXJyYXljb25uZWN0aW9uOjk='
+          },
+          edges: [{
+            node: {
+              jqlTerm: 'membersOf(administrators)',
+              displayName: 'administrators',
+              group: {
+                name: 'administrators'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: '62df272c3aaeedcae755c533',
+              displayName: 'Atlas for Jira (staging)',
+              user: {
+                picture: 'https://secure.gravatar.com/avatar/1c65adef3d88d3eb97507f4952523df0?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Fdefault-avatar-2.png'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'membersOf(atlassian-addons-admin)',
+              displayName: 'atlassian-addons-admin',
+              group: {
+                name: 'atlassian-addons-admin'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'membersOf(confluence-admins-nmccormick2)',
+              displayName: 'confluence-admins-nmccormick2',
+              group: {
+                name: 'confluence-admins-nmccormick2'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'membersOf(confluence-guests-nmccormick2)',
+              displayName: 'confluence-guests-nmccormick2',
+              group: {
+                name: 'confluence-guests-nmccormick2'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'membersOf(confluence-user-access-admins-nmccormick2)',
+              displayName: 'confluence-user-access-admins-nmccormick2',
+              group: {
+                name: 'confluence-user-access-admins-nmccormick2'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'membersOf(confluence-users-nmccormick2)',
+              displayName: 'confluence-users-nmccormick2',
+              group: {
+                name: 'confluence-users-nmccormick2'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: '63d708e8c3eb74ad8e949fef',
+              displayName: 'eu-test',
+              user: {
+                picture: 'https://secure.gravatar.com/avatar/587a67c5b8494943560a3a24ada6408d?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FE-4.png'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: '5d959053ede9300dd30c304d',
+              displayName: 'GitLab for Jira (gitlab.com)',
+              user: {
+                picture: 'https://secure.gravatar.com/avatar/38baf1356a59e6822365c81b245ba811?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Fdefault-avatar-5.png'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'membersOf(jira-admins-nmccormick2)',
+              displayName: 'jira-admins-nmccormick2',
+              group: {
+                name: 'jira-admins-nmccormick2'
+              }
+            }
+          }]
+        }
+      }
+    }
+  }
+};
+export var fieldValuesResponseForAssigneesMapped = [{
+  isGroup: true,
+  label: 'administrators',
+  optionType: 'avatarLabel',
+  value: 'membersOf(administrators)'
+}, {
+  avatar: 'https://secure.gravatar.com/avatar/1c65adef3d88d3eb97507f4952523df0?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Fdefault-avatar-2.png',
+  isSquare: true,
+  label: 'Atlas for Jira (staging)',
+  optionType: 'avatarLabel',
+  value: '62df272c3aaeedcae755c533'
+}, {
+  isGroup: true,
+  label: 'atlassian-addons-admin',
+  optionType: 'avatarLabel',
+  value: 'membersOf(atlassian-addons-admin)'
+}, {
+  isGroup: true,
+  label: 'confluence-admins-nmccormick2',
+  optionType: 'avatarLabel',
+  value: 'membersOf(confluence-admins-nmccormick2)'
+}, {
+  isGroup: true,
+  label: 'confluence-guests-nmccormick2',
+  optionType: 'avatarLabel',
+  value: 'membersOf(confluence-guests-nmccormick2)'
+}, {
+  isGroup: true,
+  label: 'confluence-user-access-admins-nmccormick2',
+  optionType: 'avatarLabel',
+  value: 'membersOf(confluence-user-access-admins-nmccormick2)'
+}, {
+  isGroup: true,
+  label: 'confluence-users-nmccormick2',
+  optionType: 'avatarLabel',
+  value: 'membersOf(confluence-users-nmccormick2)'
+}, {
+  avatar: 'https://secure.gravatar.com/avatar/587a67c5b8494943560a3a24ada6408d?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Finitials%2FE-4.png',
+  isSquare: true,
+  label: 'eu-test',
+  optionType: 'avatarLabel',
+  value: '63d708e8c3eb74ad8e949fef'
+}, {
+  avatar: 'https://secure.gravatar.com/avatar/38baf1356a59e6822365c81b245ba811?d=https%3A%2F%2Favatar-management--avatars.us-west-2.staging.public.atl-paas.net%2Fdefault-avatar-5.png',
+  isSquare: true,
+  label: 'GitLab for Jira (gitlab.com)',
+  optionType: 'avatarLabel',
+  value: '5d959053ede9300dd30c304d'
+}, {
+  isGroup: true,
+  label: 'jira-admins-nmccormick2',
+  optionType: 'avatarLabel',
+  value: 'membersOf(jira-admins-nmccormick2)'
+}];

package/dist/esm/ui/jira-issues-modal/basic-filters/mocks/fieldValuesStandardResponseForProjects.js

@@ -0,0 +1,76 @@
+export var fieldValuesResponseForProjects = {
+  data: {
+    jira: {
+      jqlBuilder: {
+        fieldValues: {
+          totalCount: 4,
+          pageInfo: {
+            endCursor: 'YXJyYXljb25uZWN0aW9uOjM='
+          },
+          edges: [{
+            node: {
+              jqlTerm: '"My IT TEST"',
+              displayName: 'My IT TEST',
+              project: {
+                avatar: {
+                  small: 'https://nmccormick2.jira-dev.com/rest/api/2/universal_avatar/view/type/project/avatar/10403?size=small'
+                }
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'Test',
+              displayName: 'Test',
+              project: {
+                avatar: {
+                  small: 'https://nmccormick2.jira-dev.com/rest/api/2/universal_avatar/view/type/project/avatar/10411?size=small'
+                }
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: '"Test rights"',
+              displayName: 'Test rights',
+              project: {
+                avatar: {
+                  small: 'https://nmccormick2.jira-dev.com/rest/api/2/universal_avatar/view/type/project/avatar/10405?size=small'
+                }
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'Test2',
+              displayName: 'Test2',
+              project: {
+                avatar: {
+                  small: 'https://nmccormick2.jira-dev.com/rest/api/2/universal_avatar/view/type/project/avatar/10410?size=small'
+                }
+              }
+            }
+          }]
+        }
+      }
+    }
+  }
+};
+export var fieldValuesResponseForProjectsMapped = [{
+  icon: 'https://nmccormick2.jira-dev.com/rest/api/2/universal_avatar/view/type/project/avatar/10403?size=small',
+  label: 'My IT TEST',
+  optionType: 'iconLabel',
+  value: '"My IT TEST"'
+}, {
+  icon: 'https://nmccormick2.jira-dev.com/rest/api/2/universal_avatar/view/type/project/avatar/10411?size=small',
+  label: 'Test',
+  optionType: 'iconLabel',
+  value: 'Test'
+}, {
+  icon: 'https://nmccormick2.jira-dev.com/rest/api/2/universal_avatar/view/type/project/avatar/10405?size=small',
+  label: 'Test rights',
+  optionType: 'iconLabel',
+  value: '"Test rights"'
+}, {
+  icon: 'https://nmccormick2.jira-dev.com/rest/api/2/universal_avatar/view/type/project/avatar/10410?size=small',
+  label: 'Test2',
+  optionType: 'iconLabel',
+  value: 'Test2'
+}];

package/dist/esm/ui/jira-issues-modal/basic-filters/mocks/fieldValuesStandardResponseForStatuses.js

@@ -0,0 +1,81 @@
+export var fieldValuesResponseForStatuses = {
+  data: {
+    jira: {
+      jqlBuilder: {
+        fieldValues: {
+          totalCount: 27,
+          pageInfo: {
+            endCursor: 'YXJyYXljb25uZWN0aW9uOjQ='
+          },
+          edges: [{
+            node: {
+              jqlTerm: 'Authorize',
+              displayName: 'Authorize',
+              statusCategory: {
+                colorName: 'YELLOW'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: '"Awaiting approval"',
+              displayName: 'Awaiting approval',
+              statusCategory: {
+                colorName: 'YELLOW'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: '"Awaiting implementation"',
+              displayName: 'Awaiting implementation',
+              statusCategory: {
+                colorName: 'YELLOW'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'Canceled',
+              displayName: 'Canceled',
+              statusCategory: {
+                colorName: 'GREEN'
+              }
+            }
+          }, {
+            node: {
+              jqlTerm: 'Closed',
+              displayName: 'Closed',
+              statusCategory: {
+                colorName: 'GREEN'
+              }
+            }
+          }]
+        }
+      }
+    }
+  }
+};
+export var fieldValuesResponseForStatusesMapped = [{
+  appearance: 'inprogress',
+  label: 'Authorize',
+  optionType: 'lozengeLabel',
+  value: 'Authorize'
+}, {
+  appearance: 'inprogress',
+  label: 'Awaiting approval',
+  optionType: 'lozengeLabel',
+  value: '"Awaiting approval"'
+}, {
+  appearance: 'inprogress',
+  label: 'Awaiting implementation',
+  optionType: 'lozengeLabel',
+  value: '"Awaiting implementation"'
+}, {
+  appearance: 'success',
+  label: 'Canceled',
+  optionType: 'lozengeLabel',
+  value: 'Canceled'
+}, {
+  appearance: 'success',
+  label: 'Closed',
+  optionType: 'lozengeLabel',
+  value: 'Closed'
+}];

package/dist/esm/ui/jira-issues-modal/basic-filters/mocks/fieldValuesStandardResponseForTypes.js

@@ -0,0 +1,91 @@
+export var fieldValuesResponseForTypes = {
+  data: {
+    jira: {
+      jqlBuilder: {
+        fieldValues: {
+          totalCount: 12,
+          pageInfo: {
+            endCursor: 'YXJyYXljb25uZWN0aW9uOjQ='
+          },
+          edges: [{
+            node: {
+              jqlTerm: '"[System] Change"',
+              displayName: '[System] Change',
+              issueTypes: [{
+                avatar: {
+                  small: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10555?size=medium'
+                }
+              }]
+            }
+          }, {
+            node: {
+              jqlTerm: '"[System] Incident"',
+              displayName: '[System] Incident',
+              issueTypes: [{
+                avatar: {
+                  small: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10551?size=medium'
+                }
+              }]
+            }
+          }, {
+            node: {
+              jqlTerm: '"[System] Post-incident review"',
+              displayName: '[System] Post-incident review',
+              issueTypes: [{
+                avatar: {
+                  small: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10552?size=medium'
+                }
+              }]
+            }
+          }, {
+            node: {
+              jqlTerm: '"[System] Problem"',
+              displayName: '[System] Problem',
+              issueTypes: [{
+                avatar: {
+                  small: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10556?size=medium'
+                }
+              }]
+            }
+          }, {
+            node: {
+              jqlTerm: '"[System] Service request"',
+              displayName: '[System] Service request',
+              issueTypes: [{
+                avatar: {
+                  small: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10553?size=medium'
+                }
+              }]
+            }
+          }]
+        }
+      }
+    }
+  }
+};
+export var fieldValuesResponseForTypesMapped = [{
+  icon: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10555?size=medium',
+  label: '[System] Change',
+  optionType: 'iconLabel',
+  value: '"[System] Change"'
+}, {
+  icon: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10551?size=medium',
+  label: '[System] Incident',
+  optionType: 'iconLabel',
+  value: '"[System] Incident"'
+}, {
+  icon: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10552?size=medium',
+  label: '[System] Post-incident review',
+  optionType: 'iconLabel',
+  value: '"[System] Post-incident review"'
+}, {
+  icon: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10556?size=medium',
+  label: '[System] Problem',
+  optionType: 'iconLabel',
+  value: '"[System] Problem"'
+}, {
+  icon: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/10553?size=medium',
+  label: '[System] Service request',
+  optionType: 'iconLabel',
+  value: '"[System] Service request"'
+}];

package/dist/esm/ui/jira-issues-modal/basic-filters/mocks/hydrateJqlEmptyResponse.js

@@ -0,0 +1,12 @@
+export var hydrateJqlEmptyResponse = {
+  data: {
+    jira: {
+      jqlBuilder: {
+        hydrateJqlQuery: {
+          fields: []
+        }
+      }
+    }
+  }
+};
+export var hydrateJqlEmptyResponseMapped = {};

package/dist/esm/ui/jira-issues-modal/basic-filters/mocks/hydrateJqlStandardResponse.js

@@ -0,0 +1,105 @@
+export var hydrateJqlStandardResponse = {
+  data: {
+    jira: {
+      jqlBuilder: {
+        hydrateJqlQuery: {
+          fields: [{
+            jqlTerm: 'issuetype',
+            values: [{
+              values: [{
+                displayName: 'Category',
+                jqlTerm: 'Category',
+                issueTypes: [{
+                  avatar: {
+                    small: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/16627?size=medium'
+                  }
+                }]
+              }]
+            }, {
+              values: [{
+                displayName: '!disturbed',
+                jqlTerm: '"!disturbed"',
+                issueTypes: [{
+                  avatar: {
+                    small: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/16640?size=medium'
+                  }
+                }, {
+                  avatar: {
+                    small: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/16628?size=medium'
+                  }
+                }]
+              }]
+            }]
+          }, {
+            jqlTerm: 'project',
+            values: [{
+              values: [{
+                displayName: '(Deprecated) Koopa Troopas',
+                jqlTerm: '"(Deprecated) Koopa Troopas"',
+                project: {
+                  avatar: {
+                    small: 'https://hello.atlassian.net/rest/api/2/universal_avatar/view/type/project/avatar/36328?size=small'
+                  }
+                }
+              }]
+            }]
+          }, {
+            jqlTerm: 'assignee',
+            values: [{
+              values: [{
+                displayName: 'Nidhin Joseph',
+                jqlTerm: '70121:97052100-1513-42bc-a2f0-d77e71f0b7eb',
+                user: {
+                  picture: 'https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/70121:97052100-1513-42bc-a2f0-d77e71f0b7eb/3d737224-7e8f-4e0c-888c-d5ff6044d484/128'
+                }
+              }]
+            }]
+          }, {
+            jqlTerm: 'status',
+            values: [{
+              values: [{
+                displayName: 'Done',
+                jqlTerm: 'Done',
+                statusCategory: {
+                  colorName: 'GREEN'
+                }
+              }]
+            }]
+          }]
+        }
+      }
+    }
+  }
+};
+export var hydrateJqlStandardResponseMapped = {
+  issuetype: [{
+    icon: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/16627?size=medium',
+    label: 'Category',
+    optionType: 'iconLabel',
+    value: 'Category'
+  }, {
+    icon: '/rest/api/2/universal_avatar/view/type/issuetype/avatar/16640?size=medium',
+    label: '!disturbed',
+    optionType: 'iconLabel',
+    value: '"!disturbed"'
+  }],
+  project: [{
+    icon: 'https://hello.atlassian.net/rest/api/2/universal_avatar/view/type/project/avatar/36328?size=small',
+    label: '(Deprecated) Koopa Troopas',
+    optionType: 'iconLabel',
+    value: '"(Deprecated) Koopa Troopas"'
+  }],
+  assignee: [{
+    avatar: 'https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/70121:97052100-1513-42bc-a2f0-d77e71f0b7eb/3d737224-7e8f-4e0c-888c-d5ff6044d484/128',
+    isSquare: true,
+    label: 'Nidhin Joseph',
+    optionType: 'avatarLabel',
+    value: '70121:97052100-1513-42bc-a2f0-d77e71f0b7eb'
+  }],
+  status: [{
+    appearance: 'success',
+    label: 'Done',
+    optionType: 'lozengeLabel',
+    value: 'Done'
+  }]
+};

package/dist/esm/ui/jira-issues-modal/basic-filters/types.js

@@ -0,0 +1,9 @@
+// these types have been taken from jira-frontend to ensure the colour data return gets mapped correctly for the lozenge
+export var appearanceMap = {
+  BLUE_GRAY: 'default',
+  MEDIUM_GRAY: 'default',
+  BROWN: 'default',
+  GREEN: 'success',
+  YELLOW: 'inprogress',
+  WARM_RED: 'removed'
+};

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/async-popup-select/formatOptionLabel.js

@@ -29,7 +29,6 @@ var IconOptionLabel = function IconOptionLabel(_ref) {
 var LozengeOptionLabel = function LozengeOptionLabel(_ref2) {
   var data = _ref2.data;
   return /*#__PURE__*/React.createElement(Lozenge, {
-    isBold: data.isBold,
     appearance: data.appearance,
     testId: "jlol-basic-filter-popup-select-option--lozenge"
   }, /*#__PURE__*/React.createElement(Box, {

package/dist/esm/ui/jira-issues-modal/basic-filters/utils/transformers.js

@@ -0,0 +1,89 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { appearanceMap } from '../types';
+function isNonNullSelectOption(edge) {
+  return edge !== null;
+}
+function isColorName(colorName) {
+  return Object.keys(appearanceMap).includes(colorName);
+}
+var getLozengeAppearance = function getLozengeAppearance(colorName) {
+  if (isColorName(colorName)) {
+    return appearanceMap[colorName];
+  }
+};
+function mapNodeToOption(_ref) {
+  var displayName = _ref.displayName,
+    jqlTerm = _ref.jqlTerm,
+    group = _ref.group,
+    issueTypes = _ref.issueTypes,
+    project = _ref.project,
+    statusCategory = _ref.statusCategory,
+    user = _ref.user;
+  try {
+    var baseProps = {
+      label: displayName,
+      value: jqlTerm
+    };
+    if (user) {
+      return _objectSpread(_objectSpread({}, baseProps), {}, {
+        optionType: 'avatarLabel',
+        avatar: user.picture,
+        isSquare: true
+      });
+    }
+    if (group) {
+      return _objectSpread(_objectSpread({}, baseProps), {}, {
+        optionType: 'avatarLabel',
+        isGroup: true
+      });
+    }
+    if (project) {
+      var _project$avatar;
+      return _objectSpread(_objectSpread({}, baseProps), {}, {
+        optionType: 'iconLabel',
+        icon: (_project$avatar = project.avatar) === null || _project$avatar === void 0 ? void 0 : _project$avatar.small
+      });
+    }
+    if (issueTypes) {
+      var _issueTypes$;
+      return _objectSpread(_objectSpread({}, baseProps), {}, {
+        optionType: 'iconLabel',
+        icon: (_issueTypes$ = issueTypes[0]) === null || _issueTypes$ === void 0 ? void 0 : _issueTypes$.avatar.small
+      });
+    }
+    if (statusCategory) {
+      return _objectSpread(_objectSpread({}, baseProps), {}, {
+        optionType: 'lozengeLabel',
+        appearance: getLozengeAppearance(statusCategory.colorName)
+      });
+    }
+    return null;
+  } catch (error) {
+    return null;
+  }
+}
+export function mapHydrateResponseData(_ref2) {
+  var _data$jira;
+  var data = _ref2.data;
+  var transformedHydrateResponseData = {};
+  data === null || data === void 0 || (_data$jira = data.jira) === null || _data$jira === void 0 || (_data$jira = _data$jira.jqlBuilder) === null || _data$jira === void 0 || (_data$jira = _data$jira.hydrateJqlQuery) === null || _data$jira === void 0 || (_data$jira = _data$jira.fields) === null || _data$jira === void 0 || _data$jira.forEach(function (_ref3) {
+    var jqlTerm = _ref3.jqlTerm,
+      _ref3$values = _ref3.values,
+      values = _ref3$values === void 0 ? [] : _ref3$values;
+    var options = values.map(function (_ref4) {
+      var values = _ref4.values;
+      return values && values[0] ? mapNodeToOption(values[0]) : null;
+    }).filter(isNonNullSelectOption) || [];
+    transformedHydrateResponseData[jqlTerm] = options;
+  });
+  return transformedHydrateResponseData;
+}
+export function mapFieldValuesResponseData(_ref5) {
+  var _data$jira2;
+  var data = _ref5.data;
+  return (data === null || data === void 0 || (_data$jira2 = data.jira) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.jqlBuilder) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.fieldValues) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.edges) === null || _data$jira2 === void 0 ? void 0 : _data$jira2.map(function (edge) {
+    return edge.node ? mapNodeToOption(edge.node) : null;
+  }).filter(isNonNullSelectOption)) || [];
+}

package/dist/esm/ui/jira-issues-modal/jira-search-container/buildJQL.js

@@ -1,4 +1,5 @@
-import { COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, creators, JastBuilder, OPERATOR_EQUALS, OPERATOR_GT_EQUALS, OPERATOR_LIKE, ORDER_BY_DIRECTION_ASC, ORDER_BY_DIRECTION_DESC, print } from '@atlaskit/jql-ast';
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, creators, JastBuilder, OPERATOR_EQUALS, OPERATOR_GT_EQUALS, OPERATOR_IN, OPERATOR_LIKE, ORDER_BY_DIRECTION_ASC, ORDER_BY_DIRECTION_DESC, print } from '@atlaskit/jql-ast';
 var fuzzySearchRegExp = /^"(.+)"$/;
 var jiraIssueKeyRegExp = /[A-Z]+-\d+/;
 var constructTerminalClause = function constructTerminalClause(field, operator, value) {
@@ -15,7 +16,8 @@ export var buildJQL = function buildJQL(input) {
     _input$orderDirection = input.orderDirection,
     orderDirection = _input$orderDirection === void 0 ? ORDER_BY_DIRECTION_DESC : _input$orderDirection,
     _input$orderKey = input.orderKey,
-    orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey;
+    orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey,
+    filterValues = input.filterValues;
   var trimmedRawSearch = rawSearch.trim();
   if (!query) {
     return '';
@@ -32,12 +34,29 @@ export var buildJQL = function buildJQL(input) {
     }
     var orClause = creators.compoundClause(creators.compoundOperator(COMPOUND_OPERATOR_OR), orClauseFields);
     query.appendClause(orClause, COMPOUND_OPERATOR_AND);
-  } else {
+  }
+  if (filterValues) {
+    Object.entries(filterValues).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        key = _ref2[0],
+        filterFieldValues = _ref2[1];
+      if (!key || filterFieldValues.length === 0) {
+        return;
+      }
+      var filterInClause = creators.terminalClause(creators.field(key), creators.operator(OPERATOR_IN), creators.listOperand(filterFieldValues.map(function (filterFieldValue) {
+        return creators.valueOperand(filterFieldValue.value);
+      })));
+      query.appendClause(filterInClause, COMPOUND_OPERATOR_AND);
+    });
+  }
+  if (!trimmedRawSearch) {
     var created = constructTerminalClause('created', OPERATOR_GT_EQUALS, '-30d');
     query.appendClause(created, COMPOUND_OPERATOR_AND);
   }
   var orderField = creators.orderByField(creators.field(orderKey));
   query.prependOrderField(orderField);
   query.setOrderDirection(creators.orderByDirection(orderDirection.toLowerCase() === 'asc' ? ORDER_BY_DIRECTION_ASC : ORDER_BY_DIRECTION_DESC));
-  return print(jast);
+  return print(jast, {
+    printWidth: null // this ensures jql string is not broken to new line
+  });
 };