diff --git a/extensions/survey/renderer.tsx b/extensions/survey/renderer.tsx index e8b2e4758c..c740015634 100644 --- a/extensions/survey/renderer.tsx +++ b/extensions/survey/renderer.tsx @@ -15,7 +15,10 @@ export default class SurveyRendererExtension extends LensRendererExtension { } ]; async onActivate() { - await surveyPreferencesStore.loadExtension(this); - survey.start(); + // Activate extension only on main renderer + if (window.location.hostname === "localhost") { + await surveyPreferencesStore.loadExtension(this); + survey.start(); + } } } diff --git a/package.json b/package.json index f663accadc..1e5c73a9b5 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "kontena-lens", "productName": "Lens", "description": "Lens - The Kubernetes IDE", - "version": "4.1.0-rc.1", + "version": "4.1.0-rc.2", "main": "static/build/main.js", "copyright": "© 2020, Mirantis, Inc.", "license": "MIT", @@ -222,7 +222,7 @@ "react": "^17.0.1", "react-dom": "^17.0.1", "react-router": "^5.2.0", - "readable-web-to-node-stream": "^3.0.1", + "readable-stream": "^3.6.0", "request": "^2.88.2", "request-promise-native": "^1.0.8", "semver": "^7.3.2", @@ -277,6 +277,7 @@ "@types/react-router-dom": "^5.1.6", "@types/react-select": "^3.0.13", "@types/react-window": "^1.8.2", + "@types/readable-stream": "^2.3.9", "@types/request": "^2.48.5", "@types/request-promise-native": "^1.0.17", "@types/semver": "^7.2.0", diff --git a/src/main/cluster.ts b/src/main/cluster.ts index 5cf5a58bd9..13c74a285e 100644 --- a/src/main/cluster.ts +++ b/src/main/cluster.ts @@ -400,7 +400,6 @@ export class Cluster implements ClusterModel, ClusterState { this.ready = false; this.activated = false; this.allowedNamespaces = []; - this.accessibleNamespaces = []; this.resourceAccessStatuses.clear(); this.pushState(); } diff --git a/src/renderer/api/kube-api.ts b/src/renderer/api/kube-api.ts index 97cfb0522b..a880cc2406 100644 --- a/src/renderer/api/kube-api.ts +++ b/src/renderer/api/kube-api.ts @@ -10,8 +10,8 @@ import { createKubeApiURL, parseKubeApi } from "./kube-api-parse"; import { KubeJsonApi, KubeJsonApiData, KubeJsonApiDataList } from "./kube-json-api"; import { IKubeObjectConstructor, KubeObject, KubeStatus } from "./kube-object"; import byline from "byline"; -import { ReadableWebToNodeStream } from "readable-web-to-node-stream"; import { IKubeWatchEvent } from "./kube-watch-api"; +import { ReadableWebToNodeStream } from "../utils/readableStream"; export interface IKubeApiOptions { /** @@ -373,7 +373,13 @@ export class KubeApi { opts.abortController = new AbortController(); } let errorReceived = false; + let timedRetry: NodeJS.Timeout; const { abortController, namespace, callback } = opts; + + abortController.signal.addEventListener("abort", () => { + clearTimeout(timedRetry); + }); + const watchUrl = this.getWatchUrl(namespace); const responsePromise = this.request.getResponse(watchUrl, null, { signal: abortController.signal @@ -387,14 +393,17 @@ export class KubeApi { } const nodeStream = new ReadableWebToNodeStream(response.body); - nodeStream.on("end", () => { - if (errorReceived) return; // kubernetes errors should be handled in a callback + ["end", "close", "error"].forEach((eventName) => { + nodeStream.on(eventName, () => { + if (errorReceived) return; // kubernetes errors should be handled in a callback - setTimeout(() => { // we did not get any kubernetes errors so let's retry - if (abortController.signal.aborted) return; + clearTimeout(timedRetry); + timedRetry = setTimeout(() => { // we did not get any kubernetes errors so let's retry + if (abortController.signal.aborted) return; - this.watch({...opts, namespace, callback}); - }, 1000); + this.watch({...opts, namespace, callback}); + }, 1000); + }); }); const stream = byline(nodeStream); diff --git a/src/renderer/components/+events/events.tsx b/src/renderer/components/+events/events.tsx index 877c6d928b..4b7b64dd15 100644 --- a/src/renderer/components/+events/events.tsx +++ b/src/renderer/components/+events/events.tsx @@ -8,7 +8,7 @@ import { TabLayout } from "../layout/tab-layout"; import { EventStore, eventStore } from "./event.store"; import { getDetailsUrl, KubeObjectListLayout, KubeObjectListLayoutProps } from "../kube-object"; import { KubeEvent } from "../../api/endpoints/events.api"; -import { TableSortCallbacks, TableSortParams } from "../table"; +import { TableSortCallbacks, TableSortParams, TableProps } from "../table"; import { IHeaderPlaceholders } from "../item-object-list"; import { Tooltip } from "../tooltip"; import { Link } from "react-router-dom"; @@ -41,6 +41,11 @@ const defaultProps: Partial = { export class Events extends React.Component { static defaultProps = defaultProps as object; + @observable sorting: TableSortParams = { + sortBy: columnId.age, + orderBy: "asc", + }; + private sortingCallbacks: TableSortCallbacks = { [columnId.namespace]: (event: KubeEvent) => event.getNs(), [columnId.type]: (event: KubeEvent) => event.type, @@ -49,9 +54,10 @@ export class Events extends React.Component { [columnId.age]: (event: KubeEvent) => event.getTimeDiffFromNow(), }; - @observable sorting: TableSortParams = { - sortBy: columnId.age, - orderBy: "asc", + private tableConfiguration: TableProps = { + sortSyncWithUrl: false, + sortByDefault: this.sorting, + onSort: params => this.sorting = params, }; get store(): EventStore { @@ -106,7 +112,7 @@ export class Events extends React.Component { }; render() { - const { store, visibleItems, sortingCallbacks, sorting } = this; + const { store, visibleItems } = this; const { compact, compactLimit, className, ...layoutProps } = this.props; const events = ( @@ -121,12 +127,8 @@ export class Events extends React.Component { isSelectable={false} items={visibleItems} virtual={!compact} - sortingCallbacks={sortingCallbacks} - tableProps={{ - sortSyncWithUrl: false, - sortByDefault: sorting, - onSort: params => this.sorting = params, - }} + tableProps={this.tableConfiguration} + sortingCallbacks={this.sortingCallbacks} searchFilters={[ (event: KubeEvent) => event.getSearchFields(), (event: KubeEvent) => event.message, @@ -140,7 +142,7 @@ export class Events extends React.Component { { title: "Involved Object", className: "object", sortBy: columnId.object, id: columnId.object }, { title: "Source", className: "source", id: columnId.source }, { title: "Count", className: "count", sortBy: columnId.count, id: columnId.count }, - { title: "Age", className: "age", sortBy: columnId.age, id: columnId.age }, + { title: "Last Seen", className: "age", sortBy: columnId.age, id: columnId.age }, ]} renderTableContents={(event: KubeEvent) => { const { involvedObject, type, message } = event; diff --git a/src/renderer/components/item-object-list/item-list-layout.tsx b/src/renderer/components/item-object-list/item-list-layout.tsx index 6721872cd7..895c275fbb 100644 --- a/src/renderer/components/item-object-list/item-list-layout.tsx +++ b/src/renderer/components/item-object-list/item-list-layout.tsx @@ -282,8 +282,8 @@ export class ItemListLayout extends React.Component { const dialogCustomProps = customizeRemoveDialog ? customizeRemoveDialog(selectedItems) : {}; const selectedCount = selectedItems.length; const tailCount = selectedCount > visibleMaxNamesCount ? selectedCount - visibleMaxNamesCount : 0; - const tail = tailCount > 0 ? "and {tailCount} more" : null; - const message = selectedCount <= 1 ?

Remove item {selectedNames}?

:

Remove {selectedCount} items {selectedNames} {tail}?

; + const tail = tailCount > 0 ? <>, and {tailCount} more : null; + const message = selectedCount <= 1 ?

Remove item {selectedNames}?

:

Remove {selectedCount} items {selectedNames}{tail}?

; ConfirmDialog.open({ ok: removeSelectedItems, diff --git a/src/renderer/kube-object.store.ts b/src/renderer/kube-object.store.ts index 943aae7ad0..023048cb73 100644 --- a/src/renderer/kube-object.store.ts +++ b/src/renderer/kube-object.store.ts @@ -111,7 +111,7 @@ export abstract class KubeObjectStore extends ItemSt const isLoadingAll = this.context.allNamespaces.every(ns => namespaces.includes(ns)); - if (isLoadingAll) { + if (isLoadingAll && this.context.cluster.accessibleNamespaces.length === 0) { this.loadedNamespaces = []; return api.list({}, this.query); diff --git a/src/renderer/utils/readableStream.ts b/src/renderer/utils/readableStream.ts new file mode 100644 index 0000000000..3b51106427 --- /dev/null +++ b/src/renderer/utils/readableStream.ts @@ -0,0 +1,87 @@ +import { Readable } from "readable-stream"; + +/** + * ReadableWebToNodeStream + * + * Copied from https://github.com/Borewit/readable-web-to-node-stream + * + * Adds read error handler + * + * */ +export class ReadableWebToNodeStream extends Readable { + + public bytesRead = 0; + public released = false; + + /** + * Default web API stream reader + * https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader + */ + private reader: ReadableStreamReader; + private pendingRead: Promise; + + /** + * + * @param stream Readable​Stream: https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream + */ + constructor(stream: ReadableStream) { + super(); + this.reader = stream.getReader(); + } + + /** + * Implementation of readable._read(size). + * When readable._read() is called, if data is available from the resource, + * the implementation should begin pushing that data into the read queue + * https://nodejs.org/api/stream.html#stream_readable_read_size_1 + */ + public async _read() { + // Should start pushing data into the queue + // Read data from the underlying Web-API-readable-stream + if (this.released) { + this.push(null); // Signal EOF + + return; + } + + try { + this.pendingRead = this.reader.read(); + const data = await this.pendingRead; + + // clear the promise before pushing pushing new data to the queue and allow sequential calls to _read() + delete this.pendingRead; + + if (data.done || this.released) { + this.push(null); // Signal EOF + } else { + this.bytesRead += data.value.length; + this.push(data.value); // Push new data to the queue + } + } catch(error) { + this.push(null); // Signal EOF + } + } + + /** + * If there is no unresolved read call to Web-API Readable​Stream immediately returns; + * otherwise will wait until the read is resolved. + */ + public async waitForReadToComplete() { + if (this.pendingRead) { + await this.pendingRead; + } + } + + /** + * Close wrapper + */ + public async close(): Promise { + await this.syncAndRelease(); + } + + private async syncAndRelease() { + this.released = true; + await this.waitForReadToComplete(); + await this.reader.releaseLock(); + } +} diff --git a/static/RELEASE_NOTES.md b/static/RELEASE_NOTES.md index 68363fba07..0fe2fa4c4d 100644 --- a/static/RELEASE_NOTES.md +++ b/static/RELEASE_NOTES.md @@ -2,7 +2,7 @@ Here you can find description of changes we've built into each release. While we try our best to make each upgrade automatic and as smooth as possible, there may be some cases where you might need to do something to ensure the application works smoothly. So please read through the release highlights! -## 4.1.0-rc.1 (current version) +## 4.1.0-rc.2 (current version) - Change: list views default to a namespace (instead of listing resources from all namespaces) - Command palette diff --git a/yarn.lock b/yarn.lock index cd3384eba5..16ac2ca4f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11464,14 +11464,6 @@ readable-stream@~1.1.10: isarray "0.0.1" string_decoder "~0.10.x" -readable-web-to-node-stream@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.1.tgz#3f619b1bc5dd73a4cfe5c5f9b4f6faba55dff845" - integrity sha512-4zDC6CvjUyusN7V0QLsXVB7pJCD9+vtrM9bYDRv6uBQ+SKfx36rp5AFNPRgh9auKRul/a1iFZJYXcCbwRL+SaA== - dependencies: - "@types/readable-stream" "^2.3.9" - readable-stream "^3.6.0" - readdir-scoped-modules@^1.0.0, readdir-scoped-modules@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"