@jetbrains/ring-ui 4.2.6 → 4.2.9

package/components/auth/auth__core.js

@@ -343,6 +343,11 @@ export default class Auth {
   }
 
   async handleInitValidationError(error) {
+    if (error.cause === 'invalid_client') {
+      // eslint-disable-next-line no-console
+      console.error('RingUI Auth: invalid client detected. Logging out', error);
+      return await this.logout();
+    }
     // Redirect flow
     if (error.authRedirect && this.config.redirect) {
       return this.sendRedirect(error);

package/components/auth/token-validator.js

@@ -147,7 +147,10 @@ export default class TokenValidator {
         TokenValidator.shouldRefreshToken(response.error)
       ) {
         // Token expired
-        throw new TokenValidator.TokenValidationError(response.error || errorResponse.message);
+        throw new TokenValidator.TokenValidationError(
+          response.error || errorResponse.message,
+          errorResponse.data?.error
+        );
       }
 
       // Request unexpectedly failed

package/components/dialog/dialog.js

@@ -34,6 +34,7 @@ export default class Dialog extends PureComponent {
     show: PropTypes.bool.isRequired,
     showCloseButton: PropTypes.bool,
     closeButtonInside: PropTypes.bool,
+    closeButtonTitle: PropTypes.string,
     onOverlayClick: PropTypes.func,
     onEscPress: PropTypes.func,
     onCloseClick: PropTypes.func,
@@ -119,7 +120,7 @@ export default class Dialog extends PureComponent {
   render() {
     const {show, showCloseButton, onOverlayClick, onCloseAttempt, onEscPress, onCloseClick,
       children, className, contentClassName, trapFocus, 'data-test': dataTest, closeButtonInside,
-      portalTarget, label, ...restProps} = this.props;
+      portalTarget, label, closeButtonTitle, ...restProps} = this.props;
     const classes = classNames(styles.container, className);
     const shortcutsMap = this.getShortcutsMap();
 
@@ -166,7 +167,8 @@ export default class Dialog extends PureComponent {
                         })}
                         iconClassName={styles.closeIcon}
                         onClick={this.onCloseClick}
-                        aria-label="close dialog"
+                        title={closeButtonTitle}
+                        aria-label={closeButtonTitle || 'close dialog'}
                       />
                     )
                   }

package/components/pager/pager.js

@@ -69,7 +69,7 @@ export default class Pager extends PureComponent {
     return {selected, data};
   }
 
