Merge pull request #42 from Caleydo/vstoiber/update_refactoring

Caleydo · Aug 19, 2020 · 1b38977 · 1b38977
2 parents 492d764 + f4916fc
commit 1b38977
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 27 deletions.
diff --git a/dist/phovea.js b/dist/phovea.js
diff --git a/dist/phovea.js.map b/dist/phovea.js.map
diff --git a/dist/scss/_idtype_color.scss b/dist/scss/_idtype_color.scss
@@ -1,4 +1,4 @@
-@import "~tdp_core/src/styles/idtype_color";
+@import "~tdp_core/dist/scss/idtype_color";
 
 * {
   @include idtype_color('IDTypeA', #73dbff);

diff --git a/dist/views/DummyInstantView.d.ts b/dist/views/DummyInstantView.d.ts
@@ -1,4 +1,4 @@
-import { AInstantView } from 'tdp_core/src/views/AInstantView';
+import { AInstantView } from 'tdp_core';
 export declare class DummyInstantView extends AInstantView {
     protected initImpl(): void;
     private build;

diff --git a/dist/views/DummyInstantView.js b/dist/views/DummyInstantView.js
diff --git a/dist/views/DummyInstantView.js.map b/dist/views/DummyInstantView.js.map
diff --git a/src/phovea.ts b/src/phovea.ts
@@ -12,9 +12,10 @@ module.exports = function (registry, feature) {
 
   /// #if include('ordino')
   registry.push('ordinoStartMenuSection', 'dummy_start_a', function () {
-    return import('./base/DummyMenuSection').then((d) => d.DummyMenuSection);
+    return import('./base/DummyMenuSection');
   }, {
      name: 'Dummy Data',
+     factory: 'new DummyMenuSection',
      cssClass: 'targidDummyData',
      priority: 20,
      viewId: 'dummy_start_a',
@@ -41,54 +42,58 @@ module.exports = function (registry, feature) {
   });
 
   registry.push('tdpView', 'dummy_detail', function () {
-    return import('./views/DummyDetailView').then((d) => d.DummyDetailView);
+    return import('./views/DummyDetailView');
   }, {
      name: 'Dummy Detail View',
+     factory: 'new DummyDetailView',
      idtype: 'IDTypeA',
      selection: '2'
   });
 
   registry.push('tdpView', 'dummy_dependent', function () {
-    return import('./views/DummyDependentList').then((d) => d.DummyDependentList);
+    return import('./views/DummyDependentList');
   }, {
      name: 'Dummy Dependent List',
+     factory: 'new DummyDependentList',
      idtype: 'IDTypeA',
      selection: 'some'
   });
 
   registry.push('tdpView', 'dummyb_dependent', function () {
-    return import('./views/DummyDependentBList').then((d) => d.DummyDependentBList);
+    return import('./views/DummyDependentBList');
   }, {
      name: 'Dummy Dependent List',
+     factory: 'new DummyDependentBList',
      idtype: 'IDTypeB',
      selection: 'some'
   });
 
   registry.push('tdpView', 'dummy_composite', function () {
-    return import('tdp_core/src/views/CompositeView').then((c) => c.CompositeView);
+    return import('tdp_core/dist/views/CompositeView');
   }, {
      name: 'DummyComposite',
+     factory: 'new CompositeView',
      idtype: 'IDTypeA',
      selection: 'some',
      elements: [
        {
          key: 'a',
          loader() {
-           return import('./views/DummyComposite').then((d) => d.DummyA);
+           return import('./views/DummyComposite');
          },
          factory: 'new DummyA'
        },
        {
          key: 'b',
          loader() {
-           return import('./views/DummyComposite').then((d) => d.DummyB);
+           return import('./views/DummyComposite');
          },
          factory: 'new DummyB'
        },
        {
          key: 'c',
          loader() {
-           return import('./views/DummyComposite').then((d) => d.DummyC);
+           return import('./views/DummyComposite');
          },
          factory: 'new DummyC'
        }
@@ -100,19 +105,21 @@ module.exports = function (registry, feature) {
   });
 
   registry.push('tdpView', 'dummy_external', function () {
-    return import('tdp_core/src/views/ProxyView').then((p) => p.ProxyView);
+    return import('tdp_core/dist/views/ProxyView');
   }, {
      name: 'Wikipedia',
+     factory: 'new ProxyView',
      site: 'https://wikipedia.org/w/index.php?search={id}',
      argument: 'id',
      idtype: 'IDTypeA',
      selection: 'chooser'
   });
 
   registry.push('tdpInstantView', 'dummy', function () {
-    return import('./views/DummyInstantView').then((d) => d.DummyInstantView);
+    return import('./views/DummyInstantView');
   }, {
      name: 'Info',
+     factory: 'new DummyInstantView',
      idtype: 'IDTypeA'
   });
 

diff --git a/src/scss/_idtype_color.scss b/src/scss/_idtype_color.scss
@@ -1,4 +1,4 @@
-@import "~tdp_core/src/styles/idtype_color";
+@import "~tdp_core/dist/scss/idtype_color";
 
 * {
   @include idtype_color('IDTypeA', #73dbff);

diff --git a/src/views/DummyInstantView.ts b/src/views/DummyInstantView.ts
@@ -1,4 +1,4 @@
-import {AInstantView} from 'tdp_core/src/views/AInstantView';
+import {AInstantView} from 'tdp_core';
 
 
 export class DummyInstantView extends AInstantView {