@jetbrains/ring-ui 5.0.99 → 5.0.101

package/components/global/angular-component-factory.js

@@ -19,8 +19,7 @@ function createAngularComponent(Component) {
     bindings[key] = '<';
   });
 
-  return class AngularComponent extends RingAngularComponent {
-    static $inject = ['$scope', '$element', '$transclude'];
+  class AngularComponent extends RingAngularComponent {
 
     static bindings = bindings;
     static transclude = true;
@@ -72,7 +71,9 @@ function createAngularComponent(Component) {
         container
       );
     }
-  };
+  }
+  AngularComponent.$inject = ['$scope', '$element', '$transclude'];
+  return AngularComponent;
 }
 
 function angularComponentFactory(Component, name) {

package/components/global/ring-angular-component.js

@@ -1,6 +1,4 @@
 export default class RingAngularComponent {
-  static $inject = [];
-
   static get controller() {
     return this;
   }
@@ -8,7 +6,7 @@ export default class RingAngularComponent {
   $inject = {};
 
   constructor(...args) {
-    this.constructor.$inject.forEach((injectName, i) => {
+    (this.constructor.$inject ?? []).forEach((injectName, i) => {
       this.$inject[injectName] = args[i];
     });
   }

package/components/global/ring-angular-component.test.js

@@ -5,8 +5,9 @@ import 'angular-mocks';
 import RingAngularComponent from './ring-angular-component';
 
 class TestComponent extends RingAngularComponent {
-  static $inject = ['$scope'];
+
 }
+TestComponent.$inject = ['$scope'];
 
 const testModule = angular.module('Test', []).component('testComponent', TestComponent).name;
 

package/components/input-ng/input-ng.js

@@ -15,7 +15,6 @@ import styleOverrides from './input-ng.css';
 const angularModule = angular.module('Ring.input', [ButtonNg]);
 
 class RingInputComponent extends RingAngularComponent {
-  static $inject = ['$element'];
 
   static require = {
     ngModelCtrl: '?ngModel'
@@ -153,6 +152,7 @@ class RingInputComponent extends RingAngularComponent {
 </div>
   `;
 }
+RingInputComponent.$inject = ['$element'];
 
 angularModule.component('rgInput', RingInputComponent);
 

package/components/loader-ng/loader-ng.js

@@ -11,7 +11,6 @@ import LoaderCore from '../loader/loader__core';
 const angularModule = angular.module('Ring.loader', []);
 
 class RgLoaderComponent extends RingAngularComponent {
-  static $inject = ['$element'];
 
   static bindings = {
     message: '@'
@@ -31,6 +30,7 @@ class RgLoaderComponent extends RingAngularComponent {
     this.loader.updateMessage(changes.message.currentValue);
   }
 }
+RgLoaderComponent.$inject = ['$element'];
 
 angularModule.component('rgLoader', RgLoaderComponent);
 

package/components/promised-click-ng/promised-click-ng.js

@@ -15,7 +15,6 @@ const angularModule = angular.module('Ring.promised-click', []);
 const DEFAULT_MODE = 'active';
 
 class PromisedClickController extends RingAngularComponent {
-  static $inject = ['$scope', '$element', '$attrs', '$parse'];
   constructor(...args) {
     super(...args);
 
@@ -106,6 +105,7 @@ class PromisedClickController extends RingAngularComponent {
     this.promise.then(done, done);
   }
 }
+PromisedClickController.$inject = ['$scope', '$element', '$attrs', '$parse'];
 
 function rgPromisedClickDirective() {
   return {

package/components/shortcuts-hint-ng/shortcuts-hint-ng.js

@@ -25,8 +25,6 @@ const getTitle = title => (typeof title === 'function' ? title() : title);
 
 
 class HintPopupService extends RingAngularComponent {
-  static $inject = ['dialog', 'shortcuts'];
-
   show(popupConfig = {}, shortcutModes, okButtonLabel = 'Got it', searchPlaceholder = 'Search') {
     const {dialog, shortcuts} = this.$inject;
 
@@ -67,6 +65,7 @@ class HintPopupService extends RingAngularComponent {
     }, popupConfig));
   }
 }
+HintPopupService.$inject = ['dialog', 'shortcuts'];
 
 function shortcutKeySymbolFilter(shortcut) {
   return getShortcutTitle(shortcut);

package/components/sidebar-ng/sidebar-ng.js

@@ -21,8 +21,6 @@ import buttonTemplate from './sidebar-ng__button-template';
 const angularModule = angular.module('Ring.sidebar', [PlaceUnder, IconNG, ButtonNG]);
 
 class SidebarController extends RingAngularComponent {
-  static $inject = ['$scope'];
-
   constructor(...args) {
     super(...args);
 
@@ -49,6 +47,7 @@ class SidebarController extends RingAngularComponent {
     };
   }
 }
+SidebarController.$inject = ['$scope'];
 
 function rgSidebarDirective() {
   return {

package/components/template-ng/template-ng.js

@@ -9,8 +9,6 @@ import RingAngularComponent from '../global/ring-angular-component';
 const angularModule = angular.module('Ring.template', []);
 
 class RgTemplateController extends RingAngularComponent {
-  static $inject = ['$scope', '$element', '$attrs', '$compile'];
-
   currentScope = null;
 
   constructor(...args) {
@@ -48,6 +46,7 @@ class RgTemplateController extends RingAngularComponent {
     }
   }
 }
+RgTemplateController.$inject = ['$scope', '$element', '$attrs', '$compile'];
 
 angularModule.directive('rgTemplate', function rgTemplateDirective() {
   return {

package/components/user-card/card.js

@@ -60,25 +60,27 @@ export default class UserCard extends PureComponent {
             {!!avatarInfo && avatarInfo}
           </div>
           <div className={styles.userInformation}>
-            <div className={styles.userNameLine}>
-              {user.href && (<Link href={user.href} className={styles.userName}>
-                  {user.name}
-                </Link>)}
-              {!user.href && <span className={styles.userName}>{user.name}</span>}
-              {typeof user.online === 'boolean' &&
+            <div className={styles.userInformationGeneral}>
+              <div className={styles.userNameLine}>
+                {user.href && (<Link href={user.href} className={styles.userName}>
+                    {user.name}
+                  </Link>)}
+                {!user.href && <span className={styles.userName}>{user.name}</span>}
+                {typeof user.online === 'boolean' &&
                 (<span className={userActiveStatusClasses} title={user.online ? wording.online : wording.offline}/>)}
-              {!!info && <span className={styles.userNameInfo}>{info}</span>}
-              {user.banned &&
+                {!!info && <span className={styles.userNameInfo}>{info}</span>}
+                {user.banned &&
                 (<span className={classNames(badgeStyles.badge, badgeStyles.invalid)} title={user.banReason}>{wording.banned}</span>)}
+              </div>
+              <div className={styles.userLogin}>{user.login}</div>
+              {user.email && (<span className={styles.userEmailWrapper}>
+                  <Link pseudo onClick={this.copyEmail} className={styles.userEmail}>
+                    {user.email}
+                  </Link>
+                  {user.unverifiedEmail && (<span className={styles.unverifiedLabel}>{wording.unverified}</span>)}
+                  <Icon title={wording.copyToClipboard} className={styles.userCopyIcon} onClick={this.copyEmail} glyph={copyIcon} size={IconSize.Size14} suppressSizeWarning/>
+                </span>)}
             </div>
-            <div className={styles.userLogin}>{user.login}</div>
-            {user.email && (<span className={styles.userEmailWrapper}>
-                <Link pseudo onClick={this.copyEmail} className={styles.userEmail}>
-                  {user.email}
-                </Link>
-                {user.unverifiedEmail && (<span className={styles.unverifiedLabel}>{wording.unverified}</span>)}
-                <Icon title={wording.copyToClipboard} className={styles.userCopyIcon} onClick={this.copyEmail} glyph={copyIcon} size={IconSize.Size14} suppressSizeWarning/>
-              </span>)}
             {children}
           </div>
         </div>

package/components/user-card/user-card.css

@@ -28,6 +28,10 @@
   line-height: 18px;
 }
 
+.userInformationGeneral {
+  height: 56px;
+}
+
 .userNameLine {
   height: var(--ring-line-height-lowest);
 

package/dist/_helpers/card.js

@@ -10,7 +10,7 @@ import { m as modules_6c9187df } from './badge.js';
 import Icon from '../icon/icon.js';
 import { Size as Size$1 } from '../icon/icon__constants.js';
 
-var modules_a4196c17 = {"unit":"8px","light":"light_rui_6e59","userCardSpaced":"userCardSpaced_rui_6e59","userInformationContainer":"userInformationContainer_rui_6e59","userAvatar":"userAvatar_rui_6e59","userInformation":"userInformation_rui_6e59","userNameLine":"userNameLine_rui_6e59","userName":"userName_rui_6e59","userLogin":"userLogin_rui_6e59","userEmail":"userEmail_rui_6e59","userCopyIcon":"userCopyIcon_rui_6e59","userEmailWrapper":"userEmailWrapper_rui_6e59","unverifiedLabel":"unverifiedLabel_rui_6e59","userNameInfo":"userNameInfo_rui_6e59","userActiveStatus":"userActiveStatus_rui_6e59","online":"online_rui_6e59"};
+var modules_a4196c17 = {"unit":"8px","light":"light_rui_6e59","userCardSpaced":"userCardSpaced_rui_6e59","userInformationContainer":"userInformationContainer_rui_6e59","userAvatar":"userAvatar_rui_6e59","userInformation":"userInformation_rui_6e59","userInformationGeneral":"userInformationGeneral_rui_6e59","userNameLine":"userNameLine_rui_6e59","userName":"userName_rui_6e59","userLogin":"userLogin_rui_6e59","userEmail":"userEmail_rui_6e59","userCopyIcon":"userCopyIcon_rui_6e59","userEmailWrapper":"userEmailWrapper_rui_6e59","unverifiedLabel":"unverifiedLabel_rui_6e59","userNameInfo":"userNameInfo_rui_6e59","userActiveStatus":"userActiveStatus_rui_6e59","online":"online_rui_6e59"};
 
 class UserCard extends PureComponent {
   constructor() {
@@ -46,6 +46,8 @@ class UserCard extends PureComponent {
       url: user.avatarUrl
     }), !!avatarInfo && avatarInfo), /*#__PURE__*/React.createElement("div", {
       className: modules_a4196c17.userInformation
+    }, /*#__PURE__*/React.createElement("div", {
+      className: modules_a4196c17.userInformationGeneral
     }, /*#__PURE__*/React.createElement("div", {
       className: modules_a4196c17.userNameLine
     }, user.href && /*#__PURE__*/React.createElement(Link, {
@@ -78,7 +80,7 @@ class UserCard extends PureComponent {
       glyph: copyIcon,
       size: Size$1.Size14,
       suppressSizeWarning: true
-    })), children)));
+    }))), children)));
   }
 }
 _defineProperty(UserCard, "propTypes", {

package/dist/analytics/analytics.d.ts

@@ -2,8 +2,11 @@ type Serializable = string | number | boolean | null | undefined | {
     [K in string | number]?: Serializable;
 };
 export interface AnalyticsPlugin {
+    /**
+     * @deprecated
+     */
     serializeAdditionalInfo: boolean;
-    trackEvent(category: string, action: string, additionalData?: Record<string, unknown> | undefined): void;
+    trackEvent(category: string, action: string, additionalData?: Record<string, string>): void;
     trackPageView(path: string): void;
 }
 /**
@@ -13,12 +16,23 @@ export declare class Analytics {
     private _plugins;
     constructor();
     config(plugins: readonly AnalyticsPlugin[]): void;
-    track(rawTrackingData: string, additionalData?: Record<string, unknown> | undefined): void;
+    /**
+     * @deprecated
+     */
+    track(rawTrackingData: string, additionalData: Record<string, string>): void;
+    /**
+     * @deprecated
+     */
     trackPageView(path: string): void;
-    trackEvent(category: string, action: string, additionalData?: Record<string, unknown> | undefined): void;
-    trackShortcutEvent(category: string, action: string, additionalData?: Record<string, unknown> | undefined): void;
-    trackEntityProperties(entityName: string, entity: Serializable, propertiesNames: readonly string[], additionalData?: Record<string, unknown> | undefined): void;
-    private _buildSuffix;
+    trackEvent(category: string, action: string, additionalData?: Record<string, string>): void;
+    /**
+     * @deprecated
+     */
+    trackShortcutEvent(category: string, action: string, additionalData: Record<string, string>): void;
+    /**
+     * @deprecated
+     */
+    trackEntityProperties(entityName: string, entity: Serializable, propertiesNames: readonly string[], additionalData?: Record<string, string>): void;
 }
 declare const _default: Analytics;
 export default _default;

package/dist/analytics/analytics.js

@@ -1,5 +1,7 @@
 import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
+import deprecate from 'util-deprecate';
 
+const warnOnDeprecationOfAnalyticsMethod = methodName => deprecate(() => {}, `Method analytics::${methodName} is deprecated, use analytics::trackEvent instead`)();
 /**
  * @name Analytics
  */
@@ -11,10 +13,14 @@ class Analytics {
   config(plugins) {
     this._plugins = plugins;
   }
+  /**
+   * @deprecated
+   */
   track(rawTrackingData, additionalData) {
     if (!rawTrackingData) {
       return;
     }
+    warnOnDeprecationOfAnalyticsMethod('track');
     let splitIdx = rawTrackingData.indexOf(':');
     if (splitIdx < 0) {
       splitIdx = rawTrackingData.indexOf('_');
@@ -26,29 +32,32 @@ class Analytics {
     const subcategory = rawTrackingData.substr(splitIdx + 1);
     this.trackEvent(category, subcategory, additionalData);
   }
+  /**
+   * @deprecated
+   */
   trackPageView(path) {
+    warnOnDeprecationOfAnalyticsMethod('trackPageView');
     this._plugins.forEach(plugin => {
       plugin.trackPageView(path);
     });
   }
   trackEvent(category, action, additionalData) {
-    const subaction = additionalData ? action + this._buildSuffix(additionalData) : null;
     this._plugins.forEach(plugin => {
-      if (plugin.serializeAdditionalInfo) {
-        plugin.trackEvent(category, action);
-        if (subaction) {
-          plugin.trackEvent(category, subaction);
-        }
-      } else {
-        plugin.trackEvent(category, action, additionalData);
-      }
+      plugin.trackEvent(category, action, additionalData);
     });
   }
+  /**
+   * @deprecated
+   */
   trackShortcutEvent(category, action, additionalData) {
+    warnOnDeprecationOfAnalyticsMethod('trackShortcutEvent');
     this.trackEvent(category, action, additionalData);
-    this.trackEvent('ring-shortcut', `${category}$${action}`, additionalData);
   }
+  /**
+   * @deprecated
+   */
   trackEntityProperties(entityName, entity, propertiesNames, additionalData) {
+    warnOnDeprecationOfAnalyticsMethod('trackEntityProperties');
     for (let i = 0; i < propertiesNames.length; ++i) {
       const keys = propertiesNames[i].split('.');
       let value = entity;
@@ -70,20 +79,7 @@ class Analytics {
       this.trackEvent(entityName, resultAction, additionalData);
     }
   }
-  _buildSuffix(additionalData) {
-    if (!additionalData) {
-      return '';
-    }
-    let suffix = '';
-    let key;
-    for (key in additionalData) {
-      if (additionalData.hasOwnProperty(key)) {
-        suffix += `__${key}$${additionalData[key]}`;
-      }
-    }
-    return suffix;
-  }
 }
-var analyticsInstance = new Analytics();
+var analytics = new Analytics();
 
-export { Analytics, analyticsInstance as default };
+export { Analytics, analytics as default };

package/dist/analytics/analytics__custom-plugin.d.ts

@@ -2,12 +2,12 @@ import { AnalyticsPlugin } from './analytics';
 export interface AnalyticsCustomPluginData {
     category: string;
     action: string;
+    data?: Record<string, string>;
 }
 export interface AnalyticsCustomPluginConfig {
     send: (data: AnalyticsCustomPluginData[]) => void;
     isDevelopment?: boolean | undefined;
     flushInterval?: number | undefined;
-    flushingAllowedChecker?: (() => boolean) | undefined;
     flushMaxPackSize?: number | undefined;
 }
 export default class AnalyticsCustomPlugin implements AnalyticsPlugin {
@@ -16,24 +16,13 @@ export default class AnalyticsCustomPlugin implements AnalyticsPlugin {
     private _isDevelopment?;
     private _flushInterval?;
     private _flushMaxPackSize?;
-    private _lastPagePath?;
     private _hasSendSchedule?;
-    private _lastPageViewTime?;
-    constructor(send: AnalyticsCustomPluginConfig['send'], isDevelopment?: AnalyticsCustomPluginConfig['isDevelopment'], flushInterval?: AnalyticsCustomPluginConfig['flushInterval'], flushingAllowedChecker?: AnalyticsCustomPluginConfig['flushingAllowedChecker']);
-    /**
-     * @param config
-     * @property {function} config.send
-     * @property {boolean} config.isDevelopment
-     * @property {number} config.flushInterval
-     * @property {function} config.flushingAllowedChecker
-     * @property {number} config.flushMaxPackSize
-     */
+    constructor(send: AnalyticsCustomPluginConfig['send'], isDevelopment?: AnalyticsCustomPluginConfig['isDevelopment'], flushInterval?: AnalyticsCustomPluginConfig['flushInterval']);
     config(config: AnalyticsCustomPluginConfig): void;
-    trackEvent(category: string, action: string): void;
-    trackPageView(path: string): void;
+    trackEvent(category: string, action: string, additionalData?: Record<string, string>): void;
+    trackPageView(path: string, data?: Record<string, string>): void;
     private _initSendSchedule;
     private _processEvent;
-    private _trackPageViewAdditionalInfo;
     private _addDataToFlushingPack;
     get serializeAdditionalInfo(): boolean;
 }

package/dist/analytics/analytics__custom-plugin.js

@@ -1,40 +1,25 @@
 import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
-import AnalyticsPluginUtils from './analytics__plugin-utils.js';
-import '../global/sniffer.js';
-import 'sniffr';
 
 const DEFAULT_FLUSH_INTERVAL = 10000;
 const DEFAULT_FLUSH_MAX_PACK_SIZE = 100;
 class AnalyticsCustomPlugin {
-  constructor(send, isDevelopment, flushInterval, flushingAllowedChecker) {
+  constructor(send, isDevelopment, flushInterval) {
     _defineProperty(this, "_data", void 0);
     _defineProperty(this, "_flush", void 0);
     _defineProperty(this, "_isDevelopment", void 0);
     _defineProperty(this, "_flushInterval", void 0);
     _defineProperty(this, "_flushMaxPackSize", void 0);
-    _defineProperty(this, "_lastPagePath", void 0);
     _defineProperty(this, "_hasSendSchedule", void 0);
-    _defineProperty(this, "_lastPageViewTime", void 0);
     this._data = [];
     this.config({
       send,
       isDevelopment,
-      flushInterval,
-      flushingAllowedChecker
+      flushInterval
     });
   }
-  /**
-   * @param config
-   * @property {function} config.send
-   * @property {boolean} config.isDevelopment
-   * @property {number} config.flushInterval
-   * @property {function} config.flushingAllowedChecker
-   * @property {number} config.flushMaxPackSize
-   */
   config(config) {
-    const checkFlushingAllowed = typeof config.flushingAllowedChecker === 'function' ? config.flushingAllowedChecker : () => true;
     this._flush = () => {
-      if (this._data.length > 0 && checkFlushingAllowed()) {
+      if (this._data.length > 0) {
         config.send(this._data);
         this._data = [];
       }
@@ -43,57 +28,36 @@ class AnalyticsCustomPlugin {
     this._flushInterval = config.flushInterval || DEFAULT_FLUSH_INTERVAL;
     this._flushMaxPackSize = config.flushMaxPackSize || DEFAULT_FLUSH_MAX_PACK_SIZE;
   }
-  trackEvent(category, action) {
-    this._processEvent(category, action);
+  trackEvent(category, action, additionalData) {
+    this._processEvent(category, action, additionalData);
   }
-  trackPageView(path) {
-    if (this._lastPagePath === path) {
-      return;
-    }
-    this._trackPageViewAdditionalInfo(path);
-    this._processEvent('ring-page', path);
-    this._processEvent('ring-navigator_user-agent', AnalyticsPluginUtils.getUserAgentPresentation());
-    this._processEvent('ring-navigator_platform', AnalyticsPluginUtils.npeSaveLowerCase(navigator.platform));
-    this._processEvent('ring-navigator_lang', AnalyticsPluginUtils.npeSaveLowerCase(navigator.language));
-    this._processEvent('ring-device-pixel-ratio', AnalyticsPluginUtils.getDevicePixelRatioPresentation());
-    this._processEvent('ring-screen-width', AnalyticsPluginUtils.getScreenWidthPresentation());
+  trackPageView(path, data) {
+    this._processEvent('page', 'view', data);
   }
   _initSendSchedule() {
-    window.addEventListener('beforeunload', () => {
-      this._trackPageViewAdditionalInfo();
-      return this._flush?.();
-    });
+    window.addEventListener('beforeunload', () => this._flush?.());
     if (this._flush != null) {
       setInterval(this._flush, this._flushInterval);
     }
     this._hasSendSchedule = true;
   }
-  _processEvent(rawCategory, rawAction) {
+  _processEvent(category, action, data) {
     if (!this._hasSendSchedule && this._flush) {
       this._initSendSchedule();
     }
-    const category = AnalyticsPluginUtils.reformatString(rawCategory, true);
-    const action = AnalyticsPluginUtils.reformatString(rawAction);
     if (this._isDevelopment) {
-      console.log('TRACKING DATA = ', category, action); // eslint-disable-line no-console
+      console.log('TRACKING DATA = ', category, action, data); // eslint-disable-line no-console
     }
 
-    this._addDataToFlushingPack({
+    this._addDataToFlushingPack(data ? {
+      category,
+      action,
+      data
+    } : {
       category,
       action
     });
   }
-  _trackPageViewAdditionalInfo(newPagePath) {
-    const currentTime = new Date().getTime();
-    if (this._lastPagePath) {
-      if (this._lastPageViewTime) {
-        const duration = AnalyticsPluginUtils.getPageViewDurationPresentation(currentTime - this._lastPageViewTime);
-        this._processEvent(`ring-pageview-duration_${this._lastPagePath}`, duration);
-      }
-    }
-    this._lastPageViewTime = currentTime;
-    this._lastPagePath = newPagePath;
-  }
   _addDataToFlushingPack(sendingData) {
     this._data.push(sendingData);
     if (this._flushMaxPackSize != null && this._data.length >= this._flushMaxPackSize) {

package/dist/analytics/analytics__fus-plugin.d.ts

@@ -4,13 +4,6 @@ export interface AnalyticsFUSPluginGroup {
     version: string;
     baseline: string;
 }
-export interface AnalyticsFUSPluginConfig {
-    productId?: string | undefined;
-    productBuild?: string | undefined;
-    recorderVersion?: number | string | undefined;
-    isDevelopment?: boolean | undefined;
-    groups?: readonly AnalyticsFUSPluginGroup[] | undefined;
-}
 interface FusraInitParams {
     recorderCode?: string | undefined;
     recorderVersion: number | string;
@@ -38,25 +31,22 @@ declare global {
     }
 }
 /**
+ * @deprecated
  * @name AnalyticsFUSPlugin
- *
- * @param * @param {{
- *   productId: string,
- *   productBuild: string,
- *   recorderVersion: string?,
- *   isDevelopment: boolean?,
- *   groups: object[]?
- * }} config
- * @constructor
  */
-export default class AnalyticsFUSPlugin implements AnalyticsPlugin {
-    private _recorderVersion?;
-    private _lastPagePath?;
-    private _groups;
-    constructor({ productId, productBuild, recorderVersion, isDevelopment, groups }: AnalyticsFUSPluginConfig);
-    trackEvent(category: string, action: string, additionalInfo?: Record<string, unknown>): void;
-    trackPageView(path: string): void;
+declare class AnalyticsFUSPlugin implements AnalyticsPlugin {
+    /**
+     * @deprecated
+     */
+    trackEvent(): void;
+    /**
+     * @deprecated
+     */
+    trackPageView(): void;
+    /**
+     * @deprecated
+     */
     get serializeAdditionalInfo(): boolean;
-    private _processEvent;
 }
-export {};
+declare const _default: typeof AnalyticsFUSPlugin;
+export default _default;