feat(plugin): Use product applicationName to return the value to plug…

…ins env.appName. Thus branding is applied everywhere. Change-Id: Ifdda9b5cd64ea34de8292bd16703b87d81700c39 Signed-off-by: Florent Benoit <fbenoit@redhat.com>
eclipse-theia · Apr 23, 2020 · 66dd2bc · 66dd2bc
1 parent f6937b2
commit 66dd2bc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [plugin-ext] fixed custom Icon Themes & plugin Icons [#7583](https://github.com/eclipse-theia/theia/pull/7583)
 - [task] fixed presentation.reveal & focus for detected tasks [#7548](https://github.com/eclipse-theia/theia/pull/7548)
 - [output] added optional argument `severity` to `OutputChannel.appendLine` method for coloring.
+- [plugin] env.appName is now reusing the value from `applicationName` defined in package.json under `theia/frontend/config/applicatioName` for example. It allows to customize the value with a single change.
 
 Breaking changes:
 

diff --git a/packages/plugin-ext/src/common/plugin-api-rpc.ts b/packages/plugin-ext/src/common/plugin-api-rpc.ts
@@ -102,6 +102,7 @@ export interface EnvInit {
     queryParams: QueryParameters;
     language: string;
     shell: string;
+    appName: string;
 }
 
 export interface PluginAPI {

diff --git a/packages/plugin-ext/src/hosted/browser/hosted-plugin.ts b/packages/plugin-ext/src/hosted/browser/hosted-plugin.ts
@@ -59,6 +59,7 @@ import { WidgetManager } from '@theia/core/lib/browser/widget-manager';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import URI from '@theia/core/lib/common/uri';
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
 
 export type PluginHost = 'frontend' | string;
 export type DebugActivationEvent = 'onDebugResolve' | 'onDebugInitialConfigurations' | 'onDebugAdapterProtocolTracker';
@@ -452,7 +453,8 @@ export class HostedPluginSupport {
                 env: {
                     queryParams: getQueryParameters(),
                     language: navigator.language,
-                    shell: defaultShell
+                    shell: defaultShell,
+                    appName: FrontendApplicationConfigProvider.get().applicationName
                 },
                 extApi,
                 webview: {

diff --git a/packages/plugin-ext/src/plugin/env.ts b/packages/plugin-ext/src/plugin/env.ts
@@ -24,12 +24,11 @@ export abstract class EnvExtImpl {
     private proxy: EnvMain;
     private queryParameters: QueryParameters;
     private lang: string;
+    private applicationName: string;
     private defaultShell: string;
     private envMachineId: string;
     private envSessionId: string;
 
-    public static readonly APP_NAME = 'Eclipse Theia';
-
     constructor(rpc: RPCProtocol) {
         this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.ENV_MAIN);
         this.envSessionId = v4();
@@ -57,6 +56,10 @@ export abstract class EnvExtImpl {
         this.queryParameters = queryParams;
     }
 
+    setApplicationName(applicationName: string): void {
+        this.applicationName = applicationName;
+    }
+
     setLanguage(lang: string): void {
         this.lang = lang;
     }
@@ -70,7 +73,7 @@ export abstract class EnvExtImpl {
     }
 
     get appName(): string {
-        return EnvExtImpl.APP_NAME;
+        return this.applicationName;
     }
 
     abstract get appRoot(): string;

diff --git a/packages/plugin-ext/src/plugin/plugin-manager.ts b/packages/plugin-ext/src/plugin/plugin-manager.ts
@@ -186,6 +186,7 @@ export class PluginManagerExtImpl implements PluginManagerExt, PluginManager {
         this.envExt.setQueryParameters(params.env.queryParams);
         this.envExt.setLanguage(params.env.language);
         this.envExt.setShell(params.env.shell);
+        this.envExt.setApplicationName(params.env.appName);
 
         this.preferencesManager.init(params.preferences);