@jetbrains/ring-ui 7.0.94 → 7.0.96

package/components/auth/auth-core.d.ts

@@ -8,6 +8,7 @@ import TokenValidator, { type TokenValidationError, type TokenValidatorConfig }
 import type AuthDialogService from '../auth-dialog-service/auth-dialog-service';
 export declare const DEFAULT_EXPIRES_TIMEOUT: number;
 export declare const DEFAULT_BACKGROUND_TIMEOUT: number;
+export declare const TOKEN_REFRESH_RETRY_DELAYS: number[];
 export declare const USER_CHANGED_EVENT = "userChange";
 export declare const DOMAIN_USER_CHANGED_EVENT = "domainUser";
 export declare const LOGOUT_EVENT = "logout";
@@ -80,6 +81,8 @@ export interface AuthConfig extends TokenValidatorConfig {
     translations?: AuthTranslations | null | undefined;
     userParams?: RequestParams | undefined;
     waitForRedirectTimeout: number;
+    tokenRefreshRetryDelays: readonly number[];
+    rpInitiatedLogout: boolean;
 }
 type AuthPayloadMap = {
     userChange: [AuthUser | undefined | void, void];
@@ -120,6 +123,7 @@ declare class Auth implements HTTPAuth {
     static DEFAULT_CONFIG: Omit<AuthConfig, "serverUri">;
     static API_PATH: string;
     static API_AUTH_PATH: string;
+    static API_LOGOUT_PATH: string;
     static API_PROFILE_PATH: string;
     static CLOSE_BACKEND_DOWN_MESSAGE: string;
     static CLOSE_WINDOW_MESSAGE: string;
@@ -137,6 +141,7 @@ declare class Auth implements HTTPAuth {
     _tokenValidator: TokenValidator | null;
     private _postponed;
     private _backendCheckPromise;
+    private _forceTokenUpdatePromise;
     private _authDialogService;
     _domainStorage: AuthStorage<UserChange>;
     user: AuthUser | null;
@@ -166,9 +171,18 @@ declare class Auth implements HTTPAuth {
     requestToken(): Promise<string | null>;
     /**
      * Get new token in the background or redirect to the login page.
-     * @return {Promise.<string>}
+     *
+     * Retries background token refresh with delays from {@link AuthConfig.tokenRefreshRetryDelays}
+     * with increasing delays before showing the auth dialog.
+     * This handles transient failures that commonly occur after network
+     * recovery (e.g. waking from sleep, switching networks) where the first
+     * iframe-based auth attempt fails but a subsequent one succeeds once
+     * the Hub session is re-established.
+     *
+     * @return {Promise.<string | null>}
      */
     forceTokenUpdate(): Promise<string | null>;
+    private _doForceTokenUpdate;
     loadCurrentService(): Promise<void>;
     getAPIPath(): string;
     /**
@@ -187,7 +201,10 @@ declare class Auth implements HTTPAuth {
     private _extractErrorMessage;
     private _showBackendDownDialog;
     /**
-     * Wipe accessToken and redirect to auth page with required authorization
+     * Wipe accessToken and redirect to logout endpoint.
+     * Uses RP-initiated logout flow (oauth2/logout) when rpInitiatedLogout config is enabled,
+     * falls back to oauth2/auth redirect otherwise.
+     * See: https://youtrack.jetbrains.com/projects/HUB/articles/HUB-A-43#rp-initiated-logout
      */
     logout(extraParams?: Record<string, unknown>): Promise<void>;
     private _runEmbeddedLogin;

package/components/auth/auth-core.js

@@ -15,6 +15,7 @@ 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;
+export const TOKEN_REFRESH_RETRY_DELAYS = [0, 2000, 5000];
 export const USER_CHANGED_EVENT = 'userChange';
 export const DOMAIN_USER_CHANGED_EVENT = 'domainUser';
 export const LOGOUT_EVENT = 'logout';
@@ -43,12 +44,15 @@ const DEFAULT_CONFIG = {
     onBackendDown: () => () => { },
     defaultExpiresIn: DEFAULT_EXPIRES_TIMEOUT,
     waitForRedirectTimeout: DEFAULT_WAIT_FOR_REDIRECT_TIMEOUT,
+    tokenRefreshRetryDelays: TOKEN_REFRESH_RETRY_DELAYS,
+    rpInitiatedLogout: true,
     translations: null,
 };
 class Auth {
     static DEFAULT_CONFIG = DEFAULT_CONFIG;
     static API_PATH = 'api/rest/';
     static API_AUTH_PATH = 'oauth2/auth';
+    static API_LOGOUT_PATH = 'oauth2/logout';
     static API_PROFILE_PATH = 'users/me';
     static CLOSE_BACKEND_DOWN_MESSAGE = 'backend-check-succeeded';
     static CLOSE_WINDOW_MESSAGE = 'close-login-window';
@@ -66,6 +70,7 @@ class Auth {
     _tokenValidator = null;
     _postponed = false;
     _backendCheckPromise = null;
+    _forceTokenUpdatePromise = null;
     _authDialogService = undefined;
     _domainStorage;
     user = null;
@@ -106,6 +111,7 @@ class Auth {
         this._domainStorage = new AuthStorage({ messagePrefix: 'domain-message-' });
         this._requestBuilder = new AuthRequestBuilder({
             authorization: this.config.serverUri + Auth.API_PATH + Auth.API_AUTH_PATH,
+            logout: this.config.serverUri + Auth.API_PATH + Auth.API_LOGOUT_PATH,
             clientId,
             redirect,
             redirectUri,
@@ -205,6 +211,8 @@ class Auth {
                         throw error;
                     }
                     if (this._canShowDialogs()) {
+                        // eslint-disable-next-line no-console
+                        console.error('RingUI Auth: Init failure', error);
                         this._showAuthDialog({ nonInteractive: true, error });
                     }
                 }
@@ -218,7 +226,7 @@ class Auth {
             if (this.user && userID === this.user.id) {
                 return;
             }
-            this.forceTokenUpdate();
+            this.forceTokenUpdate().catch(noop);
         });
         let state;
         try {
@@ -240,7 +248,7 @@ class Auth {
             if (message) {
                 const { userID, serviceID } = message;
                 if (serviceID !== this.config.clientId && (!userID || this.user?.id !== userID)) {
-                    this.forceTokenUpdate();
+                    this.forceTokenUpdate().catch(noop);
                 }
             }
             // Access token appears to be valid.
@@ -338,9 +346,26 @@ class Auth {
     }
     /**
      * Get new token in the background or redirect to the login page.
-     * @return {Promise.<string>}
+     *
+     * Retries background token refresh with delays from {@link AuthConfig.tokenRefreshRetryDelays}
+     * with increasing delays before showing the auth dialog.
+     * This handles transient failures that commonly occur after network
+     * recovery (e.g. waking from sleep, switching networks) where the first
+     * iframe-based auth attempt fails but a subsequent one succeeds once
+     * the Hub session is re-established.
+     *
+     * @return {Promise.<string | null>}
      */
-    async forceTokenUpdate() {
+    forceTokenUpdate() {
+        if (this._forceTokenUpdatePromise) {
+            return this._forceTokenUpdatePromise;
+        }
+        this._forceTokenUpdatePromise = this._doForceTokenUpdate().finally(() => {
+            this._forceTokenUpdatePromise = null;
+        });
+        return this._forceTokenUpdatePromise;
+    }
+    async _doForceTokenUpdate() {
         try {
             if (!this._backendCheckPromise) {
                 this._backendCheckPromise = this._checkBackendsStatusesIfEnabled();
@@ -353,44 +378,48 @@ class Auth {
         finally {
             this._backendCheckPromise = null;
         }
-        try {
-            return (await this._backgroundFlow?.authorize()) ?? null;
-        }
-        catch (error) {
-            if (!(error instanceof Error)) {
-                return null;
+        let lastError = null;
+        for (const delay of this.config.tokenRefreshRetryDelays) {
+            if (delay > 0) {
+                await new Promise(resolve => setTimeout(resolve, delay));
             }
-            if (this._canShowDialogs()) {
-                return new Promise(resolve => {
-                    const onTryAgain = async () => {
-                        try {
-                            const result = await this._backgroundFlow?.authorize();
-                            resolve(result ?? null);
-                        }
-                        catch (retryError) {
-                            if (retryError instanceof Error) {
-                                this._showAuthDialog({
-                                    nonInteractive: true,
-                                    error: retryError,
-                                    onTryAgain,
-                                });
-                            }
-                            throw retryError;
-                        }
-                    };
-                    this._showAuthDialog({
-                        nonInteractive: true,
-                        error: error,
-                        onTryAgain,
-                    });
-                });
+            try {
+                return (await this._backgroundFlow?.authorize()) ?? null;
             }
-            const authRequest = await this._requestBuilder?.prepareAuthRequest();
-            if (authRequest) {
-                this._redirectCurrentPage(authRequest.url);
+            catch (error) {
+                lastError = error instanceof Error ? error : new Error(String(error));
             }
-            throw new TokenValidator.TokenValidationError(error.message);
         }
+        if (this._canShowDialogs()) {
+            return new Promise(resolve => {
+                const onTryAgain = async () => {
+                    try {
+                        const result = await this._backgroundFlow?.authorize();
+                        resolve(result ?? null);
+                    }
+                    catch (retryError) {
+                        if (retryError instanceof Error) {
+                            this._showAuthDialog({
+                                nonInteractive: true,
+                                error: retryError,
+                                onTryAgain,
+                            });
+                        }
+                        throw retryError;
+                    }
+                };
+                this._showAuthDialog({
+                    nonInteractive: true,
+                    error: lastError,
+                    onTryAgain,
+                });
+            });
+        }
+        const authRequest = await this._requestBuilder?.prepareAuthRequest();
+        if (authRequest) {
+            this._redirectCurrentPage(authRequest.url);
+        }
+        throw new TokenValidator.TokenValidationError(lastError?.message ?? 'Failed to refresh token');
     }
     async loadCurrentService() {
         if (this._service.serviceName) {
@@ -468,7 +497,10 @@ class Auth {
     }
     _beforeLogout(params) {
         if (this._canShowDialogs()) {
-            this._showAuthDialog(params);
+            const onTryAgain = async () => {
+                await this.forceTokenUpdate();
+            };
+            this._showAuthDialog({ onTryAgain, ...params });
             return;
         }
         this.logout();
@@ -504,7 +536,7 @@ class Auth {
                 return;
             }
             if (this.user?.guest && nonInteractive) {
-                this.forceTokenUpdate();
+                this.forceTokenUpdate().catch(noop);
             }
             else {
                 this._initDeferred?.resolve?.();
@@ -633,20 +665,24 @@ class Auth {
         });
     }
     /**
-     * Wipe accessToken and redirect to auth page with required authorization
+     * Wipe accessToken and redirect to logout endpoint.
+     * Uses RP-initiated logout flow (oauth2/logout) when rpInitiatedLogout config is enabled,
+     * falls back to oauth2/auth redirect otherwise.
+     * See: https://youtrack.jetbrains.com/projects/HUB/articles/HUB-A-43#rp-initiated-logout
      */
     async logout(extraParams) {
-        const requestParams = {
-            request_credentials: 'required',
-            ...extraParams,
-        };
         await this._checkBackendsStatusesIfEnabled();
         await this.listeners.trigger('logout');
         this._updateDomainUser(null);
         await this._storage?.wipeToken();
-        const authRequest = await this._requestBuilder?.prepareAuthRequest(requestParams);
-        if (authRequest) {
-            this._redirectCurrentPage(authRequest.url);
+        const request = this.config.rpInitiatedLogout
+            ? await this._requestBuilder?.prepareLogoutRequest(extraParams)
+            : await this._requestBuilder?.prepareAuthRequest({
+                request_credentials: 'required',
+                ...extraParams,
+            });
+        if (request) {
+            this._redirectCurrentPage(request.url);
         }
     }
     async _runEmbeddedLogin() {
@@ -681,6 +717,8 @@ class Auth {
             }
         }
         catch (e) {
+            // eslint-disable-next-line no-console
+            console.error('RingUI Auth: login failure', e);
             this._beforeLogout();
         }
     }

package/components/auth/request-builder.d.ts

@@ -3,6 +3,7 @@ import type { AuthState } from './storage';
 import type AuthStorage from './storage';
 export interface AuthRequestBuilderConfig {
     authorization: string;
+    logout?: string | null | undefined;
     redirectUri?: string | null | undefined;
     requestCredentials?: string | null | undefined;
     clientId?: string | null | undefined;
@@ -38,6 +39,17 @@ export default class AuthRequestBuilder {
         url: string;
         stateId: string;
     }>;
+    /**
+     * Build a logout URL for RP-initiated logout flow.
+     * See: https://youtrack.jetbrains.com/projects/HUB/articles/HUB-A-43#rp-initiated-logout
+     *
+     * @param {object=} extraParams additional query parameters for logout request
+     * @return {Promise.<{url: string, stateId: string}>} logout URL with required parameters
+     */
+    prepareLogoutRequest(extraParams?: Record<string, unknown> | null | undefined): Promise<{
+        url: string;
+        stateId: string;
+    }>;
     /**
      * @param {string} id
      * @param {StoredState} storedState

package/components/auth/request-builder.js

@@ -51,6 +51,33 @@ export default class AuthRequestBuilder {
             stateId,
         };
     }
+    /**
+     * Build a logout URL for RP-initiated logout flow.
+     * See: https://youtrack.jetbrains.com/projects/HUB/articles/HUB-A-43#rp-initiated-logout
+     *
+     * @param {object=} extraParams additional query parameters for logout request
+     * @return {Promise.<{url: string, stateId: string}>} logout URL with required parameters
+     */
+    async prepareLogoutRequest(extraParams) {
+        if (!this.config.logout) {
+            throw new Error('Logout URL is not configured');
+        }
+        // eslint-disable-next-line no-underscore-dangle
+        const stateId = AuthRequestBuilder._uuid();
+        const logoutParams = {
+            client_id: this.config.clientId,
+            state: stateId,
+            ...extraParams,
+        };
+        await this._saveState(stateId, {
+            restoreLocation: window.location.href,
+            scopes: [...this.config.scopes],
+        });
+        return {
+            url: encodeURL(this.config.logout, logoutParams),
+            stateId,
+        };
+    }
     /**
      * @param {string} id
      * @param {StoredState} storedState

package/components/list/list.d.ts

@@ -109,7 +109,7 @@ export default class List<T = unknown> extends Component<ListProps<T>, ListState
     };
     componentDidMount(): void;
     shouldComponentUpdate(nextProps: ListProps<T>, nextState: ListState<T>): boolean;
-    componentDidUpdate(prevProps: ListProps<T>): void;
+    componentDidUpdate(prevProps: ListProps<T>, prevState: ListState<T>): void;
     componentWillUnmount(): void;
     scheduleScrollListener: (cb: () => void) => void;
     static isItemType: typeof isItemType;

package/components/list/list.js

@@ -126,11 +126,24 @@ export default class List extends Component {
         return (Object.keys(nextProps).some(key => !Object.is(nextProps[key], this.props[key])) ||
             Object.keys(nextState).some(key => nextState[key] !== this.state[key]));
     }
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps, prevState) {
         if (this.virtualizedList && prevProps.data !== this.props.data) {
             this.virtualizedList.recomputeRowHeights();
         }
         const { activeIndex } = this.state;
+        if (!this.virtualizedList &&
+            !this.props.disableScrollToActive &&
+            this.state.needScrollToActive &&
+            activeIndex != null &&
+            activeIndex !== prevState.activeIndex) {
+            const itemId = this.getId(this.props.data[activeIndex]);
+            if (itemId) {
+                document.getElementById(itemId)?.scrollIntoView?.({
+                    block: 'center',
+                });
+            }
+            this.setState({ needScrollToActive: false });
+        }
         const isActiveItemRetainedPosition = activeIndex
             ? prevProps.data[activeIndex]?.key === this.props.data[activeIndex]?.key
             : false;

package/components/tabs/dumb-tabs.js

@@ -15,7 +15,7 @@ class Tabs extends PureComponent {
         const { selected, children } = this.props;
         const childrenArray = React.Children.toArray(children).filter(Boolean);
         const selectedIndex = childrenArray.findIndex((tab, i) => getTabId(tab, i) === selected);
-        const actualSelectedIndex = selectedIndex === -1 ? 0 : selectedIndex;
+        const actualSelectedIndex = selectedIndex === -1 ? childrenArray.findIndex(tab => tab.type !== CustomItem) : selectedIndex;
         const selectedItem = childrenArray[actualSelectedIndex];
         return { selectedItem, selectedKey: getTabId(selectedItem, actualSelectedIndex) };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "7.0.94",
+  "version": "7.0.96",
   "description": "JetBrains UI library",
   "author": {
     "name": "JetBrains"
@@ -100,7 +100,7 @@
     "@csstools/stylelint-no-at-nest-rule": "^5.0.0",
     "@eslint/compat": "^2.0.2",
     "@eslint/eslintrc": "^3.3.3",
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^10.0.1",
     "@figma/code-connect": "^1.3.13",
     "@jetbrains/eslint-config": "^6.0.5",
     "@jetbrains/logos": "3.0.0-canary.734b213.0",
@@ -128,17 +128,17 @@
     "@types/react-dom": "^19.2.3",
     "@types/webpack-env": "^1.18.8",
     "@vitejs/plugin-react": "^5.1.4",
-    "@vitest/eslint-plugin": "^1.6.7",
+    "@vitest/eslint-plugin": "^1.6.9",
     "acorn": "^8.15.0",
     "babel-plugin-require-context-hook": "^1.0.0",
-    "caniuse-lite": "^1.0.30001769",
+    "caniuse-lite": "^1.0.30001770",
     "chai-as-promised": "^8.0.2",
     "chai-dom": "^1.12.1",
     "cheerio": "^1.2.0",
     "core-js": "^3.48.0",
     "cpy-cli": "^7.0.0",
     "dotenv-cli": "^11.0.0",
-    "eslint": "^9.39.2",
+    "eslint": "^10.0.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-exports": "^1.0.0-beta.5",
     "eslint-import-resolver-typescript": "^4.4.4",
@@ -149,7 +149,7 @@
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-storybook": "^10.2.8",
-    "eslint-plugin-unicorn": "^62.0.0",
+    "eslint-plugin-unicorn": "^63.0.0",
     "events": "^3.3.0",
     "glob": "^13.0.3",
     "globals": "^17.3.0",
@@ -169,13 +169,13 @@
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "regenerator-runtime": "^0.14.1",
-    "rimraf": "^6.1.2",
+    "rimraf": "^6.1.3",
     "rollup": "^4.57.1",
     "rollup-plugin-clear": "^2.0.7",
     "storage-mock": "^2.1.0",
-    "storybook": "10.2.8",
+    "storybook": "10.2.13",
     "stylelint": "^17.3.0",
-    "stylelint-config-sass-guidelines": "^12.1.0",
+    "stylelint-config-sass-guidelines": "^13.0.0",
     "svg-inline-loader": "^0.8.2",
     "teamcity-service-messages": "^0.1.14",
     "terser-webpack-plugin": "^5.3.16",
@@ -223,7 +223,7 @@
     "change-case": "^4.1.1",
     "classnames": "^2.5.1",
     "combokeys": "^3.0.1",
-    "css-loader": "^7.1.3",
+    "css-loader": "^7.1.4",
     "csstype": "^3.2.1",
     "date-fns": "^4.1.0",
     "dequal": "^2.0.3",
@@ -238,7 +238,7 @@
     "postcss-calc": "^10.1.1",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-font-family-system-ui": "^5.0.0",
-    "postcss-loader": "^8.2.0",
+    "postcss-loader": "^8.2.1",
     "postcss-modules-values-replace": "^4.2.2",
     "postcss-preset-env": "^11.1.3",
     "react-compiler-runtime": "^1.0.0",