refactor: align naming convention

Signed-off-by: Yulong Ruan <[email protected]>
ruanyl · Sep 15, 2023 · 49ab913 · 49ab913
1 parent 133dff4
commit 49ab913
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
@@ -47,7 +47,7 @@ import { IUiSettingsClient } from '../ui_settings';
 import { SavedObjectsStart } from '../saved_objects';
 import { AppCategory } from '../../types';
 import { ScopedHistory } from './scoped_history';
-import { WorkspaceStart } from '../workspace';
+import { WorkspacesStart } from '../workspace';
 
 /**
  * Accessibility status of an application.
@@ -335,8 +335,8 @@ export interface AppMountContext {
     injectedMetadata: {
       getInjectedVar: (name: string, defaultValue?: any) => unknown;
     };
-    /** {@link WorkspaceService} */
-    workspaces: WorkspaceStart;
+    /** {@link WorkspacesService} */
+    workspaces: WorkspacesStart;
   };
 }
 

diff --git a/src/core/public/core_system.ts b/src/core/public/core_system.ts
@@ -54,7 +54,7 @@ import { ContextService } from './context';
 import { IntegrationsService } from './integrations';
 import { CoreApp } from './core_app';
 import type { InternalApplicationSetup, InternalApplicationStart } from './application/types';
-import { WorkspaceService } from './workspace';
+import { WorkspacesService } from './workspace';
 
 interface Params {
   rootDomElement: HTMLElement;
@@ -111,7 +111,7 @@ export class CoreSystem {
 
   private readonly rootDomElement: HTMLElement;
   private readonly coreContext: CoreContext;
-  private readonly workspaces: WorkspaceService;
+  private readonly workspaces: WorkspacesService;
   private fatalErrorsSetup: FatalErrorsSetup | null = null;
 
   constructor(params: Params) {
@@ -140,7 +140,7 @@ export class CoreSystem {
     this.rendering = new RenderingService();
     this.application = new ApplicationService();
     this.integrations = new IntegrationsService();
-    this.workspaces = new WorkspaceService();
+    this.workspaces = new WorkspacesService();
 
     this.coreContext = { coreId: Symbol('core'), env: injectedMetadata.env };
 

diff --git a/src/core/public/index.ts b/src/core/public/index.ts
@@ -87,7 +87,7 @@ import {
   HandlerParameters,
 } from './context';
 import { Branding } from '../types';
-import { WorkspaceStart, WorkspaceSetup } from './workspace';
+import { WorkspacesStart, WorkspacesSetup } from './workspace';
 
 export type { Logos } from '../common';
 export { PackageInfo, EnvironmentMode } from '../server/types';
@@ -241,8 +241,8 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
   };
   /** {@link StartServicesAccessor} */
   getStartServices: StartServicesAccessor<TPluginsStart, TStart>;
-  /** {@link WorkspaceSetup} */
-  workspaces: WorkspaceSetup;
+  /** {@link WorkspacesSetup} */
+  workspaces: WorkspacesSetup;
 }
 
 /**
@@ -297,8 +297,8 @@ export interface CoreStart {
     getInjectedVar: (name: string, defaultValue?: any) => unknown;
     getBranding: () => Branding;
   };
-  /** {@link WorkspaceStart} */
-  workspaces: WorkspaceStart;
+  /** {@link WorkspacesStart} */
+  workspaces: WorkspacesStart;
 }
 
 export {
@@ -349,8 +349,8 @@ export {
 export { __osdBootstrap__ } from './osd_bootstrap';
 
 export {
-  WorkspaceStart,
-  WorkspaceSetup,
-  WorkspaceService,
+  WorkspacesStart,
+  WorkspacesSetup,
+  WorkspacesService,
   WorkspaceObservables,
 } from './workspace';
diff --git a/src/core/public/workspace/index.ts b/src/core/public/workspace/index.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 export {
-  WorkspaceStart,
-  WorkspaceService,
-  WorkspaceSetup,
+  WorkspacesStart,
+  WorkspacesService,
+  WorkspacesSetup,
   WorkspaceObservables,
 } from './workspaces_service';
diff --git a/src/core/public/workspace/workspaces_service.ts b/src/core/public/workspace/workspaces_service.ts
@@ -35,15 +35,15 @@ enum WORKSPACE_ERROR {
 /**
  * @public
  */
-export interface WorkspaceSetup extends WorkspaceObservables {
+export interface WorkspacesSetup extends WorkspaceObservables {
   registerWorkspaceMenuRender: (render: WorkspaceMenuRenderFn) => void;
 }
 
-export interface WorkspaceStart extends WorkspaceObservables {
+export interface WorkspacesStart extends WorkspaceObservables {
   renderWorkspaceMenu: () => JSX.Element | null;
 }
 
-export class WorkspaceService implements CoreService<WorkspaceSetup, WorkspaceStart> {
+export class WorkspacesService implements CoreService<WorkspacesSetup, WorkspacesStart> {
   private currentWorkspaceId$ = new BehaviorSubject<string>('');
   private workspaceList$ = new BehaviorSubject<WorkspaceAttribute[]>([]);
   private currentWorkspace$ = new BehaviorSubject<WorkspaceAttribute | null>(null);
@@ -80,7 +80,7 @@ export class WorkspaceService implements CoreService<WorkspaceSetup, WorkspaceSt
     );
   }
 
-  public setup(): WorkspaceSetup {
+  public setup(): WorkspacesSetup {
     return {
       currentWorkspaceId$: this.currentWorkspaceId$,
       currentWorkspace$: this.currentWorkspace$,
@@ -98,7 +98,7 @@ export class WorkspaceService implements CoreService<WorkspaceSetup, WorkspaceSt
   }: {
     application: InternalApplicationStart;
     http: HttpSetup;
-  }): WorkspaceStart {
+  }): WorkspacesStart {
     const observables = {
       currentWorkspaceId$: this.currentWorkspaceId$,
       currentWorkspace$: this.currentWorkspace$,