@jetbrains/ring-ui 4.1.5 → 5.0.0-beta.2

package/dist/message/message.js

@@ -4,8 +4,9 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import gift from '@jetbrains/icons/gift';
 import Popup from '../popup/popup.js';
+import { Directions } from '../popup/popup.consts.js';
 import Icon from '../icon/icon.js';
-import Button from '../button/button.js';
+import ThemedButton from '../button/button.js';
 import 'react-dom';
 import '../global/get-uid.js';
 import '../global/schedule-raf.js';
@@ -18,7 +19,6 @@ import 'sniffr';
 import '../global/data-tests.js';
 import '../tab-trap/tab-trap.js';
 import '../popup/position.js';
-import '../popup/popup.consts.js';
 import '../popup/popup.target.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
@@ -37,9 +37,6 @@ var modules_8b837449 = {"unit":"8px","padding":"12px","message":"message_rui_521
   * @name Message
   */
 
-const {
-  Directions
-} = Popup.PopupProps;
 const UNIT = 8;
 
 const getTailOffsets = offset => ({
@@ -116,6 +113,10 @@ class Message extends Component {
       direction
     }));
 
+    _defineProperty(this, "popup", void 0);
+
+    _defineProperty(this, "node", void 0);
+
     _defineProperty(this, "popupRef", el => {
       var _this$popup;
 
@@ -143,7 +144,7 @@ class Message extends Component {
     }
 
     const offset = Math.floor(anchor.offsetWidth / 2);
-    const isOpenedToRight = [Directions.TOP_RIGHT, Directions.BOTTOM_RIGHT].includes(this.state.direction);
+    const isOpenedToRight = this.state.direction != null && [Directions.TOP_RIGHT, Directions.BOTTOM_RIGHT].includes(this.state.direction);
 
     if (popupProps !== null && popupProps !== void 0 && popupProps.left && isOpenedToRight) {
       return offset - (popupProps === null || popupProps === void 0 ? void 0 : popupProps.left);
@@ -189,11 +190,11 @@ class Message extends Component {
       className: modules_8b837449.title
     }, title), children && /*#__PURE__*/React.createElement("div", {
       className: modules_8b837449.description
-    }, children), (onClose || buttonProps) && /*#__PURE__*/React.createElement(Button, _extends({
+    }, children), (onClose || buttonProps) && /*#__PURE__*/React.createElement(ThemedButton, _extends({
       className: modules_8b837449.button,
       onClick: onClose,
       primary: true
-    }, buttonProps), translations.gotIt), onDismiss && /*#__PURE__*/React.createElement(Button, {
+    }, buttonProps), translations.gotIt), onDismiss && /*#__PURE__*/React.createElement(ThemedButton, {
       onClick: onDismiss,
       text: true
     }, translations.dismiss));
@@ -201,7 +202,20 @@ class Message extends Component {
 
 }
 
-_defineProperty(Message, "propTypes", {
+_defineProperty(Message, "defaultProps", {
+  icon: gift,
+  directions: [Directions.TOP_RIGHT, Directions.TOP_LEFT, Directions.TOP_CENTER, Directions.BOTTOM_RIGHT, Directions.BOTTOM_LEFT, Directions.BOTTOM_CENTER, Directions.RIGHT_TOP, Directions.RIGHT_BOTTOM, Directions.RIGHT_CENTER, Directions.LEFT_TOP, Directions.LEFT_BOTTOM, Directions.LEFT_CENTER],
+  translations: {
+    gotIt: 'Got it',
+    dismiss: 'Dismiss'
+  }
+});
+
+_defineProperty(Message, "Directions", Directions);
+
+_defineProperty(Message, "PopupProps", Popup.PopupProps);
+
+Message.propTypes = {
   children: PropTypes.node,
   className: PropTypes.string,
   tailClassName: PropTypes.string,
@@ -215,19 +229,6 @@ _defineProperty(Message, "propTypes", {
   onClose: PropTypes.func,
   onDismiss: PropTypes.func,
   translations: PropTypes.object
-});
-
-_defineProperty(Message, "defaultProps", {
-  icon: gift,
-  directions: [Directions.TOP_RIGHT, Directions.TOP_LEFT, Directions.TOP_CENTER, Directions.BOTTOM_RIGHT, Directions.BOTTOM_LEFT, Directions.BOTTOM_CENTER, Directions.RIGHT_TOP, Directions.RIGHT_BOTTOM, Directions.RIGHT_CENTER, Directions.LEFT_TOP, Directions.LEFT_BOTTOM, Directions.LEFT_CENTER],
-  translations: {
-    gotIt: 'Got it',
-    dismiss: 'Dismiss'
-  }
-});
-
-_defineProperty(Message, "Directions", Directions);
-
-_defineProperty(Message, "PopupProps", Popup.PopupProps);
+};
 
 export { Message as default };

package/dist/old-browsers-message/old-browsers-message.d.ts

@@ -0,0 +1,2 @@
+declare function stopOldBrowserDetector(): void;
+export { stopOldBrowserDetector as stop };

package/dist/old-browsers-message/old-browsers-message.js

@@ -43,8 +43,10 @@ function changeSmileClickListener(event) {
 function attachSmileClickListener(smileNode) {
   if (smileNode.addEventListener) {
     smileNode.addEventListener('click', changeSmileClickListener);
+    /* eslint-disable @typescript-eslint/no-explicit-any */
   } else if (smileNode.attachEvent) {
     smileNode.attachEvent('onclick', changeSmileClickListener);
+    /* eslint-enable */
   }
 }
 /**
@@ -79,12 +81,14 @@ startOldBrowsersDetector(() => {
   const errorMessage = document.getElementById('ring-old-browsers-message__error-message');
   const smileNode = document.getElementById('ring-old-browsers-message__smile');
 
-  if (isBrowserInWhiteList()) {
-    browserMessage.style.display = 'none';
-    errorMessage.style.display = 'block';
-  } else {
-    browserMessage.style.display = 'block';
-    errorMessage.style.display = 'none';
+  if (browserMessage != null && errorMessage != null) {
+    if (isBrowserInWhiteList()) {
+      browserMessage.style.display = 'none';
+      errorMessage.style.display = 'block';
+    } else {
+      browserMessage.style.display = 'block';
+      errorMessage.style.display = 'none';
+    }
   }
 
   if (oldBrowsersMessageContainer) {

package/dist/old-browsers-message/old-browsers-message__stop.d.ts

@@ -0,0 +1 @@
+export { stop as default } from './old-browsers-message';

package/dist/old-browsers-message/white-list.d.ts

@@ -0,0 +1,2 @@
+export declare const WHITE_LIST: Record<string, number>;
+export declare function isBrowserInWhiteList(): boolean;

package/dist/old-browsers-message/white-list.js

@@ -6,8 +6,6 @@ const MAJOR_VERSION_INDEX = 0;
  * SUPPORTED_BROWSERS are defined by Babel plugin, see babel config
  */
 
-/* global SUPPORTED_BROWSERS */
-
 if (!["and_chr 90", "and_uc 12.12", "chrome 89", "chrome 88", "edge 89", "firefox 86", "ios_saf 14.0-14.4", "safari 14", "samsung 13.0"]) {
   // eslint-disable-next-line no-console
   console.warn('Ring UI: no SUPPORTED_BROWSERS passed. Please check babel config.');
@@ -16,7 +14,9 @@ if (!["and_chr 90", "and_uc 12.12", "chrome 89", "chrome 88", "edge 89", "firefo
 const SUPPORTED = ["and_chr 90", "and_uc 12.12", "chrome 89", "chrome 88", "edge 89", "firefox 86", "ios_saf 14.0-14.4", "safari 14", "samsung 13.0"] || [];
 const WHITE_LISTED_BROWSERS = ['chrome', 'firefox', 'safari', 'edge'];
 const WHITE_LIST = SUPPORTED.reduce((acc, item) => {
-  const [, browserName, version] = item.match(/(\S+)\s(\S+)/);
+  var _item$match;
+
+  const [, browserName, version] = (_item$match = item.match(/(\S+)\s(\S+)/)) !== null && _item$match !== void 0 ? _item$match : [];
 
   if (!WHITE_LISTED_BROWSERS.includes(browserName)) {
     return acc;

package/dist/pager/pager.d.ts

@@ -0,0 +1,83 @@
+/**
+ * @name Pager
+ */
+import React, { PureComponent, ReactNode } from 'react';
+import { SelectItem } from '../select/select';
+export interface PagerTranslations {
+    perPage: string;
+    firstPage: string;
+    lastPage: string;
+    nextPage: string;
+    previousPage: string;
+}
+export interface PagerProps {
+    total: number;
+    currentPage: number;
+    pageSize: number;
+    pageSizes: readonly number[];
+    visiblePagesLimit: number;
+    disablePageSizeSelector: boolean;
+    openTotal: boolean;
+    canLoadLastPageWithOpenTotal: boolean;
+    translations: PagerTranslations;
+    loader: boolean;
+    loaderNavigation: boolean;
+    onPageSizeChange: (size: number) => void;
+    onLoadPage: (nextPage: number) => void;
+    onPageChange?: ((prevPage: number, event?: React.MouseEvent) => void) | null | undefined;
+    className?: string | null | undefined;
+    hrefFunc?: ((page: number, pageSize: number | undefined) => string) | undefined;
+}
+interface PagerSizeItem {
+    key: number;
+}
+export default class Pager extends PureComponent<PagerProps> {
+    static defaultProps: {
+        currentPage: number;
+        pageSize: number;
+        pageSizes: number[];
+        visiblePagesLimit: number;
+        disablePageSizeSelector: boolean;
+        openTotal: boolean;
+        canLoadLastPageWithOpenTotal: boolean;
+        translations: {
+            perPage: string;
+            firstPage: string;
+            lastPage: string;
+            nextPage: string;
+            previousPage: string;
+        };
+        loader: boolean;
+        loaderNavigation: boolean;
+        onPageSizeChange: () => void;
+        onLoadPage: () => void;
+    };
+    getSelectOptions(): {
+        selected: SelectItem<PagerSizeItem> | undefined;
+        data: SelectItem<PagerSizeItem>[];
+    };
+    getTotal(): number;
+    handlePageSizeChange: (item: PagerSizeItem | null) => void;
+    handlePrevClick: () => void;
+    handleNextClick: () => void;
+    handlePageChange: (arg: number) => (event: React.MouseEvent) => void;
+    handleLoadMore: (arg: number) => () => void;
+    getButton(page: number, content: ReactNode, key?: number, active?: boolean): JSX.Element;
+    getClickProps(onClick: (e: React.MouseEvent) => void): {
+        onPlainLeftClick?: undefined;
+        onClick?: undefined;
+    } | {
+        onPlainLeftClick: (e: React.MouseEvent) => void;
+        onClick?: undefined;
+    } | {
+        onClick: (e: React.MouseEvent) => void;
+        onPlainLeftClick?: undefined;
+    };
+    getPageSizeSelector(): false | JSX.Element;
+    getPagerLinks(): JSX.Element;
+    generateHref(page: number): string | undefined;
+    getPagerContent(): JSX.Element | null;
+    render(): JSX.Element;
+}
+export declare type PagerAttrs = JSX.LibraryManagedAttributes<typeof Pager, PagerProps>;
+export {};

package/dist/pager/pager.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import chevronLeftIcon from '@jetbrains/icons/chevron-left';
 import chevronRightIcon from '@jetbrains/icons/chevron-right';
-import Button from '../button/button.js';
+import ThemedButton from '../button/button.js';
 import ButtonGroup from '../button-group/button-group.js';
 import ButtonToolbar from '../button-toolbar/button-toolbar.js';
 import Select from '../select/select.js';
@@ -27,6 +27,7 @@ import '@jetbrains/icons/close';
 import 'deep-equal';
 import '../dropdown/dropdown.js';
 import '../global/data-tests.js';
+import '../global/typescript-utils.js';
 import '../_helpers/anchor.js';
 import '../avatar/avatar.js';
 import '../global/url.js';
@@ -67,6 +68,8 @@ import '../list/list__separator.js';
 import '../list/list__hint.js';
 import '../list/consts.js';
 import '../input/input.js';
+import '../global/prop-types.js';
+import '../global/composeRefs.js';
 import '../_helpers/input.js';
 import '../global/rerender-hoc.js';
 import '../global/fuzzy-highlight.js';
@@ -93,7 +96,9 @@ class Pager extends PureComponent {
     super(...arguments);
 
     _defineProperty(this, "handlePageSizeChange", item => {
-      this.props.onPageSizeChange(item.key);
+      if (item != null) {
+        this.props.onPageSizeChange(item.key);
+      }
     });
 
     _defineProperty(this, "handlePrevClick", () => {
@@ -102,8 +107,10 @@ class Pager extends PureComponent {
       } = this.props;
 
       if (currentPage !== 1) {
+        var _this$props$onPageCha, _this$props;
+
         const prevPage = currentPage - 1;
-        this.props.onPageChange(prevPage);
+        (_this$props$onPageCha = (_this$props = this.props).onPageChange) === null || _this$props$onPageCha === void 0 ? void 0 : _this$props$onPageCha.call(_this$props, prevPage);
       }
     });
 
@@ -116,14 +123,18 @@ class Pager extends PureComponent {
       const total = this.getTotal();
 
       if (currentPage !== total) {
-        this.props.onPageChange(nextPage);
+        var _this$props$onPageCha2, _this$props2;
+
+        (_this$props$onPageCha2 = (_this$props2 = this.props).onPageChange) === null || _this$props$onPageCha2 === void 0 ? void 0 : _this$props$onPageCha2.call(_this$props2, nextPage);
       } else if (this.props.openTotal) {
         onLoadPage(nextPage);
       }
     });
 
     _defineProperty(this, "handlePageChange", memoize(i => event => {
-      this.props.onPageChange(i, event);
+      var _this$props$onPageCha3, _this$props3;
+
+      (_this$props$onPageCha3 = (_this$props3 = this.props).onPageChange) === null || _this$props$onPageCha3 === void 0 ? void 0 : _this$props$onPageCha3.call(_this$props3, i, event);
     }));
 
     _defineProperty(this, "handleLoadMore", memoize(i => () => {
@@ -156,7 +167,7 @@ class Pager extends PureComponent {
   }
 
   getButton(page, content, key, active) {
-    return /*#__PURE__*/React.createElement(Button, _extends({
+    return /*#__PURE__*/React.createElement(ThemedButton, _extends({
       href: this.generateHref(page),
       key: key,
       active: active,
@@ -268,7 +279,7 @@ class Pager extends PureComponent {
     }
 
     let start = 1;
-    let end = totalPages; // eslint-disable-next-line no-magic-numbers
+    let end = totalPages; // eslint-disable-next-line @typescript-eslint/no-magic-numbers
 
     if (totalPages >= visiblePagesLimit + 6) {
       const leftHalfFrameSize = Math.ceil(visiblePagesLimit / 2) - 1;
@@ -300,7 +311,7 @@ class Pager extends PureComponent {
     }
 
     const lastPageButtonAvailable = end < totalPages && !this.props.openTotal || this.props.openTotal && this.props.canLoadLastPageWithOpenTotal;
-    return /*#__PURE__*/React.createElement("div", null, this.getPagerLinks(), /*#__PURE__*/React.createElement(ButtonToolbar, null, start > 1 && /*#__PURE__*/React.createElement(ButtonGroup, null, this.getButton(1, this.props.translations.firstPage)), /*#__PURE__*/React.createElement(ButtonGroup, null, start > 1 && this.getButton(start - 1, '...'), buttons, end < totalPages && this.getButton(end + 1, '...'), end === totalPages && this.props.openTotal && /*#__PURE__*/React.createElement(Button, _extends({
+    return /*#__PURE__*/React.createElement("div", null, this.getPagerLinks(), /*#__PURE__*/React.createElement(ButtonToolbar, null, start > 1 && /*#__PURE__*/React.createElement(ButtonGroup, null, this.getButton(1, this.props.translations.firstPage)), /*#__PURE__*/React.createElement(ButtonGroup, null, start > 1 && this.getButton(start - 1, '...'), buttons, end < totalPages && this.getButton(end + 1, '...'), end === totalPages && this.props.openTotal && /*#__PURE__*/React.createElement(ThemedButton, _extends({
       href: this.generateHref(end + 1),
       disabled: this.props.loader
     }, this.getClickProps(this.handleLoadMore(end + 1))), '...')), lastPageButtonAvailable && /*#__PURE__*/React.createElement(ButtonGroup, null, this.getButton(this.props.openTotal ? -1 : totalPages, this.props.translations.lastPage))), this.getPageSizeSelector());
@@ -316,30 +327,10 @@ class Pager extends PureComponent {
 
 }
 
-_defineProperty(Pager, "propTypes", {
-  total: PropTypes.number.isRequired,
-  currentPage: PropTypes.number,
-  pageSize: PropTypes.number,
-  pageSizes: PropTypes.arrayOf(PropTypes.number),
-  visiblePagesLimit: PropTypes.number,
-  disablePageSizeSelector: PropTypes.bool,
-  openTotal: PropTypes.bool,
-  canLoadLastPageWithOpenTotal: PropTypes.bool,
-  onPageChange: PropTypes.func,
-  onPageSizeChange: PropTypes.func,
-  onLoadPage: PropTypes.func,
-  className: PropTypes.string,
-  translations: PropTypes.object,
-  loader: PropTypes.bool,
-  loaderNavigation: PropTypes.bool,
-  hrefFunc: PropTypes.func //function which generates href for all pager's buttons based on pager state passed as a function parameter, either this function or onPageChange should be provided
-
-});
-
 _defineProperty(Pager, "defaultProps", {
   currentPage: 1,
   pageSize: 50,
-  // eslint-disable-next-line no-magic-numbers
+  // eslint-disable-next-line @typescript-eslint/no-magic-numbers
   pageSizes: [20, 50, 100],
   visiblePagesLimit: 7,
   disablePageSizeSelector: false,
@@ -358,4 +349,24 @@ _defineProperty(Pager, "defaultProps", {
   onLoadPage: () => {}
 });
 
+Pager.propTypes = {
+  total: PropTypes.number.isRequired,
+  currentPage: PropTypes.number,
+  pageSize: PropTypes.number,
+  pageSizes: PropTypes.arrayOf(PropTypes.number),
+  visiblePagesLimit: PropTypes.number,
+  disablePageSizeSelector: PropTypes.bool,
+  openTotal: PropTypes.bool,
+  canLoadLastPageWithOpenTotal: PropTypes.bool,
+  onPageChange: PropTypes.func,
+  onPageSizeChange: PropTypes.func,
+  onLoadPage: PropTypes.func,
+  className: PropTypes.string,
+  translations: PropTypes.object,
+  loader: PropTypes.bool,
+  loaderNavigation: PropTypes.bool,
+  hrefFunc: PropTypes.func //function which generates href for all pager's buttons based on pager state passed as a function parameter, either this function or onPageChange should be provided
+
+};
+
 export { Pager as default };

package/dist/pager-ng/pager-ng.js

@@ -32,6 +32,7 @@ import '@jetbrains/icons/close';
 import 'deep-equal';
 import '../dropdown/dropdown.js';
 import '../global/data-tests.js';
+import '../global/typescript-utils.js';
 import '../_helpers/anchor.js';
 import '../avatar/avatar.js';
 import '../global/url.js';
@@ -72,6 +73,8 @@ import '../list/list__separator.js';
 import '../list/list__hint.js';
 import '../list/consts.js';
 import '../input/input.js';
+import '../global/prop-types.js';
+import '../global/composeRefs.js';
 import '../_helpers/input.js';
 import '../global/rerender-hoc.js';
 import '../global/fuzzy-highlight.js';

package/dist/panel/panel.d.ts

@@ -0,0 +1,12 @@
+import { HTMLAttributes, PureComponent } from 'react';
+import PropTypes from 'prop-types';
+/**
+ * @name Panel
+ */
+export default class Panel extends PureComponent<HTMLAttributes<HTMLElement>> {
+    static propTypes: {
+        className: PropTypes.Requireable<string>;
+        children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+    };
+    render(): JSX.Element;
+}

package/dist/permissions/permissions.d.ts

@@ -0,0 +1,111 @@
+import Auth from '../auth/auth__core';
+import PermissionCache, { Permission } from './permissions__cache';
+export interface PermissionsConfig {
+    prefix?: string | null | undefined;
+    namesConverter?: ((name: string) => string) | null | undefined;
+    services?: readonly string[] | null | undefined;
+    datasource?: ((query: string | undefined) => Promise<readonly Permission[] | null | undefined>) | null | undefined;
+}
+interface PermissionsCacheControl {
+    NO_CACHE?: boolean | null | undefined;
+    NO_STORE?: boolean | null | undefined;
+}
+export interface PermissionsLoadOptions {
+    cacheControl?: PermissionsCacheControl | null | undefined;
+}
+/**
+ * <code>
+ *   const permissions = new Permissions(auth, {prefix: 'jetbrains.jetpass.', services: [auth.serviceId]})
+ *   permissions.load().then(function (p) {
+ *     const canReadUser = p.has('read-user');
+ *     ...
+ *   });
+ *
+ *   permissions.check('read-user').then(function(canReadUser) {
+ *     ...
+ *   });
+ * </code>
+ *
+ * @param {Auth} auth instance of well configured Auth object
+ * @param {{
+ *   prefix: string?,
+ *   namesConverter: function?
+ *   serviceId: string?
+ * }=} config permissions loaded configuration.
+ * <code>prefix</code> if provided then this prefix is removed from the permissions names.
+ * <code>namesConverter</code> if provided it maps permission names used on server-side to client-side permission names. It is used only if prefix is undefined.
+ * <code>serviceId</code> if provided then permissions only for the service are loaded.
+ * @constructor
+ */
+export default class Permissions {
+    /**
+     * @const {string}
+     */
+    static API_PERMISSION_CACHE_PATH: string;
+    query: string | undefined;
+    namesConverter: ((name: string) => string) | null | undefined;
+    private _auth;
+    private _datasource;
+    _promise: Promise<PermissionCache> | null;
+    private _subscribed;
+    private _permissionCache;
+    constructor(auth: Auth, config?: PermissionsConfig);
+    private _defaultDatasource;
+    /**
+     * Returns function, which cuts off prefix from server-side permission name
+     *
+     * @param {string} prefix
+     * @returns {Function}
+     */
+    static getDefaultNamesConverter(prefix: string): (storedName: string) => string;
+    static getPermissionQuery(services?: readonly string[] | null | undefined): string | undefined;
+    set(cachedPermissions?: readonly Permission[] | null | undefined): PermissionCache;
+    get(): readonly Permission[] | null | undefined;
+    private _setCache;
+    private _getCache;
+    private _resetCache;
+    /**
+     * Loads logged-in user permissions.
+     * @param {object?} options
+     * @return {Promise.<Permissions>} promise that is resolved when the permissions are loaded
+     */
+    load(options?: PermissionsLoadOptions | null | undefined): Promise<PermissionCache>;
+    _loadPermissions(): Promise<readonly Permission[] | null | undefined>;
+    /**
+     * Reloads permission cache from server
+     * @returns {Promise.<Permissions>} promise that is resolved when the permissions are reloaded
+     */
+    reload(): Promise<PermissionCache>;
+    /**
+     * Waits till the permission cache is loaded then checks if the current user has the
+     * given permissions in the project with the given id.
+     *
+     * @param {string} permissions  space separated list of permissions
+     * @param {string=} projectId     optional projectId. If absent the method checks
+     *  if the given permission is granted in any project.
+     *
+     * @return {Promise.<boolean>}
+     */
+    check(permissions?: string | null | undefined, projectId?: string | null | undefined): Promise<boolean>;
+    /**
+     * Binds a property with the name <code>propertyName</code> of the <code>object</code>
+     * to a boolean value that is true if user has the permissions and false if she doesn't.
+     *
+     * @example
+     * <code>
+     *   userPermissions.bindVariable($scope, 'canReadRole', 'role-read')
+     * </code>
+     *
+     * @param {object} object       an object which property should be bound
+     * @param {string} propertyName a name of a property to bind
+     * @param {string} permissions  space separated list of permissions
+     * @param {string=} projectId     optional projectId. If absent the method checks
+     *  if the given permissions are granted in any project.
+     *
+     * @return {Promise.<boolean>}
+     */
+    bindVariable<K extends string>(object: {
+        [key in K]?: boolean;
+    }, propertyName: K, permissions?: string | null | undefined, projectId?: string | null | undefined): Promise<boolean>;
+}
+export {};

package/dist/permissions/permissions.js

@@ -33,6 +33,20 @@ class Permissions {
   constructor(auth) {
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
+    _defineProperty(this, "query", void 0);
+
+    _defineProperty(this, "namesConverter", void 0);
+
+    _defineProperty(this, "_auth", void 0);
+
+    _defineProperty(this, "_datasource", void 0);
+
+    _defineProperty(this, "_promise", void 0);
+
+    _defineProperty(this, "_subscribed", void 0);
+
+    _defineProperty(this, "_permissionCache", void 0);
+
     _defineProperty(this, "_defaultDatasource", query => this._auth.http.get(Permissions.API_PERMISSION_CACHE_PATH, {
       query: {
         fields: 'permission/key,global,projects(id)',
@@ -92,7 +106,6 @@ class Permissions {
 
   _setCache(value) {
     this._promise = value;
-    return value;
   }
 
   _getCache() {
@@ -118,15 +131,21 @@ class Permissions {
       this._subscribed = true;
     }
 
-    if (!hasCacheControl('NO_CACHE', options) && this._getCache()) {
-      return this._getCache();
+    const cache = this._getCache();
+
+    if (!hasCacheControl('NO_CACHE', options) && cache) {
+      return cache;
     }
 
     if (hasCacheControl('NO_STORE', options)) {
       return this._loadPermissions().then(cachedPermissions => new PermissionCache(cachedPermissions, this.namesConverter));
     }
 
-    return this._setCache(this._loadPermissions().then(cachedPermissions => this.set(cachedPermissions)));
+    const permissions = this._loadPermissions().then(cachedPermissions => this.set(cachedPermissions));
+
+    this._setCache(permissions);
+
+    return permissions;
 
     function hasCacheControl(value, _options) {
       if (_options && _options.cacheControl) {