From b15761de8bab22bc4f079608953b072fa9d3a191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Mon, 4 Mar 2019 17:00:29 +0100
Subject: [PATCH] refactoring: move files around

---
 web/static/src/ts/core/registry.ts              | 5 -----
 web/static/src/ts/{ui => }/discuss/clock.ts     | 0
 web/static/src/ts/{ui => }/discuss/counter.ts   | 0
 web/static/src/ts/{ui => }/discuss/discuss.ts   | 0
 web/static/src/ts/registries.ts                 | 2 +-
 web/static/src/ts/store/action_manager_mixin.ts | 4 ++--
 web/static/src/ts/ui/home_menu.ts               | 2 +-
 web/static/src/ts/ui/navbar.ts                  | 2 +-
 web/static/src/ts/ui/notification.ts            | 2 +-
 web/static/src/ts/ui/root.ts                    | 2 +-
 web/static/src/ts/{ui => views}/view.ts         | 2 +-
 web/static/src/ts/{ui => }/widget.ts            | 4 ++--
 12 files changed, 10 insertions(+), 15 deletions(-)
 rename web/static/src/ts/{ui => }/discuss/clock.ts (100%)
 rename web/static/src/ts/{ui => }/discuss/counter.ts (100%)
 rename web/static/src/ts/{ui => }/discuss/discuss.ts (100%)
 rename web/static/src/ts/{ui => views}/view.ts (78%)
 rename web/static/src/ts/{ui => }/widget.ts (88%)

diff --git a/web/static/src/ts/core/registry.ts b/web/static/src/ts/core/registry.ts
index 8de0ebf7..69e08f3a 100644
--- a/web/static/src/ts/core/registry.ts
+++ b/web/static/src/ts/core/registry.ts
@@ -16,8 +16,3 @@ export class Registry<T> {
     return this.map[key];
   }
 }
-
-//------------------------------------------------------------------------------
-// Main registry instance
-//------------------------------------------------------------------------------
-export const registry = new Registry();
diff --git a/web/static/src/ts/ui/discuss/clock.ts b/web/static/src/ts/discuss/clock.ts
similarity index 100%
rename from web/static/src/ts/ui/discuss/clock.ts
rename to web/static/src/ts/discuss/clock.ts
diff --git a/web/static/src/ts/ui/discuss/counter.ts b/web/static/src/ts/discuss/counter.ts
similarity index 100%
rename from web/static/src/ts/ui/discuss/counter.ts
rename to web/static/src/ts/discuss/counter.ts
diff --git a/web/static/src/ts/ui/discuss/discuss.ts b/web/static/src/ts/discuss/discuss.ts
similarity index 100%
rename from web/static/src/ts/ui/discuss/discuss.ts
rename to web/static/src/ts/discuss/discuss.ts
diff --git a/web/static/src/ts/registries.ts b/web/static/src/ts/registries.ts
index 43eec1dd..f5398b9d 100644
--- a/web/static/src/ts/registries.ts
+++ b/web/static/src/ts/registries.ts
@@ -1,6 +1,6 @@
 import { Registry } from "./core/registry";
 import { ActionWidget } from "./store/store";
-import { Discuss } from "./ui/discuss/discuss";
+import { Discuss } from "./discuss/discuss";
 
 export const actionRegistry: Registry<ActionWidget> = new Registry();
 
diff --git a/web/static/src/ts/store/action_manager_mixin.ts b/web/static/src/ts/store/action_manager_mixin.ts
index 3085336c..5cea5cc7 100644
--- a/web/static/src/ts/store/action_manager_mixin.ts
+++ b/web/static/src/ts/store/action_manager_mixin.ts
@@ -1,7 +1,7 @@
 import { Type } from "../core/component";
 import { rpcMixin } from "./rpc_mixin";
-import { Widget } from "../ui/widget";
-import { View } from "../ui/view";
+import { Widget } from "../widget";
+import { View } from "../views/view";
 
 export type Context = { [key: string]: any };
 
diff --git a/web/static/src/ts/ui/home_menu.ts b/web/static/src/ts/ui/home_menu.ts
index 543f5e36..2e494e59 100644
--- a/web/static/src/ts/ui/home_menu.ts
+++ b/web/static/src/ts/ui/home_menu.ts
@@ -1,5 +1,5 @@
 import { MenuInfo, MenuItem } from "../store/store";
-import { Widget } from "./widget";
+import { Widget } from "../widget";
 
 //------------------------------------------------------------------------------
 // Types
diff --git a/web/static/src/ts/ui/navbar.ts b/web/static/src/ts/ui/navbar.ts
index 1dd41818..b5c0eb44 100644
--- a/web/static/src/ts/ui/navbar.ts
+++ b/web/static/src/ts/ui/navbar.ts
@@ -1,5 +1,5 @@
 import { MenuItem } from "../store/store";
-import { PureWidget } from "./widget";
+import { PureWidget } from "../widget";
 
 //------------------------------------------------------------------------------
 // Types
diff --git a/web/static/src/ts/ui/notification.ts b/web/static/src/ts/ui/notification.ts
index cb7b6468..ae409a93 100644
--- a/web/static/src/ts/ui/notification.ts
+++ b/web/static/src/ts/ui/notification.ts
@@ -1,5 +1,5 @@
 import { Notification as INotification } from "../store/store";
-import { Widget } from "./widget";
+import { Widget } from "../widget";
 
 export class Notification extends Widget<INotification, {}> {
   template = "web.notification";
diff --git a/web/static/src/ts/ui/root.ts b/web/static/src/ts/ui/root.ts
index 48935458..21e46863 100644
--- a/web/static/src/ts/ui/root.ts
+++ b/web/static/src/ts/ui/root.ts
@@ -4,7 +4,7 @@ import { State, Store } from "../store/store";
 import { HomeMenu } from "./home_menu";
 import { Navbar } from "./navbar";
 import { Notification } from "./notification";
-import { Widget } from "./widget";
+import { Widget } from "../widget";
 import { Action } from "../store/action_manager_mixin";
 
 //------------------------------------------------------------------------------
diff --git a/web/static/src/ts/ui/view.ts b/web/static/src/ts/views/view.ts
similarity index 78%
rename from web/static/src/ts/ui/view.ts
rename to web/static/src/ts/views/view.ts
index f02ced8b..a434e19b 100644
--- a/web/static/src/ts/ui/view.ts
+++ b/web/static/src/ts/views/view.ts
@@ -1,4 +1,4 @@
-import { Widget } from "./widget";
+import { Widget } from "../widget";
 
 export class View extends Widget<{}, { info: any }> {
   inlineTemplate = `<div>some view: <span t-esc="props.info"/></div>`;
diff --git a/web/static/src/ts/ui/widget.ts b/web/static/src/ts/widget.ts
similarity index 88%
rename from web/static/src/ts/ui/widget.ts
rename to web/static/src/ts/widget.ts
index 74e7ad4d..2e1f99b3 100644
--- a/web/static/src/ts/ui/widget.ts
+++ b/web/static/src/ts/widget.ts
@@ -1,5 +1,5 @@
-import { Component, PureComponent } from "../core/component";
-import { Env } from "../env";
+import { Component, PureComponent } from "./core/component";
+import { Env } from "./env";
 
 //------------------------------------------------------------------------------
 // Widget classes