move registry to services

web/static/src/ts/env.ts

@@ -1,13 +1,13 @@
 import { QWeb } from "./core/qweb_vdom";
 import { idGenerator, memoize } from "./core/utils";
 import { WEnv } from "./core/widget";
-import { registry } from "./registry";
 import { ActionManager, IActionManager } from "./services/action_manager";
 import { Ajax, IAjax } from "./services/ajax";
 import {
   INotificationManager,
   NotificationManager
 } from "./services/notifications";
+import { registry, Registry } from "./services/registry";
 import { IRouter, Router } from "./services/router";
 
 //------------------------------------------------------------------------------
@@ -23,9 +23,12 @@ export interface Env extends WEnv {
   // services
   actionManager: IActionManager;
   ajax: IAjax;
-  router: IRouter;
-  menus: Menu[];
   notifications: INotificationManager;
+  registry: Registry;
+  router: IRouter;
+
+  // data
+  menus: Menu[];
 
   // helpers
   rpc: IAjax["rpc"];
@@ -66,13 +69,16 @@ export const makeEnvironment = memoize(function(): Env {
     qweb,
     getID: idGenerator(),
 
-    ajax,
-    router,
     actionManager,
-    menus,
+    ajax,
     notifications,
+    registry,
+    router,
+
+    menus,
 
     rpc: ajax.rpc,
+
     debug: false,
     isMobile: window.innerWidth <= 768
   };

web/static/src/ts/main.ts

@@ -2,8 +2,8 @@
 
 import { debounce } from "./core/utils";
 import { makeEnvironment } from "./env";
-import { registry } from "./registry";
 import { Root } from "./root";
+import { registry } from "./services/registry";
 import { CRM } from "./widgets/crm";
 import { Discuss } from "./widgets/discuss";
 

web/static/src/ts/services/action_manager.ts

@@ -1,7 +1,7 @@
 import { EventBus } from "../core/event_bus";
 import { Widget } from "../core/widget";
 import { Env } from "../env";
-import { Registry } from "../registry";
+import { Registry } from "./registry";
 import { Type } from "../types";
 import { IRouter, Query } from "./router";
 
@@ -65,6 +65,7 @@ export class ActionManager extends EventBus implements IActionManager {
     this.router.on("query_changed", this, this.update);
     this.update(this.router.getQuery());
   }
+
   doAction(request: ActionRequest) {
     if (typeof request === "number") {
       // this is an action ID

web/static/src/ts/services/registry.ts

@@ -1,6 +1,6 @@
-import { Widget } from "./core/widget";
-import { Env } from "./env";
-import { Type } from "./types";
+import { Widget } from "../core/widget";
+import { Env } from "../env";
+import { Type } from "../types";
 
 //------------------------------------------------------------------------------
 // Types