diff --git a/pkg/ui/package.json b/pkg/ui/package.json index 715e4d018a43..7d04b5df4872 100644 --- a/pkg/ui/package.json +++ b/pkg/ui/package.json @@ -381,6 +381,19 @@ "tmp": "0.0.33", "uglify-js": "^2.8.29" } + }, + "// @protobufjs/inquire hacks": [ + "@protobufjs/inquire (used by protobufjs@6) uses eval() to require", + "packages while hiding them from bundlers. Since inquire is a separate", + "package from protobufjs and doesn't declare all of protobufjs'", + "direct dependencies, any call to inquire() for packages not provided", + "by the node stdlib is a 'phantom' dependency. Currently only 'long'", + "fits into this category." + ], + "@protobufjs/inquire@1.x": { + "dependencies": { + "long": "4.0.0" + } } }, "overrides": { diff --git a/pkg/ui/pnpm-lock.yaml b/pkg/ui/pnpm-lock.yaml index b177a624fdc1..06603decda85 100644 --- a/pkg/ui/pnpm-lock.yaml +++ b/pkg/ui/pnpm-lock.yaml @@ -39,7 +39,7 @@ overrides: '@cockroachlabs/cluster-ui>antd': 3.26.20 analytics-node>axios-retry: 3.1.9 -packageExtensionsChecksum: c8401d95bcfa63cade05749ae746f3fe +packageExtensionsChecksum: 8b8b370d73a39eaff506edcfedb27e22 patchedDependencies: topojson@3.0.2: @@ -6178,6 +6178,8 @@ packages: /@protobufjs/inquire@1.1.0: resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==} + dependencies: + long: 4.0.0 /@protobufjs/path@1.1.2: resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==} diff --git a/pkg/ui/workspaces/cluster-ui/src/store/statementDetails/statementDetails.sagas.spec.ts b/pkg/ui/workspaces/cluster-ui/src/store/statementDetails/statementDetails.sagas.spec.ts index 7daffae9bfdb..ec18b3b9b6d1 100644 --- a/pkg/ui/workspaces/cluster-ui/src/store/statementDetails/statementDetails.sagas.spec.ts +++ b/pkg/ui/workspaces/cluster-ui/src/store/statementDetails/statementDetails.sagas.spec.ts @@ -53,9 +53,10 @@ describe("SQLDetailsStats sagas", () => { }), type: "request", }; - // Don't include /start and /end, since they're not included in the above payload. + // /start and /end aren't included in the above payload, but the default value + // when missing (0 for both) appears anyway. const key = - "SELECT * FROM crdb_internal.node_build_info/$ cockroach sql,newname"; + "SELECT * FROM crdb_internal.node_build_info/$ cockroach sql,newname/0/0"; const SQLDetailsStatsResponse = new cockroach.server.serverpb.StatementDetailsResponse({ statement: { @@ -674,7 +675,7 @@ describe("SQLDetailsStats sagas", () => { .withReducer(reducer) .hasFinalState({ cachedData: { - "SELECT * FROM crdb_internal.node_build_info/$ cockroach sql,newname": + "SELECT * FROM crdb_internal.node_build_info/$ cockroach sql,newname/0/0": { data: SQLDetailsStatsResponse, lastError: null, @@ -700,7 +701,7 @@ describe("SQLDetailsStats sagas", () => { .withReducer(reducer) .hasFinalState({ cachedData: { - "SELECT * FROM crdb_internal.node_build_info/$ cockroach sql,newname": + "SELECT * FROM crdb_internal.node_build_info/$ cockroach sql,newname/0/0": { data: null, lastError: error,