@codingame/monaco-vscode-update-service-override 30.0.0 → 31.0.0

package/vscode/src/vs/workbench/contrib/update/browser/updateTitleBarEntry.js

@@ -3,31 +3,35 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { append, $, scheduleAtNextAnimationFrame, getWindow, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { BaseActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { Disposable, MutableDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { StateType, DisablementReason } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update';
 import { IUpdateService } from '@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
-import { isMajorMinorVersionChange, computeProgressPercent } from '../common/updateUtils.js';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { computeProgressPercent } from '../common/updateUtils.js';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import * as updateTitleBarEntry from './media/updateTitleBarEntry.css';
 import { UpdateTooltip } from './updateTooltip.js';
+import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
 
 registerCss(updateTitleBarEntry);
 const UPDATE_TITLE_BAR_ACTION_ID = "workbench.actions.updateIndicator";
 const UPDATE_TITLE_BAR_CONTEXT = ( new RawContextKey("updateTitleBar", false));
+const DISABLED_REMINDER_LAST_SHOWN_KEY = "update/disabledReminderLastShown";
+const DISABLED_REMINDER_PERIOD = 30 * 24 * 60 * 60 * 1000;
 const ACTIONABLE_STATES = [StateType.AvailableForDownload, StateType.Downloaded, StateType.Ready];
 const DETAILED_STATES = [
     ...ACTIONABLE_STATES,
@@ -36,12 +40,11 @@ const DETAILED_STATES = [
     StateType.Updating,
     StateType.Overwriting
 ];
-const LAST_KNOWN_VERSION_KEY = "updateTitleBarEntry/lastKnownVersion";
 registerAction2(class UpdateIndicatorTitleBarAction extends Action2 {
     constructor() {
         super({
             id: UPDATE_TITLE_BAR_ACTION_ID,
-            title: ( localize(14876, "Update")),
+            title: ( localize(15008, "Update")),
             f1: false,
             menu: [{
                 id: MenuId.TitleBarAdjacentCenter,
@@ -55,32 +58,24 @@ registerAction2(class UpdateIndicatorTitleBarAction extends Action2 {
 let UpdateTitleBarContribution = class UpdateTitleBarContribution extends Disposable {
     constructor(
         actionViewItemService,
-        configurationService,
+        chatService,
         contextKeyService,
         hostService,
         instantiationService,
-        productService,
         storageService,
         updateService
     ) {
         super();
+        this.chatService = chatService;
         this.hostService = hostService;
-        this.productService = productService;
         this.storageService = storageService;
-        this.mode = "none";
         this.tooltipVisible = false;
+        this.pendingShow = this._register(( new MutableDisposable()));
         if (isWeb) {
             return;
         }
         this.context = UPDATE_TITLE_BAR_CONTEXT.bindTo(contextKeyService);
-        this.tooltip = this._register(instantiationService.createInstance(UpdateTooltip, true));
-        this.mode = configurationService.getValue("update.titleBar");
-        this._register(configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration("update.titleBar")) {
-                this.mode = configurationService.getValue("update.titleBar");
-                this.onStateChange();
-            }
-        }));
+        this.tooltip = this._register(instantiationService.createInstance(UpdateTooltip));
         this.state = updateService.state;
         this._register(updateService.onStateChange(state => {
             this.state = state;
@@ -92,7 +87,9 @@ let UpdateTitleBarContribution = class UpdateTitleBarContribution extends Dispos
             (action, options) => {
                 this.entry = instantiationService.createInstance(UpdateTitleBarEntry, action, options, this.tooltip, () => {
                     this.tooltipVisible = false;
-                    this.updateContext();
+                    if (!ACTIONABLE_STATES.includes(this.state.type) && !DETAILED_STATES.includes(this.state.type)) {
+                        this.context.set(false);
+                    }
                 });
                 if (this.tooltipVisible) {
                     this.entry.showTooltip();
@@ -102,80 +99,74 @@ let UpdateTitleBarContribution = class UpdateTitleBarContribution extends Dispos
         ));
         void this.onStateChange(true);
     }
-    updateContext() {
-        switch (this.mode) {
-        case "always":
-            this.context.set(true);
-            break;
-        case "detailed":
-            this.context.set(DETAILED_STATES.includes(this.state.type));
-            break;
-        case "actionable":
-            this.context.set(ACTIONABLE_STATES.includes(this.state.type));
-            break;
-        default:
-            this.context.set(false);
-            break;
-        }
-    }
     async onStateChange(startup = false) {
-        this.updateContext();
-        if (this.mode === "none") {
-            return;
+        this.pendingShow.clear();
+        if (ACTIONABLE_STATES.includes(this.state.type)) {
+            await this.setContextWhenChatIdle(true);
+        } else {
+            this.context.set(false);
         }
         if (this.tooltipVisible || !(await this.hostService.hadLastFocus())) {
             this.tooltip.renderState(this.state);
             return;
         }
-        let showTooltip = startup && this.detectVersionChange();
-        if (showTooltip) {
-            this.tooltip.renderPostInstall();
-        } else {
-            this.tooltip.renderState(this.state);
-            switch (this.state.type) {
-            case StateType.Disabled:
-                if (startup) {
-                    const reason = this.state.reason;
-                    showTooltip = reason === DisablementReason.InvalidConfiguration || reason === DisablementReason.RunningAsAdmin;
+        this.tooltip.renderState(this.state);
+        let showTooltip = false;
+        switch (this.state.type) {
+        case StateType.Disabled:
+            if (startup) {
+                const reason = this.state.reason;
+                if (reason === DisablementReason.InvalidConfiguration || reason === DisablementReason.RunningAsAdmin) {
+                    const lastShown = this.storageService.getNumber(DISABLED_REMINDER_LAST_SHOWN_KEY, StorageScope.APPLICATION);
+                    showTooltip = lastShown === undefined || (Date.now() - lastShown) >= DISABLED_REMINDER_PERIOD;
                 }
-                break;
-            case StateType.Idle:
-                showTooltip = !!this.state.error || !!this.state.notAvailable;
-                break;
             }
+            break;
+        case StateType.Idle:
+            showTooltip = !!this.state.error;
+            break;
+        case StateType.Downloading:
+        case StateType.Updating:
+        case StateType.Overwriting:
+            this.context.set(this.state.explicit);
+            break;
+        case StateType.Restarting:
+            this.context.set(true);
+            break;
         }
         if (showTooltip) {
             this.tooltipVisible = true;
             this.context.set(true);
             this.entry?.showTooltip();
+            if (this.state.type === StateType.Disabled) {
+                this.storageService.store(
+                    DISABLED_REMINDER_LAST_SHOWN_KEY,
+                    Date.now(),
+                    StorageScope.APPLICATION,
+                    StorageTarget.MACHINE
+                );
+            }
         }
     }
-    detectVersionChange() {
-        let from;
+    async setContextWhenChatIdle(value) {
+        if (!this.chatService.requestInProgressObs.get()) {
+            this.context.set(value);
+            return;
+        }
+        const cts = ( new CancellationTokenSource());
+        this.pendingShow.value = toDisposable(() => cts.dispose(true));
         try {
-            from = this.storageService.getObject(LAST_KNOWN_VERSION_KEY, StorageScope.APPLICATION);
+            await waitForState(
+                this.chatService.requestInProgressObs,
+                inProgress => !inProgress,
+                undefined,
+                cts.token
+            );
+            this.context.set(value);
         } catch {}
-        const to = {
-            version: this.productService.version,
-            commit: this.productService.commit,
-            timestamp: Date.now()
-        };
-        if (from?.commit === to.commit) {
-            return false;
-        }
-        this.storageService.store(
-            LAST_KNOWN_VERSION_KEY,
-            JSON.stringify(to),
-            StorageScope.APPLICATION,
-            StorageTarget.MACHINE
-        );
-        if (from) {
-            return isMajorMinorVersionChange(from.version, to.version);
-        }
-        return false;
     }
 };
-UpdateTitleBarContribution = ( __decorate([( __param(0, IActionViewItemService)), ( __param(1, IConfigurationService)), ( __param(2, IContextKeyService)), ( __param(3, IHostService)), ( __param(4, IInstantiationService)), ( __param(5, IProductService)), ( __param(6, IStorageService)), ( __param(7, IUpdateService))], UpdateTitleBarContribution));
+UpdateTitleBarContribution = ( __decorate([( __param(0, IActionViewItemService)), ( __param(1, IChatService)), ( __param(2, IContextKeyService)), ( __param(3, IHostService)), ( __param(4, IInstantiationService)), ( __param(5, IStorageService)), ( __param(6, IUpdateService))], UpdateTitleBarContribution));
 let UpdateTitleBarEntry = class UpdateTitleBarEntry extends BaseActionViewItem {
     constructor(
         action,
@@ -209,16 +200,16 @@ let UpdateTitleBarEntry = class UpdateTitleBarEntry extends BaseActionViewItem {
         }
     }
     showTooltip(focus = false) {
-        if (!this.content?.isConnected) {
+        if (!this.element?.isConnected) {
             this.showTooltipOnRender = true;
             return;
         }
         this.hoverService.showInstantHover({
             content: this.tooltip.domNode,
             target: {
-                targetElements: [this.content],
+                targetElements: [this.element],
                 dispose: () => {
-                    if (!!this.content?.isConnected) {
+                    if (!!this.element?.isConnected) {
                         this.onUserDismissedTooltip();
                     }
                 }
@@ -265,32 +256,46 @@ let UpdateTitleBarEntry = class UpdateTitleBarEntry extends BaseActionViewItem {
         this.content.classList.remove("prominent", "progress-indefinite", "progress-percent", "update-disabled");
         this.content.style.removeProperty("--update-progress");
         const label = append(this.content, $(".indicator-label"));
-        label.textContent = ( localize(14877, "Update"));
         switch (state.type) {
         case StateType.Disabled:
+            label.textContent = ( localize(15009, "Update"));
             this.content.classList.add("update-disabled");
             break;
         case StateType.CheckingForUpdates:
+            label.textContent = ( localize(15010, "Checking..."));
+            this.renderProgressState(this.content);
+            break;
         case StateType.Overwriting:
+            label.textContent = ( localize(15011, "Updating..."));
             this.renderProgressState(this.content);
             break;
         case StateType.AvailableForDownload:
         case StateType.Downloaded:
         case StateType.Ready:
+            label.textContent = ( localize(15009, "Update"));
             this.content.classList.add("prominent");
             break;
         case StateType.Downloading:
+            label.textContent = ( localize(15012, "Downloading..."));
             this.renderProgressState(
                 this.content,
                 computeProgressPercent(state.downloadedBytes, state.totalBytes)
             );
             break;
         case StateType.Updating:
+            label.textContent = ( localize(15013, "Installing..."));
             this.renderProgressState(
                 this.content,
                 computeProgressPercent(state.currentProgress, state.maxProgress)
             );
             break;
+        case StateType.Restarting:
+            label.textContent = ( localize(15014, "Restarting..."));
+            this.renderProgressState(this.content);
+            break;
+        default:
+            label.textContent = ( localize(15009, "Update"));
+            break;
         }
     }
     renderProgressState(content, percentage) {

package/vscode/src/vs/workbench/contrib/update/browser/updateTooltip.d.ts

@@ -3,26 +3,19 @@ import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
-import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 import { IMeteredConnectionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service";
-import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
 import { State } from "@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update";
 /**
  * A stateful tooltip control for the update status.
  */
 export declare class UpdateTooltip extends Disposable {
-    private readonly hostedByTitleBar;
     private readonly clipboardService;
     private readonly commandService;
     private readonly configurationService;
     private readonly hoverService;
-    private readonly markdownRendererService;
     private readonly meteredConnectionService;
-    private readonly openerService;
     private readonly productService;
-    private readonly requestService;
     readonly domNode: HTMLElement;
     private readonly titleNode;
     private readonly productInfoNode;
@@ -32,7 +25,6 @@ export declare class UpdateTooltip extends Disposable {
     private readonly latestVersionNode;
     private readonly latestVersionCopyValue;
     private readonly releaseDateNode;
-    private readonly releaseNotesLink;
     private readonly progressContainer;
     private readonly progressFill;
     private readonly progressPercentNode;
@@ -40,11 +32,12 @@ export declare class UpdateTooltip extends Disposable {
     private readonly downloadStatsContainer;
     private readonly timeRemainingNode;
     private readonly speedInfoNode;
-    private readonly markdownContainer;
-    private readonly markdown;
     private readonly messageNode;
+    private readonly buttonBar;
+    private readonly releaseNotesButton;
+    private readonly actionButton;
     private releaseNotesVersion;
-    constructor(hostedByTitleBar: boolean, clipboardService: IClipboardService, commandService: ICommandService, configurationService: IConfigurationService, hoverService: IHoverService, markdownRendererService: IMarkdownRendererService, meteredConnectionService: IMeteredConnectionService, openerService: IOpenerService, productService: IProductService, requestService: IRequestService);
+    constructor(clipboardService: IClipboardService, commandService: ICommandService, configurationService: IConfigurationService, hoverService: IHoverService, meteredConnectionService: IMeteredConnectionService, productService: IProductService);
     private updateCurrentVersion;
     private hideAll;
     renderState(state: State): void;
@@ -58,8 +51,9 @@ export declare class UpdateTooltip extends Disposable {
     private renderUpdating;
     private renderReady;
     private renderOverwriting;
-    renderPostInstall(): Promise<void>;
+    private renderRestarting;
     private renderTitleAndInfo;
+    private renderActionButton;
     private renderMessage;
     private createVersionRow;
     private runCommandAndClose;