From e9069c536b4cb6291bc89a5db6684fdaa46e49b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Tue, 23 Nov 2021 11:45:53 +0100
Subject: [PATCH] Move detail components to search module
---
.../default/default-object.component.html | 0
.../default/default-object.component.spec.ts | 4 +--
.../default/default-object.component.ts | 0
.../components/detail}/default/index.ts | 0
.../components/detail}/index.ts | 2 +-
.../detail}/object-data.component.html | 0
.../detail}/object-data.component.spec.ts | 2 +-
.../detail}/object-data.component.ts | 0
.../components/detail}/spectra/graph/point.ts | 0
.../components/detail}/spectra/graph/rays.ts | 0
.../graph/spectra-graph.component.html | 0
.../graph/spectra-graph.component.scss | 0
.../spectra/graph/spectra-graph.component.ts | 0
.../detail}/spectra/graph/spectra-type.ts | 0
.../components/detail}/spectra/index.ts | 0
.../spectra/spectra-object.component.html | 0
.../spectra/spectra-object.component.scss | 0
.../spectra/spectra-object.component.spec.ts | 8 +++---
.../spectra/spectra-object.component.ts | 0
.../app/instance/search/components/index.ts | 4 ++-
.../containers/detail.component.html | 0
.../containers/detail.component.spec.ts | 8 +++---
.../containers/detail.component.ts | 0
client/src/app/instance/search/pipes/index.ts | 4 ++-
.../pipes/sort-by-detail-display.spec.ts | 4 +--
.../pipes/sort-by-detail-display.ts | 0
.../instance/search/search-routing.module.ts | 5 ++--
.../shared-search/detail/detail.module.ts | 27 -------------------
.../shared-search/detail/pipes/index.ts | 5 ----
.../shared-search/shared-search.module.ts | 3 ---
services/requirements.txt | 2 +-
31 files changed, 24 insertions(+), 54 deletions(-)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/default/default-object.component.html (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/default/default-object.component.spec.ts (85%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/default/default-object.component.ts (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/default/index.ts (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/index.ts (86%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/object-data.component.html (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/object-data.component.spec.ts (96%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/object-data.component.ts (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/graph/point.ts (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/graph/rays.ts (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/graph/spectra-graph.component.html (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/graph/spectra-graph.component.scss (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/graph/spectra-graph.component.ts (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/graph/spectra-type.ts (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/index.ts (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/spectra-object.component.html (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/spectra-object.component.scss (100%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/spectra-object.component.spec.ts (90%)
rename client/src/app/instance/{shared-search/detail/components => search/components/detail}/spectra/spectra-object.component.ts (100%)
rename client/src/app/instance/{shared-search/detail => search}/containers/detail.component.html (100%)
rename client/src/app/instance/{shared-search/detail => search}/containers/detail.component.spec.ts (93%)
rename client/src/app/instance/{shared-search/detail => search}/containers/detail.component.ts (100%)
rename client/src/app/instance/{shared-search/detail => search}/pipes/sort-by-detail-display.spec.ts (92%)
rename client/src/app/instance/{shared-search/detail => search}/pipes/sort-by-detail-display.ts (100%)
delete mode 100644 client/src/app/instance/shared-search/detail/detail.module.ts
delete mode 100644 client/src/app/instance/shared-search/detail/pipes/index.ts
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 e665ccd8..24698efe 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 e0d32c36..6b537aa9 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 852eb96d..aff1478a 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 293a5498..30c1f4d3 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 a0537c99..f57be4d2 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 b85dbe3a..ddaaa851 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 6eaab811..62fb1bc8 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 f1f94812..750ff3eb 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 29b3c5b7..99db7769 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 af987eed..00000000
--- 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 a42bb612..00000000
--- 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 061d35ab..8d66fd66 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 3feb0f5e..5e563c16 100755
--- a/services/requirements.txt
+++ b/services/requirements.txt
@@ -1,6 +1,6 @@
numpy
pytest
-astropy
+astropy==4.3.1
aplpy
flask
flask-cors
--
GitLab