move env from widget to env

web/static/src/ts/env.ts

@@ -1,18 +1,44 @@
+import { WEnv } from "./core/component";
 import { QWeb } from "./core/qweb_vdom";
+import { Registry } from "./core/registry";
 import { idGenerator, memoize } from "./core/utils";
 import { TemplateLoader } from "./loaders/templates";
 import { actionRegistry } from "./registries";
 import { RPC } from "./services/ajax";
-import { ActionManager } from "./store/action_manager";
+import {
-import { Ajax } from "./store/ajax";
+  ActionManager,
-import { NotificationManager } from "./store/notifications";
+  ActionWidget,
-import { Router } from "./store/router";
+  IActionManager
-import { Env } from "./widgets/widget";
+} from "./store/action_manager";
+import { Ajax, IAjax } from "./store/ajax";
+import {
+  INotificationManager,
+  NotificationManager
+} from "./store/notifications";
+import { IRouter, Router } from "./store/router";
 
 //------------------------------------------------------------------------------
 // Types
 //------------------------------------------------------------------------------
 
+export interface Env extends WEnv {
+  // services
+  actionManager: IActionManager;
+  ajax: IAjax;
+  notifications: INotificationManager;
+  router: IRouter;
+
+  // registries
+  actionRegistry: Registry<ActionWidget>;
+
+  // helpers
+  rpc: IAjax["rpc"];
+
+  // configuration
+  debug: boolean;
+  isMobile: boolean;
+}
+
 interface Loaders {
   loadTemplates: TemplateLoader;
 }

web/static/src/ts/widgets/root.ts

@@ -6,7 +6,8 @@ import { ActionContainer } from "./action_container";
 import { HomeMenu } from "./home_menu";
 import { Navbar } from "./navbar";
 import { Notification } from "./notification";
-import { Env, Widget } from "./widget";
+import { Widget } from "./widget";
+import { Env } from "../env";
 
 //------------------------------------------------------------------------------
 // Types

web/static/src/ts/widgets/widget.ts

@@ -1,31 +1,5 @@
-import { IAjax } from "../store/ajax";
+import { Component, PureComponent } from "../core/component";
-import { Component, PureComponent, WEnv } from "../core/component";
+import { Env } from "../env";
-import { INotificationManager } from "../store/notifications";
-import { Registry } from "../core/registry";
-import { IRouter } from "../store/router";
-import { ActionWidget, IActionManager } from "../store/action_manager";
-
-//------------------------------------------------------------------------------
-// Types
-//------------------------------------------------------------------------------
-
-export interface Env extends WEnv {
-  // services
-  actionManager: IActionManager;
-  ajax: IAjax;
-  notifications: INotificationManager;
-  router: IRouter;
-
-  // registries
-  actionRegistry: Registry<ActionWidget>;
-
-  // helpers
-  rpc: IAjax["rpc"];
-
-  // configuration
-  debug: boolean;
-  isMobile: boolean;
-}
 
 //------------------------------------------------------------------------------
 // Widget classes

web/static/tests/helpers.ts

@@ -9,7 +9,7 @@ import { getMenuInfo, MenuInfo } from "../src/ts/loaders/menus";
 import { actionRegistry } from "../src/ts/registries";
 import { ActionManager } from "../src/ts/store/action_manager";
 import { Ajax } from "../src/ts/store/ajax";
-import { Env } from "../src/ts/widgets/widget";
+import { Env } from "../src/ts/env";
 
 export function makeTestFixture() {
   let fixture = document.createElement("div");