diff --git a/package-lock.json b/package-lock.json index fdf97442..80663032 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "pretty-bytes": "^5.6.0", "roku-debug": "^0.21.6", "roku-deploy": "^3.12.0", - "roku-test-automation": "2.0.0-beta.22", + "roku-test-automation": "^2.0.4", "semver": "^7.1.3", "source-map": "^0.7.3", "thenby": "^1.3.4", @@ -8973,9 +8973,9 @@ } }, "node_modules/roku-test-automation": { - "version": "2.0.0-beta.22", - "resolved": "https://registry.npmjs.org/roku-test-automation/-/roku-test-automation-2.0.0-beta.22.tgz", - "integrity": "sha512-dyUHqlfjdimta06MmdQXQyEuKyVdXjKTzZ4rczZ57CsAaWlsqTdmA1JD+bYsyq9NdNzNrQWz1cuR93Oo632MNA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/roku-test-automation/-/roku-test-automation-2.0.4.tgz", + "integrity": "sha512-WhyBDQp10Y5ETr9up90HRmBsjWRfr6scbHMhHEGE1WfA3WkcZglc/6FZ9L3MWMr+jDOc693u4wvue3cWNhPyYw==", "dependencies": { "@suitest/types": "^4.6.0", "ajv": "^6.12.6", @@ -17917,9 +17917,9 @@ } }, "roku-test-automation": { - "version": "2.0.0-beta.22", - "resolved": "https://registry.npmjs.org/roku-test-automation/-/roku-test-automation-2.0.0-beta.22.tgz", - "integrity": "sha512-dyUHqlfjdimta06MmdQXQyEuKyVdXjKTzZ4rczZ57CsAaWlsqTdmA1JD+bYsyq9NdNzNrQWz1cuR93Oo632MNA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/roku-test-automation/-/roku-test-automation-2.0.4.tgz", + "integrity": "sha512-WhyBDQp10Y5ETr9up90HRmBsjWRfr6scbHMhHEGE1WfA3WkcZglc/6FZ9L3MWMr+jDOc693u4wvue3cWNhPyYw==", "requires": { "@suitest/types": "^4.6.0", "ajv": "^6.12.6", diff --git a/package.json b/package.json index d0e322be..7eeb5faa 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "pretty-bytes": "^5.6.0", "roku-debug": "^0.21.6", "roku-deploy": "^3.12.0", - "roku-test-automation": "2.0.0-beta.22", + "roku-test-automation": "^2.0.4", "semver": "^7.1.3", "source-map": "^0.7.3", "thenby": "^1.3.4", diff --git a/src/managers/RtaManager.ts b/src/managers/RtaManager.ts index 5af9a3e3..66ccd8dc 100644 --- a/src/managers/RtaManager.ts +++ b/src/managers/RtaManager.ts @@ -59,7 +59,7 @@ export class RtaManager { this.updateDeviceAvailabilityOnWebViewProviders(); - if (config.disableScreenSaver) { + if (config.disableScreenSaver !== false) { void this.onDeviceComponent?.disableScreenSaver({ disableScreensaver: true }); } } diff --git a/src/viewProviders/BaseRdbViewProvider.ts b/src/viewProviders/BaseRdbViewProvider.ts index 83a70c5b..61505697 100644 --- a/src/viewProviders/BaseRdbViewProvider.ts +++ b/src/viewProviders/BaseRdbViewProvider.ts @@ -50,6 +50,15 @@ export abstract class BaseRdbViewProvider extends BaseWebviewViewProvider { }); return Promise.resolve(true); }); + + this.addMessageCommandCallback(ViewProviderCommand.getStoredNodeReferences, (message) => { + const response = this.dependencies.rtaManager.getStoredNodeReferences(); + this.postOrQueueMessage({ + ...message, + response: response + }); + return Promise.resolve(true); + }); } protected onViewReady() { diff --git a/src/viewProviders/SceneGraphInspectorViewProvider.ts b/src/viewProviders/SceneGraphInspectorViewProvider.ts index 73485d8c..0df62646 100644 --- a/src/viewProviders/SceneGraphInspectorViewProvider.ts +++ b/src/viewProviders/SceneGraphInspectorViewProvider.ts @@ -1,7 +1,6 @@ import type * as vscode from 'vscode'; import { BaseRdbViewProvider } from './BaseRdbViewProvider'; import { ViewProviderId } from './ViewProviderId'; -import { ViewProviderCommand } from './ViewProviderCommand'; export class SceneGraphInspectorViewProvider extends BaseRdbViewProvider { public readonly id = ViewProviderId.sceneGraphInspectorView; @@ -10,14 +9,5 @@ export class SceneGraphInspectorViewProvider extends BaseRdbViewProvider { super(context, dependencies); this.registerCommandWithWebViewNotifier(context, 'extension.brightscript.sceneGraphInspectorView.refreshNodeTree'); - - this.addMessageCommandCallback(ViewProviderCommand.getStoredNodeReferences, (message) => { - const response = this.dependencies.rtaManager.getStoredNodeReferences(); - this.postOrQueueMessage({ - ...message, - response: response - }); - return Promise.resolve(true); - }); } } diff --git a/webviews/src/ExtensionIntermediary.ts b/webviews/src/ExtensionIntermediary.ts index f1b396f6..3a30124c 100644 --- a/webviews/src/ExtensionIntermediary.ts +++ b/webviews/src/ExtensionIntermediary.ts @@ -1,9 +1,9 @@ /** Acts as a middle man that takes request from our views and sends them through vscode message protocol and waits for replies to simplify usage in code */ import type * as rta from 'roku-test-automation'; +import { RequestType } from 'roku-test-automation/client/dist/types/OnDeviceComponent'; import type { VscodeCommand } from '../../src/commands/VscodeCommand'; import type { ViewProviderEvent } from '../../src/viewProviders/ViewProviderEvent'; import { ViewProviderCommand } from '../../src/viewProviders/ViewProviderCommand'; -import { RequestType } from 'roku-test-automation/client/dist/types/OnDeviceComponent'; import type { DeleteEntireRegistrySectionsArgs, DeleteNodeReferencesArgs, DeleteRegistrySectionsArgs, FindNodesAtLocationArgs, GetFocusedNodeArgs, GetNodesInfoArgs, GetNodesWithPropertiesArgs, GetValueArgs, GetValuesArgs, HasFocusArgs, IsInFocusChainArgs, OnFieldChangeOnceArgs, ReadRegistryArgs, RequestOptions, SetValueArgs, StoreNodeReferencesArgs, WriteRegistryArgs, GetVolumeListArgs, GetDirectoryListingArgs, StatPathArgs, RenameFileArgs, DeleteFileArgs, CreateDirectoryArgs, RemoveNodeChildrenArgs } from 'roku-test-automation'; class ExtensionIntermediary { diff --git a/webviews/src/shared/Loader.svelte b/webviews/src/shared/Loader.svelte index e298d91f..2ded1808 100644 --- a/webviews/src/shared/Loader.svelte +++ b/webviews/src/shared/Loader.svelte @@ -1,28 +1,18 @@ -