From 68f98fe1c10e0c383441740cab52ed16c8d1b85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Wed, 16 Mar 2022 15:57:44 +0100
Subject: [PATCH] Fixed tests (client + server)
---
.../dataset-by-family.component.spec.ts | 126 ++----
.../dataset-card-doc.component.spec.ts | 70 +---
.../result/download.component.spec.ts | 378 ++++++------------
.../result/reminder.component.spec.ts | 252 ++++--------
.../components/result/samp.component.spec.ts | 252 ++++--------
.../result/url-display.component.spec.ts | 252 ++++--------
.../components/summary.component.spec.ts | 126 ++----
.../effects/search-multiple.effects.spec.ts | 63 +--
client/src/test-data.ts | 191 +++------
server/src/Entity/Dataset.php | 8 +-
server/src/Search/Query/ConeSearch.php | 7 +-
server/tests/Action/DatasetActionTest.php | 24 +-
server/tests/Action/DatasetListActionTest.php | 24 +-
server/tests/Handlers/LogErrorHandlerTest.php | 2 +-
server/tests/Search/Query/ConeSearchTest.php | 23 +-
15 files changed, 626 insertions(+), 1172 deletions(-)
diff --git a/client/src/app/instance/documentation/components/dataset-by-family.component.spec.ts b/client/src/app/instance/documentation/components/dataset-by-family.component.spec.ts
index 02bc58e3..460095fc 100644
--- a/client/src/app/instance/documentation/components/dataset-by-family.component.spec.ts
+++ b/client/src/app/instance/documentation/components/dataset-by-family.component.spec.ts
@@ -19,48 +19,27 @@ const DATASET_LIST: Dataset[] = [
id_dataset_family: 1,
public: true,
full_data_path: '/data/path1',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'myDataset2',
@@ -73,48 +52,27 @@ const DATASET_LIST: Dataset[] = [
id_dataset_family: 1,
public: true,
full_data_path: '/data/path2',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
const DATASET_FAMILY_LIST: DatasetFamily[] = [
diff --git a/client/src/app/instance/documentation/components/dataset-card-doc.component.spec.ts b/client/src/app/instance/documentation/components/dataset-card-doc.component.spec.ts
index e9117ad0..b0730d6d 100644
--- a/client/src/app/instance/documentation/components/dataset-card-doc.component.spec.ts
+++ b/client/src/app/instance/documentation/components/dataset-card-doc.component.spec.ts
@@ -26,48 +26,27 @@ const DATASET: Dataset = {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
};
describe('[Instance][Documentation][Component] DatasetCardDocComponent', () => {
@@ -96,11 +75,4 @@ describe('[Instance][Documentation][Component] DatasetCardDocComponent', () => {
it('should create the component', () => {
expect(component).toBeDefined();
});
-
- // it('#selectDataset() should navigate to the right page', () => {
- // const spy = jest.spyOn(router, 'navigate');
- // component.selectDataset('myDataset');
- // expect(spy).toHaveBeenCalledTimes(1);
- // expect(spy).toHaveBeenCalledWith(['/instance/myInstance/documentation/myDataset']);
- // });
});
diff --git a/client/src/app/instance/search/components/result/download.component.spec.ts b/client/src/app/instance/search/components/result/download.component.spec.ts
index dace40ba..ad2261ff 100644
--- a/client/src/app/instance/search/components/result/download.component.spec.ts
+++ b/client/src/app/instance/search/components/result/download.component.spec.ts
@@ -43,48 +43,27 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: false,
- summary_opened: false
- },
- server_link: {
- server_link_enabled: false,
- server_link_opened: true
- },
- samp: {
- samp_enabled: false,
- samp_opened: false
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: false,
+ summary_opened: false,
+ server_link_enabled: false,
+ server_link_opened: true,
+ samp_enabled: false,
+ samp_opened: false,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -97,48 +76,27 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: false,
- download_opened: false,
- download_csv: false,
- download_ascii: false,
- download_vo: false,
- download_archive: false
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: false,
+ download_opened: false,
+ download_csv: false,
+ download_ascii: false,
+ download_vo: false,
+ download_archive: false,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
@@ -160,48 +118,27 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: false,
- summary_opened: false
- },
- server_link: {
- server_link_enabled: false,
- server_link_opened: false
- },
- samp: {
- samp_enabled: false,
- samp_opened: false
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: false,
+ summary_opened: false,
+ server_link_enabled: false,
+ server_link_opened: false,
+ samp_enabled: false,
+ samp_opened: false,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -214,48 +151,27 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: false,
- download_opened: false,
- download_csv: false,
- download_ascii: false,
- download_vo: false,
- download_archive: false
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: false,
+ download_opened: false,
+ download_csv: false,
+ download_ascii: false,
+ download_vo: false,
+ download_archive: false,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
@@ -277,48 +193,27 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: false,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: false,
- summary_opened: false
- },
- server_link: {
- server_link_enabled: false,
- server_link_opened: false
- },
- samp: {
- samp_enabled: false,
- samp_opened: false
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: false,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: false,
+ summary_opened: false,
+ server_link_enabled: false,
+ server_link_opened: false,
+ samp_enabled: false,
+ samp_opened: false,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -331,48 +226,27 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: false,
- download_opened: false,
- download_csv: false,
- download_ascii: false,
- download_vo: false,
- download_archive: false
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: false,
+ download_opened: false,
+ download_csv: false,
+ download_ascii: false,
+ download_vo: false,
+ download_archive: false,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
diff --git a/client/src/app/instance/search/components/result/reminder.component.spec.ts b/client/src/app/instance/search/components/result/reminder.component.spec.ts
index 9a639c1f..400bfa83 100644
--- a/client/src/app/instance/search/components/result/reminder.component.spec.ts
+++ b/client/src/app/instance/search/components/result/reminder.component.spec.ts
@@ -42,48 +42,27 @@ describe('[Instance][Search][Component][Result] ReminderComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: false,
- summary_opened: false
- },
- server_link: {
- server_link_enabled: false,
- server_link_opened: true
- },
- samp: {
- samp_enabled: false,
- samp_opened: false
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: false,
+ summary_opened: false,
+ server_link_enabled: false,
+ server_link_opened: true,
+ samp_enabled: false,
+ samp_opened: false,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -96,48 +75,27 @@ describe('[Instance][Search][Component][Result] ReminderComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
@@ -159,48 +117,27 @@ describe('[Instance][Search][Component][Result] ReminderComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: false,
- summary_opened: false
- },
- server_link: {
- server_link_enabled: false,
- server_link_opened: false
- },
- samp: {
- samp_enabled: false,
- samp_opened: false
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: false,
+ summary_opened: false,
+ server_link_enabled: false,
+ server_link_opened: false,
+ samp_enabled: false,
+ samp_opened: false,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -213,48 +150,27 @@ describe('[Instance][Search][Component][Result] ReminderComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
diff --git a/client/src/app/instance/search/components/result/samp.component.spec.ts b/client/src/app/instance/search/components/result/samp.component.spec.ts
index dfb4e4f0..fd6f128f 100644
--- a/client/src/app/instance/search/components/result/samp.component.spec.ts
+++ b/client/src/app/instance/search/components/result/samp.component.spec.ts
@@ -38,48 +38,27 @@ describe('[Instance][Search][Component][Result] SampComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: false,
- server_link_opened: true
- },
- samp: {
- samp_enabled: false,
- samp_opened: false
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: false,
+ server_link_opened: true,
+ samp_enabled: false,
+ samp_opened: false,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -92,48 +71,27 @@ describe('[Instance][Search][Component][Result] SampComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
@@ -155,48 +113,27 @@ describe('[Instance][Search][Component][Result] SampComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: false,
- server_link_opened: false
- },
- samp: {
- samp_enabled: false,
- samp_opened: false
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: false,
+ server_link_opened: false,
+ samp_enabled: false,
+ samp_opened: false,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -209,48 +146,27 @@ describe('[Instance][Search][Component][Result] SampComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
diff --git a/client/src/app/instance/search/components/result/url-display.component.spec.ts b/client/src/app/instance/search/components/result/url-display.component.spec.ts
index 5d47e352..7f7d3d74 100644
--- a/client/src/app/instance/search/components/result/url-display.component.spec.ts
+++ b/client/src/app/instance/search/components/result/url-display.component.spec.ts
@@ -46,48 +46,27 @@ describe('[Instance][Search][Component][Result] UrlDisplayComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: false,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: false,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -100,48 +79,27 @@ describe('[Instance][Search][Component][Result] UrlDisplayComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
@@ -163,48 +121,27 @@ describe('[Instance][Search][Component][Result] UrlDisplayComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: false,
- server_link_opened: false
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: false,
+ server_link_opened: false,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -217,48 +154,27 @@ describe('[Instance][Search][Component][Result] UrlDisplayComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image1'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
diff --git a/client/src/app/instance/search/components/summary.component.spec.ts b/client/src/app/instance/search/components/summary.component.spec.ts
index 9d5c4d91..9681a025 100644
--- a/client/src/app/instance/search/components/summary.component.spec.ts
+++ b/client/src/app/instance/search/components/summary.component.spec.ts
@@ -42,48 +42,27 @@ describe('[Instance][Search][Component] SummaryComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '',
- config: {
- images: [],
- survey: {
- survey_enabled: true,
- survey_label: ''
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: []
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: '',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -96,48 +75,27 @@ describe('[Instance][Search][Component] SummaryComponent', () => {
id_dataset_family: 1,
public: true,
full_data_path: '',
- config: {
- images: [],
- survey: {
- survey_enabled: true,
- survey_label: ''
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: []
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: '',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
];
component.datasetSelected = 'myDataset';
diff --git a/client/src/app/instance/store/effects/search-multiple.effects.spec.ts b/client/src/app/instance/store/effects/search-multiple.effects.spec.ts
index ca8a91b2..229b5d5e 100644
--- a/client/src/app/instance/store/effects/search-multiple.effects.spec.ts
+++ b/client/src/app/instance/store/effects/search-multiple.effects.spec.ts
@@ -244,48 +244,27 @@ describe('[Instance][Store] SearchMultipleEffects', () => {
id_dataset_family: 1,
public: true,
full_data_path: '',
- config: {
- images: [],
- survey: {
- survey_enabled: true,
- survey_label: ''
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: []
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: '',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
}
]
);
diff --git a/client/src/test-data.ts b/client/src/test-data.ts
index 61fdbda4..2971799e 100644
--- a/client/src/test-data.ts
+++ b/client/src/test-data.ts
@@ -196,48 +196,27 @@ export const DATASET_LIST: Dataset[] = [
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
},
{
name: 'anotherDataset',
@@ -250,49 +229,28 @@ export const DATASET_LIST: Dataset[] = [
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: false,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
- },
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: false,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
+ }
];
export const DATASET: Dataset = {
@@ -306,48 +264,27 @@ export const DATASET: Dataset = {
id_dataset_family: 1,
public: true,
full_data_path: '/data/path',
- config: {
- images: ['image'],
- survey: {
- survey_enabled: true,
- survey_label: 'More about this survey'
- },
- cone_search: {
- cone_search_enabled: true,
- cone_search_opened: true,
- cone_search_column_ra: 1,
- cone_search_column_dec: 2,
- cone_search_plot_enabled: true,
- cone_search_sdss_enabled: true,
- cone_search_sdss_display: 1,
- cone_search_background: [{ id: 1, enabled: true, display: 1 }]
- },
- download: {
- download_enabled: true,
- download_opened: true,
- download_csv: true,
- download_ascii: true,
- download_vo: true,
- download_archive: true
- },
- summary: {
- summary_enabled: true,
- summary_opened: true
- },
- server_link: {
- server_link_enabled: true,
- server_link_opened: true
- },
- samp: {
- samp_enabled: true,
- samp_opened: true
- },
- datatable: {
- datatable_enabled: true,
- datatable_opened: true,
- datatable_selectable_rows: true
- }
- }
+ info_survey_enabled: true,
+ info_survey_label: 'More about this survey',
+ cone_search_enabled: true,
+ cone_search_opened: true,
+ cone_search_column_ra: 1,
+ cone_search_column_dec: 2,
+ download_enabled: true,
+ download_opened: true,
+ download_csv: true,
+ download_ascii: true,
+ download_vo: true,
+ download_archive: true,
+ summary_enabled: true,
+ summary_opened: true,
+ server_link_enabled: true,
+ server_link_opened: true,
+ samp_enabled: true,
+ samp_opened: true,
+ datatable_enabled: true,
+ datatable_opened: true,
+ datatable_selectable_rows: true
};
export const ATTRIBUTE_LIST: Attribute[] = [
diff --git a/server/src/Entity/Dataset.php b/server/src/Entity/Dataset.php
index db0e655e..de128dbc 100644
--- a/server/src/Entity/Dataset.php
+++ b/server/src/Entity/Dataset.php
@@ -102,16 +102,16 @@ class Dataset implements \JsonSerializable
protected $coneSearchOpened;
/**
- * @var string
+ * @var int
*
- * @Column(type="string", name="cone_search_column_ra", nullable=true)
+ * @Column(type="integer", name="cone_search_column_ra", nullable=true)
*/
protected $coneSearchColumnRa;
/**
- * @var string
+ * @var int
*
- * @Column(type="string", name="cone_search_column_dec", nullable=true)
+ * @Column(type="integer", name="cone_search_column_dec", nullable=true)
*/
protected $coneSearchColumnDec;
diff --git a/server/src/Search/Query/ConeSearch.php b/server/src/Search/Query/ConeSearch.php
index 4d4cee16..b0e514b0 100644
--- a/server/src/Search/Query/ConeSearch.php
+++ b/server/src/Search/Query/ConeSearch.php
@@ -43,14 +43,13 @@ class ConeSearch extends AbstractQueryPart
$ra = floatval($ra);
$dec = floatval($dec);
$radius = floatval($radius);
- $coneSearchConfig = $dataset->getConfig()['cone_search'];
- if ($coneSearchConfig['cone_search_enabled'] !== true) {
+ if ($dataset->getConeSearchEnabled() !== true) {
throw SearchQueryException::coneSearchUnavailable();
}
- $attributeRa = $this->getAttribute($dataset, $coneSearchConfig['cone_search_column_ra']);
- $attributeDec = $this->getAttribute($dataset, $coneSearchConfig['cone_search_column_dec']);
+ $attributeRa = $this->getAttribute($dataset, $dataset->getConeSearchColumnRa());
+ $attributeDec = $this->getAttribute($dataset, $dataset->getConeSearchColumnDec());
$columnRa = $dataset->getTableRef() . '.' . $attributeRa->getName();
$columnDec = $dataset->getTableRef() . '.' . $attributeDec->getName();
diff --git a/server/tests/Action/DatasetActionTest.php b/server/tests/Action/DatasetActionTest.php
index f062fa39..e694344e 100644
--- a/server/tests/Action/DatasetActionTest.php
+++ b/server/tests/Action/DatasetActionTest.php
@@ -125,11 +125,29 @@ final class DatasetActionTest extends TestCase
'label' => 'Dataset1 label modified',
'description' => 'Dataset1 description',
'display' => 20,
- 'count' => 5000,
- 'vo' => false,
'data_path' => '/mnt/dataset1',
- 'config' => '{}',
'public' => true,
+ 'info_survey_enabled' => true,
+ 'info_survey_label' => "More about this survey",
+ 'cone_search_enabled' => false,
+ 'cone_search_opened' => true,
+ 'cone_search_column_ra' => null,
+ 'cone_search_column_dec' => null,
+ 'download_enabled' => true,
+ 'download_opened' => false,
+ 'download_csv' => true,
+ 'download_ascii' => true,
+ 'download_vo' => false,
+ 'download_archive' => true,
+ 'summary_enabled' => true,
+ 'summary_opened' => false,
+ 'server_link_enabled' => false,
+ 'server_link_opened' => false,
+ 'samp_enabled' => false,
+ 'samp_opened' => false,
+ 'datatable_enabled' => true,
+ 'datatable_opened' => false,
+ 'datatable_selectable_rows' => false,
'id_dataset_family' => 1
);
}
diff --git a/server/tests/Action/DatasetListActionTest.php b/server/tests/Action/DatasetListActionTest.php
index 51a5a343..e9627003 100644
--- a/server/tests/Action/DatasetListActionTest.php
+++ b/server/tests/Action/DatasetListActionTest.php
@@ -121,11 +121,29 @@ final class DatasetListActionTest extends TestCase
'label' => 'Dataset1 label',
'description' => 'Dataset1 description',
'display' => 10,
- 'count' => 10000,
- 'vo' => false,
'data_path' => '/mnt/dataset1',
- 'config' => '{}',
'public' => true,
+ 'info_survey_enabled' => true,
+ 'info_survey_label' => "More about this survey",
+ 'cone_search_enabled' => false,
+ 'cone_search_opened' => true,
+ 'cone_search_column_ra' => null,
+ 'cone_search_column_dec' => null,
+ 'download_enabled' => true,
+ 'download_opened' => false,
+ 'download_csv' => true,
+ 'download_ascii' => true,
+ 'download_vo' => false,
+ 'download_archive' => true,
+ 'summary_enabled' => true,
+ 'summary_opened' => false,
+ 'server_link_enabled' => false,
+ 'server_link_opened' => false,
+ 'samp_enabled' => false,
+ 'samp_opened' => false,
+ 'datatable_enabled' => true,
+ 'datatable_opened' => false,
+ 'datatable_selectable_rows' => false,
'survey_name' => 'anis_survey',
'id_dataset_family' => 1
);
diff --git a/server/tests/Handlers/LogErrorHandlerTest.php b/server/tests/Handlers/LogErrorHandlerTest.php
index c70c0f9c..66ed02ac 100644
--- a/server/tests/Handlers/LogErrorHandlerTest.php
+++ b/server/tests/Handlers/LogErrorHandlerTest.php
@@ -41,7 +41,7 @@ final class LogErrorHandlerTest extends TestCase
{
$logger = $this->createMock(LoggerInterface::class);
$logger->expects($this->once())
- ->method('info');
+ ->method('error');
$this->logErrorHandler->setLogger($logger);
$logError = self::getMethod('logError');
diff --git a/server/tests/Search/Query/ConeSearchTest.php b/server/tests/Search/Query/ConeSearchTest.php
index c0bf2109..dda9d59f 100644
--- a/server/tests/Search/Query/ConeSearchTest.php
+++ b/server/tests/Search/Query/ConeSearchTest.php
@@ -32,12 +32,10 @@ final class ConeSearchTest extends TestCase
$dec = $this->createMock(Attribute::class);
$dec->method('getId')->willReturn(3);
$datasetSelected = $this->createMock(Dataset::class);
+ $datasetSelected->method('getConeSearchEnabled')->willReturn(true);
+ $datasetSelected->method('getConeSearchColumnRa')->willReturn(2);
+ $datasetSelected->method('getConeSearchColumnDec')->willReturn(3);
$datasetSelected->method('getAttributes')->willReturn(array($id, $ra, $dec));
- $datasetSelected->method('getConfig')->willReturn(array('cone_search' => array(
- 'cone_search_enabled' => true,
- 'cone_search_column_ra' => 2,
- 'cone_search_column_dec' => 3
- )));
$doctrineQueryBuilder = $this->createMock(DoctrineQueryBuilder::class);
$expr = $this->createMock(ExpressionBuilder::class);
@@ -63,11 +61,8 @@ final class ConeSearchTest extends TestCase
$this->expectException(SearchQueryException::class);
$anisQueryBuilder = $this->createMock(AnisQueryBuilder::class);
$datasetSelected = $this->createMock(Dataset::class);
- $datasetSelected->method('getConfig')->willReturn(array('cone_search' => array(
- 'cone_search_enabled' => false,
- 'cone_search_column_ra' => 2,
- 'cone_search_column_dec' => 3
- )));
+ $datasetSelected->method('getConeSearchEnabled')->willReturn(false);
+
$queryParams = array('cs' => '102.5:0.0:100');
(new ConeSearch())($anisQueryBuilder, $datasetSelected, $queryParams);
}
@@ -81,12 +76,10 @@ final class ConeSearchTest extends TestCase
$dec = $this->createMock(Attribute::class);
$dec->method('getId')->willReturn(3);
$datasetSelected = $this->createMock(Dataset::class);
+ $datasetSelected->method('getConeSearchEnabled')->willReturn(true);
+ $datasetSelected->method('getConeSearchColumnRa')->willReturn(2);
+ $datasetSelected->method('getConeSearchColumnDec')->willReturn(3);
$datasetSelected->method('getAttributes')->willReturn(array($id, $ra, $dec));
- $datasetSelected->method('getConfig')->willReturn(array('cone_search' => array(
- 'cone_search_enabled' => true,
- 'cone_search_column_ra' => 2,
- 'cone_search_column_dec' => 3
- )));
$doctrineQueryBuilder = $this->createMock(DoctrineQueryBuilder::class);
$expr = $this->createMock(ExpressionBuilder::class);
--
GitLab