@jetbrains/ring-ui 4.0.48 → 4.0.52

package/components/auth/auth.test.js

@@ -203,7 +203,8 @@ describe('Auth', () => {
         redirectUri: 'http://localhost:8080/hub',
         clientId: '1-1-1-1-1',
         scope: ['0-0-0-0-0', 'youtrack'],
-        optionalScopes: ['youtrack']
+        optionalScopes: ['youtrack'],
+        waitForRedirectTimeout: 0
       });
       try {
         await auth.init();
@@ -226,7 +227,8 @@ describe('Auth', () => {
       auth = new Auth({
         serverUri: '',
         redirect: true,
-        cleanHash: true
+        cleanHash: true,
+        waitForRedirectTimeout: 0
       });
 
       try {
@@ -245,7 +247,8 @@ describe('Auth', () => {
         auth = new Auth({
           serverUri: '',
           redirect: true,
-          cleanHash: true
+          cleanHash: true,
+          waitForRedirectTimeout: 0
         });
 
         try {
@@ -265,7 +268,8 @@ describe('Auth', () => {
       auth = new Auth({
         serverUri: '',
         redirect: true,
-        cleanHash: false
+        cleanHash: false,
+        waitForRedirectTimeout: 0
       });
 
       try {
@@ -284,7 +288,8 @@ describe('Auth', () => {
         serverUri: '',
         redirect: true,
         redirectUri: 'http://localhost:8080/hub',
-        requestCredentials: 'skip'
+        requestCredentials: 'skip',
+        waitForRedirectTimeout: 0
       });
       try {
         await auth.init();
@@ -313,7 +318,8 @@ describe('Auth', () => {
         redirectUri: 'http://localhost:8080/hub',
         clientId: '1-1-1-1-1',
         scope: ['0-0-0-0-0', 'youtrack'],
-        optionalScopes: ['youtrack']
+        optionalScopes: ['youtrack'],
+        waitForRedirectTimeout: 0
       });
 
       auth._storage._tokenStorage = auth._storage._stateStorage =
@@ -330,7 +336,8 @@ describe('Auth', () => {
         auth._storage.saveToken({
           accessToken: 'token',
           expires: TokenValidator._epoch() + HOUR,
-          scopes: ['0-0-0-0-0']
+          scopes: ['0-0-0-0-0'],
+          waitForRedirectTimeout: 0
         });
       });
 

package/components/auth/auth__core.js

@@ -14,6 +14,7 @@ export const DEFAULT_EXPIRES_TIMEOUT = 40 * 60;
 export const DEFAULT_BACKGROUND_TIMEOUT = 10 * 1000;
 const DEFAULT_BACKEND_CHECK_TIMEOUT = 10 * 1000;
 const BACKGROUND_REDIRECT_TIMEOUT = 20 * 1000;
+const DEFAULT_WAIT_FOR_REDIRECT_TIMEOUT = 5 * 1000;
 /* eslint-enable no-magic-numbers */
 
 export const USER_CHANGED_EVENT = 'userChange';
@@ -46,6 +47,7 @@ const DEFAULT_CONFIG = {
   onBackendDown: () => {},
 
   defaultExpiresIn: DEFAULT_EXPIRES_TIMEOUT,
+  waitForRedirectTimeout: DEFAULT_WAIT_FOR_REDIRECT_TIMEOUT,
   translations: {
     login: 'Log in',
     loginTo: 'Log in to %serviceName%',
@@ -311,6 +313,11 @@ export default class Auth {
     const authRequest = await this._requestBuilder.prepareAuthRequest();
     this._redirectCurrentPage(authRequest.url);
 
+    // HUB-10867 Since we already redirecting the page, there is no actual need to throw an error
+    // and scare user with flashing error
+    // But let's keep it just in case redirect was not successful
+    await new Promise(resolve => setTimeout(resolve, this.config.waitForRedirectTimeout));
+
     throw error;
   }
 

package/components/avatar/avatar.js

@@ -16,6 +16,7 @@ export const Size = {
   Size18: 18,
   Size20: 20,
   Size24: 24,
+  Size28: 28,
   Size32: 32,
   Size40: 40,
   Size48: 48,
@@ -32,7 +33,8 @@ export default class Avatar extends PureComponent {
     round: PropTypes.bool,
     subavatar: PropTypes.string,
     subavatarSize: PropTypes.number,
-    username: PropTypes.string
+    username: PropTypes.string,
+    skipParams: PropTypes.bool
   };
 
   static defaultProps = {
@@ -64,6 +66,7 @@ export default class Avatar extends PureComponent {
       subavatar,
       subavatarSize,
       username,
+      skipParams,
       ...restProps
     } = this.props;
     const sizeString = `${size}px`;
@@ -105,7 +108,7 @@ export default class Avatar extends PureComponent {
     }
 
     let src = url;
-    if (!isDataURI(url)) {
+    if (!skipParams && !isDataURI(url)) {
       const [urlStart, query] = url.split('?');
       const queryParams = {
         ...parseQueryString(query),
@@ -124,7 +127,7 @@ export default class Avatar extends PureComponent {
         subavatarSizeString
       };
 
-      subavatarSrc = encodeURL(urlStart, queryParams);
+      subavatarSrc = skipParams ? subavatar : encodeURL(urlStart, queryParams);
       return (
         <div>
           <img

package/components/dropdown-menu/dropdown-menu.js

@@ -93,7 +93,6 @@ const DropdownMenu = React.forwardRef(function DropdownMenu(
           id={listId}
           ariaLabel={ariaLabel || defaultAriaLabel}
           closeOnSelect
-          activateFirstItem
           data={data}
           onSelect={onSelect}
           {...menuProps}

package/components/dropdown-menu/dropdown-menu.test.js

@@ -66,7 +66,8 @@ describe('Dropdown Menu', () => {
   it('should add accessibility attributes to anchor', async () => {
     const wrapper = await mountAndWaitForMenuContent({
       anchor: 'Anchor text',
-      data: [{key: 'key1'}, {key: 'key2'}]
+      data: [{key: 'key1'}, {key: 'key2'}],
+      menuProps: {activateFirstItem: true}
     });
 
     const anchorProps = wrapper.update().find(Anchor).props();

package/components/tooltip/tooltip.js

@@ -20,7 +20,7 @@ export default class Tooltip extends Component {
     delay: PropTypes.number,
     selfOverflowOnly: PropTypes.bool,
     popupProps: PropTypes.object,
-    title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+    title: PropTypes.node,
     children: PropTypes.node,
     'data-test': PropTypes.string
   };
@@ -146,7 +146,7 @@ export default class Tooltip extends Component {
           {...restProps}
           ref={this.containerRef}
           data-test={dataTests('ring-tooltip', dataTest)}
-          data-test-title={title}
+          data-test-title={typeof title === 'string' ? title : undefined}
         >
           {children}
           <Popup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "4.0.48",
+  "version": "4.0.52",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -66,27 +66,27 @@
   "readmeFilename": "README.md",
   "devDependencies": {
     "@babel/cli": "^7.15.7",
-    "@babel/eslint-parser": "^7.15.7",
+    "@babel/eslint-parser": "^7.15.8",
     "@jetbrains/eslint-config": "^5.3.1",
-    "@jetbrains/generator-ring-ui": "^4.0.36",
+    "@jetbrains/generator-ring-ui": "^4.0.40",
     "@jetbrains/stylelint-config": "^2.0.1",
-    "@primer/octicons": "^15.1.0",
-    "@storybook/addon-a11y": "6.3.8",
-    "@storybook/addon-docs": "6.3.8",
-    "@storybook/addon-essentials": "6.3.8",
+    "@primer/octicons": "^16.0.0",
+    "@storybook/addon-a11y": "6.3.11",
+    "@storybook/addon-docs": "6.3.10",
+    "@storybook/addon-essentials": "6.3.11",
     "@storybook/addon-storyshots": "6.3.2",
     "@storybook/addon-storyshots-puppeteer": "6.3.2",
-    "@storybook/addon-storysource": "6.3.8",
-    "@storybook/addons": "6.3.8",
-    "@storybook/builder-webpack5": "6.3.8",
-    "@storybook/client-api": "6.3.8",
-    "@storybook/core": "6.3.8",
-    "@storybook/html": "6.3.8",
-    "@storybook/manager-webpack5": "^6.3.8",
-    "@storybook/source-loader": "6.3.8",
-    "@storybook/theming": "6.3.8",
-    "@testing-library/react": "^12.1.0",
-    "@testing-library/user-event": "^13.2.1",
+    "@storybook/addon-storysource": "6.3.11",
+    "@storybook/addons": "6.3.10",
+    "@storybook/builder-webpack5": "6.3.10",
+    "@storybook/client-api": "6.3.10",
+    "@storybook/core": "6.3.11",
+    "@storybook/html": "6.3.10",
+    "@storybook/manager-webpack5": "^6.3.10",
+    "@storybook/source-loader": "6.3.10",
+    "@storybook/theming": "6.3.10",
+    "@testing-library/react": "^12.1.2",
+    "@testing-library/user-event": "^13.3.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
     "angular": "^1.8.2",
     "angular-mocks": "^1.8.2",
@@ -98,21 +98,21 @@
     "chai-dom": "^1.10.0",
     "chai-enzyme": "1.0.0-beta.1",
     "cheerio": "^0.22.0",
-    "core-js": "^3.18.0",
+    "core-js": "^3.18.2",
     "enzyme": "^3.11.0",
     "eslint": "^7.32.0",
     "eslint-import-resolver-webpack": "^0.13.1",
-    "eslint-plugin-angular": "^4.0.1",
+    "eslint-plugin-angular": "^4.1.0",
     "eslint-plugin-bdd": "^2.1.1",
-    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-import": "^2.25.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.25.3",
+    "eslint-plugin-react": "^7.26.1",
     "events": "^3.3.0",
     "html-webpack-plugin": "^5.3.2",
     "husky": "^7.0.2",
     "identity-obj-proxy": "^3.0.0",
     "imports-loader": "^3.0.0",
-    "jest": "~27.2.0",
+    "jest": "~27.2.5",
     "jest-teamcity": "^1.10.0",
     "karma": "^6.3.4",
     "karma-chrome-launcher": "3.1.0",
@@ -121,11 +121,11 @@
     "karma-teamcity-reporter": "^2.0.0",
     "karma-webpack": "^5.0.0",
     "lerna": "^4.0.0",
-    "lint-staged": "^11.1.2",
+    "lint-staged": "^11.2.3",
     "merge-options": "^3.0.4",
-    "mocha": "^9.1.1",
+    "mocha": "^9.1.2",
     "pinst": "^2.1.6",
-    "puppeteer": "^10.2.0",
+    "puppeteer": "^10.4.0",
     "raw-loader": "^4.0.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -139,8 +139,8 @@
     "teamcity-service-messages": "^0.1.11",
     "terser-webpack-plugin": "^5.2.4",
     "wallaby-webpack": "^3.9.16",
-    "webpack": "^5.53.0",
-    "webpack-cli": "^4.8.0",
+    "webpack": "^5.58.2",
+    "webpack-cli": "^4.9.0",
     "xmlappend": "^1.0.4",
     "yo": "^4.3.0"
   },
@@ -148,10 +148,10 @@
     "core-js": ">=3.0.0",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
-    "webpack": "^5.53.0"
+    "webpack": "^5.58.2"
   },
   "dependencies": {
-    "@babel/core": "^7.15.5",
+    "@babel/core": "^7.15.8",
     "@jetbrains/angular-elastic": "^2.5.1",
     "@jetbrains/babel-preset-jetbrains": "^2.3.1",
     "@jetbrains/icons": "^3.17.1",
@@ -166,8 +166,8 @@
     "combokeys": "^3.0.1",
     "compile-code-loader": "^1.0.0",
     "conic-gradient": "^1.0.0",
-    "css-loader": "^6.3.0",
-    "date-fns": "^2.24.0",
+    "css-loader": "^6.4.0",
+    "date-fns": "^2.25.0",
     "deep-equal": "^2.0.4",
     "element-resize-detector": "^1.2.3",
     "es6-error": "^4.1.1",
@@ -175,14 +175,14 @@
     "extricate-loader": "^3.0.0",
     "fastdom": "^1.0.10",
     "file-loader": "^6.2.0",
-    "focus-trap": "^6.6.1",
+    "focus-trap": "^6.7.1",
     "focus-visible": "^5.2.0",
     "highlight.js": "^10.7.2",
     "html-loader": "^1.3.2",
     "interpolate-loader": "^2.0.1",
     "just-debounce-it": "^1.5.0",
     "memoize-one": "^5.2.1",
-    "postcss": "^8.3.6",
+    "postcss": "^8.3.9",
     "postcss-calc": "^8.0.0",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-font-family-system-ui": "^5.0.0",
@@ -199,7 +199,7 @@
     "scrollbar-width": "^3.1.1",
     "simply-uuid": "^1.0.1",
     "sniffr": "^1.2.0",
-    "style-loader": "~3.2.1",
+    "style-loader": "~3.3.0",
     "url-loader": "^4.1.1",
     "util-deprecate": "^1.0.2"
   },
@@ -207,5 +207,5 @@
     "node": ">=7.4",
     "npm": ">=6.0.0"
   },
-  "gitHead": "aee374ce4d39c397ad36d4c93866a21d344c6208"
+  "gitHead": "081813df7cd0a278be5c00c10286f34540409715"
 }