From c8991b28b40e44da158d2ff1f207f4b59fb87400 Mon Sep 17 00:00:00 2001 From: Brian Leighty Date: Mon, 11 Sep 2023 14:19:44 -0400 Subject: [PATCH] Improvements discovered while reviewing with Bronley --- src/viewProviders/BaseWebviewViewProvider.ts | 3 ++- src/viewProviders/RokuCommandsViewProvider.spec.ts | 5 +++-- .../src/views/RokuAutomationView/RokuAutomationView.svelte | 5 ++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/viewProviders/BaseWebviewViewProvider.ts b/src/viewProviders/BaseWebviewViewProvider.ts index 2af88ef3..9e6955b3 100644 --- a/src/viewProviders/BaseWebviewViewProvider.ts +++ b/src/viewProviders/BaseWebviewViewProvider.ts @@ -1,6 +1,7 @@ import * as vscode from 'vscode'; import * as path from 'path'; import * as fsExtra from 'fs-extra'; +import type { RequestType } from 'roku-test-automation'; import type { AsyncSubscription, Event } from '@parcel/watcher'; import type { ChannelPublishedEvent } from 'roku-debug'; import { vscodeContextManager } from '../managers/VscodeContextManager'; @@ -86,7 +87,7 @@ export abstract class BaseWebviewViewProvider implements vscode.WebviewViewProvi } } - protected addMessageCommandCallback(command: string, callback: (message) => Promise) { + protected addMessageCommandCallback(command: ViewProviderCommand | VscodeCommand | RequestType, callback: (message) => Promise) { this.messageCommandCallbacks[command] = callback; } diff --git a/src/viewProviders/RokuCommandsViewProvider.spec.ts b/src/viewProviders/RokuCommandsViewProvider.spec.ts index 57667a06..aeecb48e 100644 --- a/src/viewProviders/RokuCommandsViewProvider.spec.ts +++ b/src/viewProviders/RokuCommandsViewProvider.spec.ts @@ -2,6 +2,7 @@ import { expect } from 'chai'; import * as sinonImport from 'sinon'; import { vscode } from '../mockVscode.spec'; import { RokuCommandsViewProvider } from './RokuCommandsViewProvider'; +import { VscodeCommand } from '../commands/VscodeCommand'; let Module = require('module'); const { require: oldRequire } = Module.prototype; @@ -52,9 +53,9 @@ describe('RokuCommandsViewProvider', () => { expect(typeof callback).to.equal('function'); const fake = sinonImport.fake.returns(Promise.resolve(true)); - provider['addMessageCommandCallback']('importRegistry', fake); + provider['addMessageCommandCallback'](VscodeCommand.rokuRegistryImportRegistry, fake); callback({ - command: 'importRegistry', + command: VscodeCommand.rokuRegistryImportRegistry, context: {} }); expect(fake.calledOnce).to.be.true; diff --git a/webviews/src/views/RokuAutomationView/RokuAutomationView.svelte b/webviews/src/views/RokuAutomationView/RokuAutomationView.svelte index d6e1d7bb..0b3a5c2e 100644 --- a/webviews/src/views/RokuAutomationView/RokuAutomationView.svelte +++ b/webviews/src/views/RokuAutomationView/RokuAutomationView.svelte @@ -84,7 +84,7 @@ function addStep() { steps.push({ type: 'sendKeyPress', - value: '' + value: 'Ok' }); storeConfigs(steps); @@ -143,7 +143,7 @@ } else { steps = [{ type: 'sleep', - value: '4' + value: '8' }]; } loading = false; @@ -152,7 +152,6 @@ let lastStepDate = Date.now(); intermediary.observeEvent(ViewProviderEvent.onRokuAutomationConfigStepChange, (message) => { currentRunningStep = message.context.step; - console.log('currentRunningStep', currentRunningStep); if (currentRunningStep === -1) { // Once we finish running all current steps, update our last step date in case we want to add any more steps lastStepDate = Date.now();