Skip to content
Snippets Groups Projects
Commit 2e287b76 authored by François Agneray's avatar François Agneray
Browse files

Move cone-search components to cone-search module

parent e9069c53
No related branches found
No related tags found
2 merge requests!29Develop,!24Instance refactoring
Showing
with 16 additions and 19 deletions
...@@ -3,9 +3,9 @@ import { Component, Input, ViewChild } from '@angular/core'; ...@@ -3,9 +3,9 @@ import { Component, Input, ViewChild } from '@angular/core';
import { FormGroup, ReactiveFormsModule } from '@angular/forms'; import { FormGroup, ReactiveFormsModule } from '@angular/forms';
import { ConeSearchComponent } from './cone-search.component'; import { ConeSearchComponent } from './cone-search.component';
import { ConeSearch, Resolver } from '../../../store/models'; import { ConeSearch, Resolver } from 'src/app/instance/store/models';
describe('[Instance][SharedSearch][Components][ConeSearch] ConeSearchComponent', () => { describe('[Instance][ConeSearch][Components] ConeSearchComponent', () => {
@Component({ @Component({
selector: `app-host`, selector: `app-host`,
template: ` template: `
......
...@@ -11,7 +11,7 @@ import { Component, Input, Output, EventEmitter, OnChanges, SimpleChanges } from ...@@ -11,7 +11,7 @@ import { Component, Input, Output, EventEmitter, OnChanges, SimpleChanges } from
import { FormGroup, FormControl, Validators } from '@angular/forms'; import { FormGroup, FormControl, Validators } from '@angular/forms';
import { ConeSearch, Resolver } from 'src/app/instance/store/models'; import { ConeSearch, Resolver } from 'src/app/instance/store/models';
import { nanValidator, rangeValidator } from '../../validators'; import { nanValidator, rangeValidator } from '../validators';
/** /**
* @class * @class
......
...@@ -5,10 +5,10 @@ import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angula ...@@ -5,10 +5,10 @@ import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angula
import { of } from 'rxjs'; import { of } from 'rxjs';
import { DecComponent } from './dec.component'; import { DecComponent } from './dec.component';
import { Resolver } from '../../../store/models'; import { Resolver } from 'src/app/instance/store/models';
import { nanValidator, rangeValidator } from '../../validators'; import { nanValidator, rangeValidator } from '../validators';
describe('[Instance][SharedSearch][Components][ConeSearch] DecComponent', () => { describe('[Instance][ConeSearch][Components] DecComponent', () => {
let form = new FormGroup({ let form = new FormGroup({
dec: new FormControl('', [Validators.required, nanValidator, rangeValidator(-90, 90, 'DEC')]), dec: new FormControl('', [Validators.required, nanValidator, rangeValidator(-90, 90, 'DEC')]),
dec_dms: new FormGroup({ dec_dms: new FormGroup({
......
...@@ -5,10 +5,10 @@ import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angula ...@@ -5,10 +5,10 @@ import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angula
import { of } from 'rxjs'; import { of } from 'rxjs';
import { RaComponent } from './ra.component'; import { RaComponent } from './ra.component';
import { Resolver } from '../../../store/models'; import { Resolver } from 'src/app/instance/store/models';
import { nanValidator, rangeValidator } from '../../validators'; import { nanValidator, rangeValidator } from '../validators';
describe('[Instance][SharedSearch][Components][ConeSearch] RaComponent', () => { describe('[Instance][ConeSearch][Components] RaComponent', () => {
let form = new FormGroup({ let form = new FormGroup({
ra: new FormControl('', [Validators.required, nanValidator, rangeValidator(0, 360, 'RA')]), ra: new FormControl('', [Validators.required, nanValidator, rangeValidator(0, 360, 'RA')]),
ra_hms: new FormGroup({ ra_hms: new FormGroup({
......
...@@ -3,7 +3,7 @@ import { ReactiveFormsModule } from '@angular/forms'; ...@@ -3,7 +3,7 @@ import { ReactiveFormsModule } from '@angular/forms';
import { RadiusComponent } from './radius.component'; import { RadiusComponent } from './radius.component';
describe('[Instance][SharedSearch][Components][ConeSearch] RadiusComponent', () => { describe('[Instance][ConeSearch][Components] RadiusComponent', () => {
let component: RadiusComponent; let component: RadiusComponent;
let fixture: ComponentFixture<RadiusComponent>; let fixture: ComponentFixture<RadiusComponent>;
......
...@@ -3,9 +3,9 @@ import { Component, ViewChild } from '@angular/core'; ...@@ -3,9 +3,9 @@ import { Component, ViewChild } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms';
import { ResolverComponent } from './resolver.component'; import { ResolverComponent } from './resolver.component';
import { ConeSearch, Resolver } from '../../../store/models'; import { ConeSearch, Resolver } from 'src/app/instance/store/models';
describe('[Instance][SharedSearch][Components][ConeSearch] ResolverComponent', () => { describe('[Instance][ConeSearch][Components] ResolverComponent', () => {
@Component({ @Component({
selector: `app-host`, selector: `app-host`,
template: ` template: `
......
...@@ -11,8 +11,7 @@ import { NgModule } from '@angular/core'; ...@@ -11,8 +11,7 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { SharedModule } from 'src/app/shared/shared.module'; import { SharedModule } from 'src/app/shared/shared.module';
import { sharedComponents } from './components'; import { coneSearchComponents } from './components';
import { sharedPipes } from './pipes';
@NgModule({ @NgModule({
imports: [ imports: [
...@@ -20,12 +19,10 @@ import { sharedPipes } from './pipes'; ...@@ -20,12 +19,10 @@ import { sharedPipes } from './pipes';
RouterModule RouterModule
], ],
declarations: [ declarations: [
sharedComponents, coneSearchComponents
sharedPipes
], ],
exports: [ exports: [
sharedComponents, coneSearchComponents
sharedPipes
] ]
}) })
export class SharedSearchModule { } export class ConeSearchModule { }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment