cluster-ui: alphabetize imports

This commit modifies the imports/order eslint rule to also
enforce that imports are alphabetically ordered by import path.

Epic: none

Release note: None

pkg/ui/workspaces/cluster-ui/.eslintrc.json

@@ -43,6 +43,10 @@
     "import/order": [
       "error",
       {
+        "alphabetize": {
+          "order": "asc",
+          "caseInsensitive": true
+        },
         "newlines-between": "always",
         "groups": [
           "builtin",

pkg/ui/workspaces/cluster-ui/src/NotificationMessage/NotificationMessage.tsx

@@ -8,9 +8,9 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import React, { FunctionComponent } from "react";
-import classnames from "classnames/bind";
 import { Badge, BadgeIntent, FuzzyTime } from "@cockroachlabs/ui-components";
+import classnames from "classnames/bind";
+import React, { FunctionComponent } from "react";
 
 import {
   NotificationTypeProp,

pkg/ui/workspaces/cluster-ui/src/Notifications/notifications.ts

@@ -10,8 +10,8 @@
 
 // This is a placeholder for real implementation (likely in Redux?) of notifications
 
-import { notificationTypes, NotificationProps } from "../Notifications";
 import { NotificationMessageProps } from "../NotificationMessage";
+import { notificationTypes, NotificationProps } from "../Notifications";
 
 export const generateNotificationProps = (
   notifications: Array<NotificationProps>,

pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementUtils.spec.ts

@@ -9,11 +9,18 @@
 // licenses/APL.txt.
 
 import * as protos from "@cockroachlabs/crdb-protobuf-client";
-import moment from "moment-timezone";
 import Long from "long";
+import moment from "moment-timezone";
 
 import { TimestampToMoment } from "../util";
 
+import {
+  getActiveExecutionsFromSessions,
+  getAppsFromActiveExecutions,
+  filterActiveStatements,
+  filterActiveTransactions,
+  INTERNAL_APP_NAME_PREFIX,
+} from "./activeStatementUtils";
 import {
   ActiveStatementPhase,
   SessionsResponse,
@@ -24,13 +31,6 @@ import {
   ActiveTransactionFilters,
   ExecutionStatus,
 } from "./types";
-import {
-  getActiveExecutionsFromSessions,
-  getAppsFromActiveExecutions,
-  filterActiveStatements,
-  filterActiveTransactions,
-  INTERNAL_APP_NAME_PREFIX,
-} from "./activeStatementUtils";
 
 type ActiveQuery = protos.cockroach.server.serverpb.ActiveQuery;
 const Timestamp = protos.google.protobuf.Timestamp;

pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementUtils.ts

@@ -10,9 +10,9 @@
 
 import moment from "moment-timezone";
 
+import { ClusterLocksResponse, ClusterLockState } from "src/api";
 import { byteArrayToUuid } from "src/sessions";
 import { TimestampToMoment, unset } from "src/util";
-import { ClusterLocksResponse, ClusterLockState } from "src/api";
 import { DurationToMomentDuration } from "src/util/convert";
 
 import {

pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsSection.tsx

@@ -8,8 +8,8 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import React, { useMemo } from "react";
 import classNames from "classnames/bind";
+import React, { useMemo } from "react";
 
 import {
   ActiveStatement,
@@ -18,12 +18,12 @@ import {
 import ColumnsSelector, {
   SelectOption,
 } from "src/columnsSelector/columnsSelector";
+import { isSelectedColumn } from "src/columnsSelector/utils";
+import { calculateActiveFilters } from "src/queryFilter/filter";
 import sortableTableStyles from "src/sortedtable/sortedtable.module.scss";
 import { EmptyStatementsPlaceholder } from "src/statementsPage/emptyStatementsPlaceholder";
-import { TableStatistics } from "src/tableStatistics";
 import { StatementViewType } from "src/statementsPage/statementPageTypes";
-import { calculateActiveFilters } from "src/queryFilter/filter";
-import { isSelectedColumn } from "src/columnsSelector/utils";
+import { TableStatistics } from "src/tableStatistics";
 
 import {
   ISortedTablePagination,

pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsTable/activeStatementsTable.tsx

@@ -8,20 +8,20 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
+import { Tooltip } from "@cockroachlabs/ui-components";
 import React from "react";
 import { Link } from "react-router-dom";
-import { Tooltip } from "@cockroachlabs/ui-components";
 
 import { isSelectedColumn } from "../../columnsSelector/utils";
 import { ColumnDescriptor } from "../../sortedtable";
+import { limitText } from "../../util";
 import {
   activeStatementColumnsFromCommon,
   ExecutionsColumn,
   executionsTableTitles,
   getLabel,
 } from "../execTableCommon";
 import { ActiveStatement } from "../types";
-import { limitText } from "../../util";
 
 export function makeActiveStatementsColumns(
   isTenant: boolean,

pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsSection.tsx

@@ -8,8 +8,8 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import React, { useMemo } from "react";
 import classNames from "classnames/bind";
+import React, { useMemo } from "react";
 
 import {
   ActiveTransaction,
@@ -18,13 +18,13 @@ import {
 import ColumnsSelector, {
   SelectOption,
 } from "src/columnsSelector/columnsSelector";
+import { isSelectedColumn } from "src/columnsSelector/utils";
+import { calculateActiveFilters } from "src/queryFilter/filter";
+import { SortedTable } from "src/sortedtable";
 import sortableTableStyles from "src/sortedtable/sortedtable.module.scss";
-import { EmptyTransactionsPlaceholder } from "src/transactionsPage/emptyTransactionsPlaceholder";
 import { TableStatistics } from "src/tableStatistics";
+import { EmptyTransactionsPlaceholder } from "src/transactionsPage/emptyTransactionsPlaceholder";
 import { TransactionViewType } from "src/transactionsPage/transactionsPageTypes";
-import { calculateActiveFilters } from "src/queryFilter/filter";
-import { isSelectedColumn } from "src/columnsSelector/utils";
-import { SortedTable } from "src/sortedtable";
 
 import {
   ISortedTablePagination,

pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsTable/activeTransactionsTable.tsx

@@ -8,20 +8,20 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
+import { Tooltip } from "@cockroachlabs/ui-components";
 import React from "react";
 import { Link } from "react-router-dom";
-import { Tooltip } from "@cockroachlabs/ui-components";
 
 import { isSelectedColumn } from "../../columnsSelector/utils";
 import { ColumnDescriptor } from "../../sortedtable";
+import { limitText } from "../../util";
 import {
   activeTransactionColumnsFromCommon,
   ExecutionsColumn,
   executionsTableTitles,
   getLabel,
 } from "../execTableCommon";
 import { ActiveTransaction, ExecutionType } from "../types";
-import { limitText } from "../../util";
 
 export function makeActiveTransactionsColumns(
   isTenant: boolean,

pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsTable/execContentionTable.tsx

@@ -8,16 +8,16 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
+import { Tooltip } from "@cockroachlabs/ui-components";
 import React from "react";
 import { Link } from "react-router-dom";
-import { Tooltip } from "@cockroachlabs/ui-components";
 
 import { ColumnDescriptor, SortedTable } from "../../sortedtable";
-import { ContendedExecution, ExecutionType } from "../types";
-import { StatusIcon } from "../statusIcon";
-import { executionsTableTitles } from "../execTableCommon";
-import { DATE_FORMAT_24_TZ, Duration, limitText } from "../../util";
 import { Timestamp } from "../../timestamp";
+import { DATE_FORMAT_24_TZ, Duration, limitText } from "../../util";
+import { executionsTableTitles } from "../execTableCommon";
+import { StatusIcon } from "../statusIcon";
+import { ContendedExecution, ExecutionType } from "../types";
 
 const getID = (item: ContendedExecution, execType: ExecutionType) =>
   execType === "transaction"

pkg/ui/workspaces/cluster-ui/src/activeExecutions/execTableCommon.tsx

@@ -8,8 +8,8 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import React from "react";
 import { Tooltip } from "@cockroachlabs/ui-components";
+import React from "react";
 import { Link } from "react-router-dom";
 
 import { ColumnDescriptor } from "src/sortedtable";

pkg/ui/workspaces/cluster-ui/src/activeExecutions/refreshControl/refreshControl.tsx

@@ -9,9 +9,9 @@
 // licenses/APL.txt.
 
 import { Switch } from "antd";
-import React from "react";
 import classNames from "classnames/bind";
 import { Moment } from "moment-timezone";
+import React from "react";
 
 import RefreshIcon from "src/icon/refreshIcon";
 import { Timestamp } from "src/timestamp";

pkg/ui/workspaces/cluster-ui/src/activeExecutions/statusIcon.tsx

@@ -8,13 +8,13 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import React from "react";
 import classNames from "classnames/bind";
+import React from "react";
 
 import { CircleFilled } from "src/icon";
 
-import { ExecutionStatus } from "./types";
 import styles from "./executionStatusIcon.module.scss";
+import { ExecutionStatus } from "./types";
 
 const cx = classNames.bind(styles);
 

pkg/ui/workspaces/cluster-ui/src/anchor/anchor.tsx

@@ -8,8 +8,8 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import React from "react";
 import classnames from "classnames/bind";
+import React from "react";
 
 import styles from "./anchor.module.scss";
 

pkg/ui/workspaces/cluster-ui/src/api/contentionApi.ts

@@ -33,12 +33,12 @@ import {
   sqlResultsAreEmpty,
 } from "./sqlApi";
 import { TxnInsightDetailsRequest } from "./txnInsightDetailsApi";
-import { makeInsightsSqlRequest } from "./txnInsightsUtils";
 import {
   FingerprintStmtsResponseColumns,
   TxnStmtFingerprintsResponseColumns,
   TxnWithStmtFingerprints,
 } from "./txnInsightsApi";
+import { makeInsightsSqlRequest } from "./txnInsightsUtils";
 
 export type ContentionFilters = {
   waitingTxnID?: string;

pkg/ui/workspaces/cluster-ui/src/api/databaseDetailsApi.ts

@@ -8,12 +8,13 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import moment from "moment-timezone";
 import { cockroach } from "@cockroachlabs/crdb-protobuf-client";
+import moment from "moment-timezone";
 
 import { IndexUsageStatistic, recommendDropUnusedIndex } from "../insights";
 import { getLogger, indexUnusedDuration, maybeError } from "../util";
 
+import { Format, Identifier, QualifiedIdentifier } from "./safesql";
 import {
   combineQueryErrors,
   createSqlExecutionRequest,
@@ -30,7 +31,6 @@ import {
   SqlTxnResult,
   txnResultIsEmpty,
 } from "./sqlApi";
-import { Format, Identifier, QualifiedIdentifier } from "./safesql";
 import { fromHexString, withTimeout } from "./util";
 
 const { ZoneConfig } = cockroach.config.zonepb;

pkg/ui/workspaces/cluster-ui/src/api/indexDetailsApi.ts

@@ -23,9 +23,9 @@ import {
   StatementRawFormat,
 } from "src/api";
 
-import { TimeScale, toRoundedDateRange } from "../timeScaleDropdown";
-import { AggregateStatistics } from "../statementsTable";
 import { INTERNAL_APP_NAME_PREFIX } from "../activeExecutions/activeStatementUtils";
+import { AggregateStatistics } from "../statementsTable";
+import { TimeScale, toRoundedDateRange } from "../timeScaleDropdown";
 
 export type TableIndexStatsRequest =
   cockroach.server.serverpb.TableIndexStatsRequest;

pkg/ui/workspaces/cluster-ui/src/api/schemaInsightsApi.ts

@@ -15,6 +15,7 @@ import {
 } from "../insights";
 import { HexStringToInt64String, indexUnusedDuration } from "../util";
 
+import { QuoteIdentifier } from "./safesql";
 import {
   SqlExecutionRequest,
   SqlTxnResult,
@@ -25,7 +26,6 @@ import {
   SqlApiResponse,
   formatApiResult,
 } from "./sqlApi";
-import { QuoteIdentifier } from "./safesql";
 
 // Export for db-console import from clusterUiApi.
 export type { InsightRecommendation } from "../insights";

pkg/ui/workspaces/cluster-ui/src/api/statementDiagnosticsApi.ts

@@ -10,7 +10,6 @@
 
 import moment from "moment-timezone";
 
-import { Duration } from "src/util/format";
 import {
   createSqlExecutionRequest,
   executeInternalSql,
@@ -19,6 +18,7 @@ import {
   SqlTxnResult,
   txnResultSetIsEmpty,
 } from "src/api";
+import { Duration } from "src/util/format";
 
 export type StatementDiagnosticsReport = {
   id: string;

pkg/ui/workspaces/cluster-ui/src/api/stmtInsightsApi.ts

@@ -18,8 +18,8 @@ import {
 } from "src/insights/types";
 import { INTERNAL_APP_NAME_PREFIX } from "src/util/constants";
 
-import { FixFingerprintHexValue } from "../util";
 import { getInsightsFromProblemsAndCauses } from "../insights/utils";
+import { FixFingerprintHexValue } from "../util";
 
 import { getContentionDetailsApi } from "./contentionApi";
 import {

pkg/ui/workspaces/cluster-ui/src/api/tableDetailsApi.ts

@@ -8,14 +8,13 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import moment from "moment-timezone";
 import { cockroach } from "@cockroachlabs/crdb-protobuf-client";
+import moment from "moment-timezone";
 
 import { IndexUsageStatistic, recommendDropUnusedIndex } from "../insights";
 import { getLogger, indexUnusedDuration, maybeError } from "../util";
 
 import { Format, Identifier, Join, SQL } from "./safesql";
-import { fromHexString, withTimeout } from "./util";
 import {
   combineQueryErrors,
   executeInternalSql,
@@ -30,6 +29,7 @@ import {
   SqlTxnResult,
   txnResultIsEmpty,
 } from "./sqlApi";
+import { fromHexString, withTimeout } from "./util";
 
 const { ZoneConfig } = cockroach.config.zonepb;
 const { ZoneConfigurationLevel } = cockroach.server.serverpb;

pkg/ui/workspaces/cluster-ui/src/api/txnInsightDetailsApi.ts

@@ -17,6 +17,7 @@ import {
 } from "../insights";
 import { maybeError } from "../util";
 
+import { getTxnInsightsContentionDetailsApi } from "./contentionApi";
 import {
   executeInternalSql,
   isMaxSizeError,
@@ -34,7 +35,6 @@ import {
   TxnInsightsResponseRow,
 } from "./txnInsightsApi";
 import { makeInsightsSqlRequest } from "./txnInsightsUtils";
-import { getTxnInsightsContentionDetailsApi } from "./contentionApi";
 
 export type TxnInsightDetailsRequest = {
   txnExecutionID: string;