-  getTotal() {
+  getPagesAmount() {
     const {total, pageSize} = this.props;
     return Math.ceil(total / pageSize);
   }
@@ -89,7 +89,7 @@ export default class Pager extends PureComponent {
   handleNextClick = () => {
     const {currentPage, onLoadPage} = this.props;
     const nextPage = currentPage + 1;
-    const total = this.getTotal();
+    const total = this.getPagesAmount();
     if (currentPage !== total) {
       this.props.onPageChange(nextPage);
     } else if (this.props.openTotal) {
@@ -154,7 +154,8 @@ export default class Pager extends PureComponent {
 
     const prevLinkAvailable = this.props.currentPage !== 1;
 
-    const nextLinkAvailable = this.props.openTotal || this.props.currentPage !== this.getTotal();
+    const nextLinkAvailable = this.props.openTotal ||
+      this.props.currentPage !== this.getPagesAmount();
 
     const nextIcon = (
       <Icon glyph={chevronRightIcon} key="icon"/>
@@ -232,17 +233,16 @@ export default class Pager extends PureComponent {
 
   getPagerContent() {
     const {currentPage, visiblePagesLimit} = this.props;
-    const totalPages = this.getTotal();
+    const pagesAmount = this.getPagesAmount();
 
-    if (totalPages < 2 && !this.props.openTotal) {
+    if (pagesAmount < 2 && !this.props.openTotal) {
       return null;
     }
 
     let start = 1;
-    let end = totalPages;
+    let end = pagesAmount;
 
-    // eslint-disable-next-line no-magic-numbers
-    if (totalPages >= visiblePagesLimit + 6) {
+    if (pagesAmount >= visiblePagesLimit) {
       const leftHalfFrameSize = Math.ceil(visiblePagesLimit / 2) - 1;
       const rightHalfFrameSize = visiblePagesLimit - leftHalfFrameSize - 1;
 
@@ -255,8 +255,8 @@ export default class Pager extends PureComponent {
         end += tail;
       }
 
-      if (end > totalPages) {
-        const tail = end - totalPages;
+      if (end > pagesAmount) {
+        const tail = end - pagesAmount;
         start -= tail;
         end -= tail;
       }
@@ -271,7 +271,7 @@ export default class Pager extends PureComponent {
       buttons.push(this.getButton(i, i, i, i === currentPage));
     }
 
-    const lastPageButtonAvailable = (end < totalPages && !this.props.openTotal) ||
+    const lastPageButtonAvailable = (end < pagesAmount && !this.props.openTotal) ||
       (this.props.openTotal && this.props.canLoadLastPageWithOpenTotal);
 
     return (
@@ -292,9 +292,9 @@ export default class Pager extends PureComponent {
 
             {buttons}
 
-            {end < totalPages && this.getButton(end + 1, '...')}
+            {end < pagesAmount && this.getButton(end + 1, '...')}
 
-            {end === totalPages && this.props.openTotal && (
+            {end === pagesAmount && this.props.openTotal && (
               <Button
                 href={this.generateHref(end + 1)}
                 disabled={this.props.loader}
@@ -307,7 +307,7 @@ export default class Pager extends PureComponent {
         (
           <ButtonGroup>
             {this.getButton(
-              this.props.openTotal ? -1 : totalPages,
+              this.props.openTotal ? -1 : pagesAmount,
               this.props.translations.lastPage
             )}
           </ButtonGroup>

package/components/table/row.js

@@ -16,7 +16,7 @@ import composeRefs from '../global/composeRefs';
 import Cell from './cell';
 import style from './table.css';
 
-const DragHandle = ({alwaysShowDragHandle}) => {
+const DragHandle = ({alwaysShowDragHandle, dragHandleTitle = 'Drag to reorder'}) => {
   const classes = classNames(style.dragHandle, {
     [style.visibleDragHandle]: alwaysShowDragHandle
   });
@@ -24,14 +24,15 @@ const DragHandle = ({alwaysShowDragHandle}) => {
   return (
     <Button
       data-movable-handle
-      title="Drag"
+      title={dragHandleTitle}
       className={classes}
       icon={dragIcon}
     />
   );
 };
 DragHandle.propTypes = {
-  alwaysShowDragHandle: PropTypes.bool
+  alwaysShowDragHandle: PropTypes.bool,
+  dragHandleTitle: PropTypes.string
 };
 
 export default class Row extends PureComponent {
@@ -43,6 +44,7 @@ export default class Row extends PureComponent {
     showFocus: PropTypes.bool,
     draggable: PropTypes.bool,
     alwaysShowDragHandle: PropTypes.bool,
+    dragHandleTitle: PropTypes.string,
     selected: PropTypes.bool,
     onHover: PropTypes.func,
     onSelect: PropTypes.func,
@@ -127,7 +129,7 @@ export default class Row extends PureComponent {
   render() {
     const {
       item, columns, selectable, selected,
-      showFocus, draggable, alwaysShowDragHandle, level,
+      showFocus, draggable, alwaysShowDragHandle, dragHandleTitle, level,
       collapsible, parentCollapsible, collapsed,
       onCollapse, onExpand, showDisabledSelection,
       checkboxTooltip, innerRef, focused, autofocus, onFocusReset,
@@ -156,9 +158,12 @@ export default class Row extends PureComponent {
 
     const metaColumn = (
       <div className={metaColumnClasses} style={metaColumnStyle}>
-        {draggable &&
-          <DragHandle alwaysShowDragHandle={alwaysShowDragHandle}/>
-        }
+        {draggable && (
+          <DragHandle
+            alwaysShowDragHandle={alwaysShowDragHandle}
+            dragHandleTitle={dragHandleTitle}
+          />
+        )}
 
         {selectable &&
           (

package/components/table/table.examples.js

@@ -114,6 +114,7 @@ class BasicDemo extends Component {
           caption={withCaption ? 'Countries' : undefined}
           isItemSelectable={this.isItemSelectable}
           getItemDataTest={it => it.country}
+          dragHandleTitle="Drag me!"
         />
 
         <Grid>

package/components/table/table.js

@@ -42,6 +42,7 @@ export class Table extends PureComponent {
     sortOrder: PropTypes.bool,
     draggable: PropTypes.bool,
     alwaysShowDragHandle: PropTypes.bool,
+    dragHandleTitle: PropTypes.string,
     getItemLevel: PropTypes.func,
     isItemCollapsible: PropTypes.func,
     isParentCollapsible: PropTypes.func,
@@ -175,7 +176,7 @@ export class Table extends PureComponent {
     const {
       data, selection, columns, caption, getItemKey, selectable, focused,
       isItemSelectable, getItemLevel, getItemClassName, getItemDataTest,
-      draggable, alwaysShowDragHandle,
+      draggable, alwaysShowDragHandle, dragHandleTitle,
       loading, onSort, sortKey, sortOrder, loaderClassName, stickyHeader,
       stickyHeaderOffset, isItemCollapsible, isParentCollapsible, isItemCollapsed,
       onItemCollapse, onItemExpand, isDisabledSelectionVisible, getCheckboxTooltip,
@@ -262,6 +263,7 @@ export class Table extends PureComponent {
           className={classNames(getItemClassName(value), {[style.draggingRow]: isDragged})}
           draggable={draggable}
           alwaysShowDragHandle={alwaysShowDragHandle}
+          dragHandleTitle={dragHandleTitle}
           columns={columns}
           data-test={getItemDataTest(value)}
           {...restProps}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "4.2.6",
+  "version": "4.2.9",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -221,5 +221,5 @@
     "node": ">=7.4",
     "npm": ">=6.0.0"
   },
-  "gitHead": "2859a8356ddd35e59398fb36699866f786126b2a"
+  "gitHead": "f3629bb73589725e9470d3bd9912382d36754098"
 }