diff --git a/client/src/app/instance/shared-search/detail/components/default/default-object.component.html b/client/src/app/instance/search/components/detail/default/default-object.component.html
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/default/default-object.component.html
rename to client/src/app/instance/search/components/detail/default/default-object.component.html
diff --git a/client/src/app/instance/shared-search/detail/components/default/default-object.component.spec.ts b/client/src/app/instance/search/components/detail/default/default-object.component.spec.ts
similarity index 85%
rename from client/src/app/instance/shared-search/detail/components/default/default-object.component.spec.ts
rename to client/src/app/instance/search/components/detail/default/default-object.component.spec.ts
index e665ccd84f782f170dc0c7a5ad6e3dc5016474cd..24698efed39c3aa1726a35003d06811c4100fe2f 100644
--- a/client/src/app/instance/shared-search/detail/components/default/default-object.component.spec.ts
+++ b/client/src/app/instance/search/components/detail/default/default-object.component.spec.ts
@@ -2,9 +2,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { Component, Input } from '@angular/core';
import { DefaultObjectComponent } from './default-object.component';
-import { Attribute, OutputCategory, OutputFamily } from '../../../../../metamodel/models';
+import { Attribute, OutputCategory, OutputFamily } from 'src/app/metamodel/models';
-describe('[Instance][SharedSearch][Detail][Component][Default] DefaultObjectComponent', () => {
+describe('[Instance][Search][Component][Detail][Default] DefaultObjectComponent', () => {
@Component({ selector: 'app-object-data', template: '' })
class ObjectDataStubComponent {
@Input() datasetSelected: string;
diff --git a/client/src/app/instance/shared-search/detail/components/default/default-object.component.ts b/client/src/app/instance/search/components/detail/default/default-object.component.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/default/default-object.component.ts
rename to client/src/app/instance/search/components/detail/default/default-object.component.ts
diff --git a/client/src/app/instance/shared-search/detail/components/default/index.ts b/client/src/app/instance/search/components/detail/default/index.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/default/index.ts
rename to client/src/app/instance/search/components/detail/default/index.ts
diff --git a/client/src/app/instance/shared-search/detail/components/index.ts b/client/src/app/instance/search/components/detail/index.ts
similarity index 86%
rename from client/src/app/instance/shared-search/detail/components/index.ts
rename to client/src/app/instance/search/components/detail/index.ts
index e0d32c36208a417c4ec089814d619e25f5a69c6b..6b537aa927f9c158cc0dc2686990333b73d915ec 100644
--- a/client/src/app/instance/shared-search/detail/components/index.ts
+++ b/client/src/app/instance/search/components/detail/index.ts
@@ -2,7 +2,7 @@ import { defaultComponents } from './default';
import { spectraComponents } from './spectra';
import { ObjectDataComponent } from './object-data.component';
-export const dummiesComponents = [
+export const detailsComponents = [
defaultComponents,
spectraComponents,
ObjectDataComponent
diff --git a/client/src/app/instance/shared-search/detail/components/object-data.component.html b/client/src/app/instance/search/components/detail/object-data.component.html
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/object-data.component.html
rename to client/src/app/instance/search/components/detail/object-data.component.html
diff --git a/client/src/app/instance/shared-search/detail/components/object-data.component.spec.ts b/client/src/app/instance/search/components/detail/object-data.component.spec.ts
similarity index 96%
rename from client/src/app/instance/shared-search/detail/components/object-data.component.spec.ts
rename to client/src/app/instance/search/components/detail/object-data.component.spec.ts
index 852eb96d84c77a84cd18ebff842467ae61592bfa..aff1478a58c7695e1e410296ddec23402e125aa7 100644
--- a/client/src/app/instance/shared-search/detail/components/object-data.component.spec.ts
+++ b/client/src/app/instance/search/components/detail/object-data.component.spec.ts
@@ -6,7 +6,7 @@ import { ObjectDataComponent } from './object-data.component';
import { AppConfigService } from '../../../../app-config.service';
import { ATTRIBUTE_LIST, CATEGORY_LIST } from '../../../../../test-data';
-describe('[Instance][SharedSearch][Detail][Component] ObjectDataComponent', () => {
+describe('[Instance][Search][Component][Detail] ObjectDataComponent', () => {
let component: ObjectDataComponent;
let fixture: ComponentFixture<ObjectDataComponent>;
let appConfigServiceStub = new AppConfigService();
diff --git a/client/src/app/instance/shared-search/detail/components/object-data.component.ts b/client/src/app/instance/search/components/detail/object-data.component.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/object-data.component.ts
rename to client/src/app/instance/search/components/detail/object-data.component.ts
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/graph/point.ts b/client/src/app/instance/search/components/detail/spectra/graph/point.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/graph/point.ts
rename to client/src/app/instance/search/components/detail/spectra/graph/point.ts
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/graph/rays.ts b/client/src/app/instance/search/components/detail/spectra/graph/rays.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/graph/rays.ts
rename to client/src/app/instance/search/components/detail/spectra/graph/rays.ts
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/graph/spectra-graph.component.html b/client/src/app/instance/search/components/detail/spectra/graph/spectra-graph.component.html
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/graph/spectra-graph.component.html
rename to client/src/app/instance/search/components/detail/spectra/graph/spectra-graph.component.html
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/graph/spectra-graph.component.scss b/client/src/app/instance/search/components/detail/spectra/graph/spectra-graph.component.scss
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/graph/spectra-graph.component.scss
rename to client/src/app/instance/search/components/detail/spectra/graph/spectra-graph.component.scss
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/graph/spectra-graph.component.ts b/client/src/app/instance/search/components/detail/spectra/graph/spectra-graph.component.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/graph/spectra-graph.component.ts
rename to client/src/app/instance/search/components/detail/spectra/graph/spectra-graph.component.ts
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/graph/spectra-type.ts b/client/src/app/instance/search/components/detail/spectra/graph/spectra-type.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/graph/spectra-type.ts
rename to client/src/app/instance/search/components/detail/spectra/graph/spectra-type.ts
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/index.ts b/client/src/app/instance/search/components/detail/spectra/index.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/index.ts
rename to client/src/app/instance/search/components/detail/spectra/index.ts
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/spectra-object.component.html b/client/src/app/instance/search/components/detail/spectra/spectra-object.component.html
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/spectra-object.component.html
rename to client/src/app/instance/search/components/detail/spectra/spectra-object.component.html
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/spectra-object.component.scss b/client/src/app/instance/search/components/detail/spectra/spectra-object.component.scss
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/spectra-object.component.scss
rename to client/src/app/instance/search/components/detail/spectra/spectra-object.component.scss
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/spectra-object.component.spec.ts b/client/src/app/instance/search/components/detail/spectra/spectra-object.component.spec.ts
similarity index 90%
rename from client/src/app/instance/shared-search/detail/components/spectra/spectra-object.component.spec.ts
rename to client/src/app/instance/search/components/detail/spectra/spectra-object.component.spec.ts
index 293a54983c1f475cf569f6dd3435e3c8bde4a2b6..30c1f4d39e045840b5cc738818470a9c561ee0c3 100644
--- a/client/src/app/instance/shared-search/detail/components/spectra/spectra-object.component.spec.ts
+++ b/client/src/app/instance/search/components/detail/spectra/spectra-object.component.spec.ts
@@ -2,11 +2,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Component, Input } from '@angular/core';
import { SpectraObjectComponent } from './spectra-object.component';
-import { Attribute, OutputCategory, OutputFamily } from '../../../../../metamodel/models';
-import { AppConfigService } from '../../../../../app-config.service';
-import { ATTRIBUTE_LIST, OBJECT_DETAIL } from '../../../../../../test-data';
+import { Attribute, OutputCategory, OutputFamily } from 'src/app/metamodel/models';
+import { AppConfigService } from 'src/app/app-config.service';
+import { ATTRIBUTE_LIST, OBJECT_DETAIL } from 'src/test-data';
-describe('[Instance][SharedSearch][Detail][Component][Spectra] SpectraObjectComponent', () => {
+describe('[Instance][Search][Component][Detail][Spectra] SpectraObjectComponent', () => {
@Component({ selector: 'app-spectra-graph', template: '' })
class SpectraGraphStubComponent {
@Input() z: number;
diff --git a/client/src/app/instance/shared-search/detail/components/spectra/spectra-object.component.ts b/client/src/app/instance/search/components/detail/spectra/spectra-object.component.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/components/spectra/spectra-object.component.ts
rename to client/src/app/instance/search/components/detail/spectra/spectra-object.component.ts
diff --git a/client/src/app/instance/search/components/index.ts b/client/src/app/instance/search/components/index.ts
index a0537c999b5e9b20bd10bb79ee6626c2a8ead89a..f57be4d2034cf2175c843a934d31ba264f9aa91d 100644
--- a/client/src/app/instance/search/components/index.ts
+++ b/client/src/app/instance/search/components/index.ts
@@ -4,6 +4,7 @@ import { datasetComponents } from './dataset';
import { criteriaComponents } from './criteria';
import { outputComponents } from './output';
import { resultComponents } from './result';
+import { detailsComponents } from './detail';
export const dummiesComponents = [
ProgressBarComponent,
@@ -11,5 +12,6 @@ export const dummiesComponents = [
datasetComponents,
criteriaComponents,
outputComponents,
- resultComponents
+ resultComponents,
+ detailsComponents
];
\ No newline at end of file
diff --git a/client/src/app/instance/shared-search/detail/containers/detail.component.html b/client/src/app/instance/search/containers/detail.component.html
similarity index 100%
rename from client/src/app/instance/shared-search/detail/containers/detail.component.html
rename to client/src/app/instance/search/containers/detail.component.html
diff --git a/client/src/app/instance/shared-search/detail/containers/detail.component.spec.ts b/client/src/app/instance/search/containers/detail.component.spec.ts
similarity index 93%
rename from client/src/app/instance/shared-search/detail/containers/detail.component.spec.ts
rename to client/src/app/instance/search/containers/detail.component.spec.ts
index b85dbe3a391fa80a25aabd5aea534e900a1bc798..ddaaa8513ba45b09830c2107331a4b82abbb11f7 100644
--- a/client/src/app/instance/shared-search/detail/containers/detail.component.spec.ts
+++ b/client/src/app/instance/search/containers/detail.component.spec.ts
@@ -6,13 +6,13 @@ import { provideMockStore, MockStore } from '@ngrx/store/testing';
import { of } from 'rxjs';
import { DetailComponent } from './detail.component';
-import { Attribute, OutputCategory, OutputFamily } from '../../../../metamodel/models';
+import { Attribute, OutputCategory, OutputFamily } from 'src/app/metamodel/models';
import { SortByDetailDisplay } from '../pipes/sort-by-detail-display';
-import { ATTRIBUTE_LIST } from '../../../../../test-data';
+import { ATTRIBUTE_LIST } from 'src/test-data';
import * as detailActions from 'src/app/instance/store/actions/detail.actions';
-import * as searchActions from '../../../store/actions/search.actions';
+import * as searchActions from 'src/app/instance/store/actions/search.actions';
-describe('[Instance][SharedSearch][Detail][Container] DetailComponent', () => {
+describe('[Instance][Search][Container] DetailComponent', () => {
@Component({ selector: 'app-spinner', template: '' })
class SpinnerStubComponent { }
diff --git a/client/src/app/instance/shared-search/detail/containers/detail.component.ts b/client/src/app/instance/search/containers/detail.component.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/containers/detail.component.ts
rename to client/src/app/instance/search/containers/detail.component.ts
diff --git a/client/src/app/instance/search/pipes/index.ts b/client/src/app/instance/search/pipes/index.ts
index 6eaab8119e41b4a54361403d8cefced8cafbbbfd..62fb1bc8a53933e8a12109a1d2c3da4872cefb95 100644
--- a/client/src/app/instance/search/pipes/index.ts
+++ b/client/src/app/instance/search/pipes/index.ts
@@ -9,8 +9,10 @@
import { SortByCriteriaDisplayPipe } from './sort-by-criteria-display.pipe';
import { SortByOutputDisplayPipe } from './sort-by-output-display.pipe';
+import { SortByDetailDisplay } from './sort-by-detail-display';
export const searchPipes = [
SortByCriteriaDisplayPipe,
- SortByOutputDisplayPipe
+ SortByOutputDisplayPipe,
+ SortByDetailDisplay
];
\ No newline at end of file
diff --git a/client/src/app/instance/shared-search/detail/pipes/sort-by-detail-display.spec.ts b/client/src/app/instance/search/pipes/sort-by-detail-display.spec.ts
similarity index 92%
rename from client/src/app/instance/shared-search/detail/pipes/sort-by-detail-display.spec.ts
rename to client/src/app/instance/search/pipes/sort-by-detail-display.spec.ts
index f1f948124faf991d70828424ec328f8754811aeb..750ff3eb619b4d01d6b6728b7a30e3592d2ee2aa 100644
--- a/client/src/app/instance/shared-search/detail/pipes/sort-by-detail-display.spec.ts
+++ b/client/src/app/instance/search/pipes/sort-by-detail-display.spec.ts
@@ -1,7 +1,7 @@
import { SortByDetailDisplay } from './sort-by-detail-display';
-import { Attribute } from '../../../../metamodel/models';
+import { Attribute } from '../../../metamodel/models';
-describe('[Instance][SharedSearch][Detail][Pipes] SortByDetailDisplay', () => {
+describe('[Instance][Search][Pipe] SortByDetailDisplay', () => {
let pipe = new SortByDetailDisplay();
it('sorts attributeList by display detail', () => {
diff --git a/client/src/app/instance/shared-search/detail/pipes/sort-by-detail-display.ts b/client/src/app/instance/search/pipes/sort-by-detail-display.ts
similarity index 100%
rename from client/src/app/instance/shared-search/detail/pipes/sort-by-detail-display.ts
rename to client/src/app/instance/search/pipes/sort-by-detail-display.ts
diff --git a/client/src/app/instance/search/search-routing.module.ts b/client/src/app/instance/search/search-routing.module.ts
index 29b3c5b7909bcbf1d7ba41f3364b63c8b18e5416..99db7769547562ba4d0b46fd11db8a51d743f0fb 100644
--- a/client/src/app/instance/search/search-routing.module.ts
+++ b/client/src/app/instance/search/search-routing.module.ts
@@ -15,7 +15,7 @@ import { DatasetComponent } from './containers/dataset.component';
import { CriteriaComponent } from './containers/criteria.component';
import { OutputComponent } from './containers/output.component';
import { ResultComponent } from './containers/result.component';
-import { DetailComponent } from '../shared-search/detail/containers/detail.component';
+import { DetailComponent } from './containers/detail.component';
const routes: Routes = [
{ path: 'detail/:dname/:id', component: DetailComponent },
@@ -46,5 +46,6 @@ export const routedComponents = [
DatasetComponent,
CriteriaComponent,
OutputComponent,
- ResultComponent
+ ResultComponent,
+ DetailComponent
];
diff --git a/client/src/app/instance/shared-search/detail/detail.module.ts b/client/src/app/instance/shared-search/detail/detail.module.ts
deleted file mode 100644
index af987eed26912d826161994901356c3edf6cd762..0000000000000000000000000000000000000000
--- a/client/src/app/instance/shared-search/detail/detail.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * This file is part of Anis Client.
- *
- * @copyright Laboratoire d'Astrophysique de Marseille / CNRS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-import { NgModule } from '@angular/core';
-
-import { SharedModule } from 'src/app/shared/shared.module';
-import { DetailComponent } from './containers/detail.component';
-import { dummiesComponents } from './components';
-import { detailPipes } from './pipes';
-
-@NgModule({
- imports: [
- SharedModule
- ],
- declarations: [
- DetailComponent,
- dummiesComponents,
- detailPipes
- ]
-})
-export class DetailModule { }
diff --git a/client/src/app/instance/shared-search/detail/pipes/index.ts b/client/src/app/instance/shared-search/detail/pipes/index.ts
deleted file mode 100644
index a42bb61221d4720af663e83ca2f4413405bc688d..0000000000000000000000000000000000000000
--- a/client/src/app/instance/shared-search/detail/pipes/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { SortByDetailDisplay } from './sort-by-detail-display';
-
-export const detailPipes = [
- SortByDetailDisplay
-];
diff --git a/client/src/app/instance/shared-search/shared-search.module.ts b/client/src/app/instance/shared-search/shared-search.module.ts
index 061d35abcbd43e1eef08f518ced0d4f14ccc0f52..8d66fd662e112bf97b1832d2c6bfd218ffd5451e 100644
--- a/client/src/app/instance/shared-search/shared-search.module.ts
+++ b/client/src/app/instance/shared-search/shared-search.module.ts
@@ -11,14 +11,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { SharedModule } from 'src/app/shared/shared.module';
-import { DetailModule } from './detail/detail.module';
import { sharedComponents } from './components';
import { sharedPipes } from './pipes';
@NgModule({
imports: [
SharedModule,
- DetailModule,
RouterModule
],
declarations: [
@@ -27,7 +25,6 @@ import { sharedPipes } from './pipes';
],
exports: [
sharedComponents,
- DetailModule,
sharedPipes
]
})
diff --git a/services/requirements.txt b/services/requirements.txt
index 3feb0f5ed88b1bd36d2c1a48dc5cff2800b7ff84..5e563c168233c9989156156f5ca6fcdf3534fb31 100755
--- a/services/requirements.txt
+++ b/services/requirements.txt
@@ -1,6 +1,6 @@
numpy
pytest
-astropy
+astropy==4.3.1
aplpy
flask
flask-cors