From ce25f24ae9adcb40319ac0c9a4900db5efd94de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Tue, 22 Mar 2022 11:14:56 +0100
Subject: [PATCH] Delete samp section from dataset entity
---
.../dataset/dataset-form.component.html | 10 ------
.../dataset/dataset-form.component.ts | 12 -------
.../dataset-by-family.component.spec.ts | 4 ---
.../dataset-card-doc.component.spec.ts | 2 --
.../result/download.component.spec.ts | 12 -------
.../result/reminder.component.spec.ts | 8 -----
.../result/url-display.component.spec.ts | 8 -----
.../components/summary.component.spec.ts | 4 ---
.../src/app/metamodel/models/dataset.model.ts | 2 --
client/src/test-data.ts | 6 ----
conf-dev/create-db.sh | 10 +++---
server/src/Action/DatasetAction.php | 2 --
server/src/Action/DatasetListAction.php | 2 --
server/src/Entity/Dataset.php | 36 -------------------
server/tests/Action/DatasetActionTest.php | 2 --
server/tests/Action/DatasetListActionTest.php | 2 --
16 files changed, 5 insertions(+), 117 deletions(-)
diff --git a/client/src/app/admin/instance/dataset/components/dataset/dataset-form.component.html b/client/src/app/admin/instance/dataset/components/dataset/dataset-form.component.html
index 082327ae..77981007 100644
--- a/client/src/app/admin/instance/dataset/components/dataset/dataset-form.component.html
+++ b/client/src/app/admin/instance/dataset/components/dataset/dataset-form.component.html
@@ -142,16 +142,6 @@
<label class="custom-control-label" for="server_link_opened">Opened</label>
</div>
</accordion-group>
- <accordion-group heading="Samp" [isOpen]="true">
- <div class="custom-control custom-switch">
- <input class="custom-control-input" type="checkbox" id="samp_enabled" name="samp_enabled" formControlName="samp_enabled" (change)="checkSampDisablOpened()">
- <label class="custom-control-label" for="samp_enabled">Enabled</label>
- </div>
- <div class="custom-control custom-switch">
- <input class="custom-control-input" type="checkbox" id="samp_opened" name="samp_opened" formControlName="samp_opened">
- <label class="custom-control-label" for="samp_opened">Opened</label>
- </div>
- </accordion-group>
<accordion-group heading="Datatable" [isOpen]="true">
<div class="custom-control custom-switch">
<input class="custom-control-input" type="checkbox" id="datatable_enabled" name="datatable_enabled" formControlName="datatable_enabled" (change)="checkDatatableDisablOpened()">
diff --git a/client/src/app/admin/instance/dataset/components/dataset/dataset-form.component.ts b/client/src/app/admin/instance/dataset/components/dataset/dataset-form.component.ts
index 9961700e..9041adca 100644
--- a/client/src/app/admin/instance/dataset/components/dataset/dataset-form.component.ts
+++ b/client/src/app/admin/instance/dataset/components/dataset/dataset-form.component.ts
@@ -60,8 +60,6 @@ export class DatasetFormComponent implements OnInit, OnChanges {
summary_opened: new FormControl({value: false, disabled: true}),
server_link_enabled: new FormControl(false),
server_link_opened: new FormControl({value: false, disabled: true}),
- samp_enabled: new FormControl(false),
- samp_opened: new FormControl({value: false, disabled: true}),
datatable_enabled: new FormControl(true),
datatable_opened: new FormControl(true),
datatable_selectable_rows: new FormControl(false),
@@ -83,7 +81,6 @@ export class DatasetFormComponent implements OnInit, OnChanges {
this.checkDownloadDisableOpened();
this.checkSummaryDisableOpened();
this.checkServerLinkDisableOpened();
- this.checkSampDisablOpened();
this.checkDatatableDisablOpened();
}
@@ -180,15 +177,6 @@ export class DatasetFormComponent implements OnInit, OnChanges {
}
}
- checkSampDisablOpened() {
- if (this.form.controls.samp_enabled.value) {
- this.form.controls.samp_opened.enable();
- } else {
- this.form.controls.samp_opened.setValue(false);
- this.form.controls.samp_opened.disable();
- }
- }
-
checkDatatableDisablOpened() {
if (this.form.controls.datatable_enabled.value) {
this.form.controls.datatable_opened.enable();
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 460095fc..17cec1cf 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
@@ -35,8 +35,6 @@ const DATASET_LIST: Dataset[] = [
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
@@ -68,8 +66,6 @@ const DATASET_LIST: Dataset[] = [
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/app/instance/documentation/components/dataset-card-doc.component.spec.ts b/client/src/app/instance/documentation/components/dataset-card-doc.component.spec.ts
index b0730d6d..580c08bb 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
@@ -42,8 +42,6 @@ const DATASET: Dataset = {
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/app/instance/search/components/result/download.component.spec.ts b/client/src/app/instance/search/components/result/download.component.spec.ts
index ad2261ff..2a53a461 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
@@ -59,8 +59,6 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
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
@@ -92,8 +90,6 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
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
@@ -134,8 +130,6 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
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
@@ -167,8 +161,6 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
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
@@ -209,8 +201,6 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
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
@@ -242,8 +232,6 @@ describe('[Instance][Search][Component][Result] DownloadComponent', () => {
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/app/instance/search/components/result/reminder.component.spec.ts b/client/src/app/instance/search/components/result/reminder.component.spec.ts
index 400bfa83..b39d4319 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
@@ -58,8 +58,6 @@ describe('[Instance][Search][Component][Result] ReminderComponent', () => {
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
@@ -91,8 +89,6 @@ describe('[Instance][Search][Component][Result] ReminderComponent', () => {
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
@@ -133,8 +129,6 @@ describe('[Instance][Search][Component][Result] ReminderComponent', () => {
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
@@ -166,8 +160,6 @@ describe('[Instance][Search][Component][Result] ReminderComponent', () => {
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/app/instance/search/components/result/url-display.component.spec.ts b/client/src/app/instance/search/components/result/url-display.component.spec.ts
index 7f7d3d74..93e9eaa1 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
@@ -62,8 +62,6 @@ describe('[Instance][Search][Component][Result] UrlDisplayComponent', () => {
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
@@ -95,8 +93,6 @@ describe('[Instance][Search][Component][Result] UrlDisplayComponent', () => {
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
@@ -137,8 +133,6 @@ describe('[Instance][Search][Component][Result] UrlDisplayComponent', () => {
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
@@ -170,8 +164,6 @@ describe('[Instance][Search][Component][Result] UrlDisplayComponent', () => {
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/app/instance/search/components/summary.component.spec.ts b/client/src/app/instance/search/components/summary.component.spec.ts
index 9681a025..52daf77c 100644
--- a/client/src/app/instance/search/components/summary.component.spec.ts
+++ b/client/src/app/instance/search/components/summary.component.spec.ts
@@ -58,8 +58,6 @@ describe('[Instance][Search][Component] SummaryComponent', () => {
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
@@ -91,8 +89,6 @@ describe('[Instance][Search][Component] SummaryComponent', () => {
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/app/metamodel/models/dataset.model.ts b/client/src/app/metamodel/models/dataset.model.ts
index 4b9b5d1d..43a0dd38 100644
--- a/client/src/app/metamodel/models/dataset.model.ts
+++ b/client/src/app/metamodel/models/dataset.model.ts
@@ -36,8 +36,6 @@ export interface Dataset {
summary_opened: boolean;
server_link_enabled: boolean;
server_link_opened: boolean;
- samp_enabled: boolean;
- samp_opened: boolean;
datatable_enabled: boolean;
datatable_opened: boolean;
datatable_selectable_rows: boolean;
diff --git a/client/src/test-data.ts b/client/src/test-data.ts
index 3a3ec175..61829446 100644
--- a/client/src/test-data.ts
+++ b/client/src/test-data.ts
@@ -215,8 +215,6 @@ export const DATASET_LIST: Dataset[] = [
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
@@ -248,8 +246,6 @@ export const DATASET_LIST: Dataset[] = [
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
@@ -283,8 +279,6 @@ export const DATASET: Dataset = {
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/conf-dev/create-db.sh b/conf-dev/create-db.sh
index 83bd0d4d..166ddda8 100644
--- a/conf-dev/create-db.sh
+++ b/conf-dev/create-db.sh
@@ -73,11 +73,11 @@ curl -d '{"label":"SVOM dataset family","display":20,"opened":true}' --header 'C
curl -d '{"label":"IRiS dataset family","display":30,"opened":true}' --header 'Content-Type: application/json' -X POST http://localhost/instance/default/dataset-family
# Add datasets
-curl -d '{"name":"vipers_dr2_w1","table_ref":"aspic_vipers_dr2_w1","label":"VIPERS-W1 (DR2)","description":"VIPERS W1 dataset","display":10,"data_path":"\/ASPIC\/VIPERS_DR2","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"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/1/dataset
-curl -d '{"name":"sp_cards","table_ref":"sp_cards","label":"SP Metadata","description":"Contains metadata of scientific products (Core Program & General Program)","display":30,"data_path":"","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":"svom"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/2/dataset
-curl -d '{"name":"observations","table_ref":"v_observation","label":"IRiS obs","description":"IRiS observations","display":10,"data_path":"\/IRIS\/observations","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":"iris"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/3/dataset
-curl -d '{"name":"vvds_f02_udeep","table_ref":"aspic_vvds_f02_udeep","label":"VVDS2h Ultra Deep","description":"VVDS2h Ultra Deep","display":20,"data_path":"","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"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/1/dataset
-curl -d '{"name":"products","table_ref":"products","label":"Scientific Products","description":"SR3 & SR4 products list","display":20,"data_path":"","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":"svom"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/2/dataset
+curl -d '{"name":"vipers_dr2_w1","table_ref":"aspic_vipers_dr2_w1","label":"VIPERS-W1 (DR2)","description":"VIPERS W1 dataset","display":10,"data_path":"\/ASPIC\/VIPERS_DR2","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,"datatable_enabled":true,"datatable_opened":false,"datatable_selectable_rows":false,"survey_name":"anis_survey"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/1/dataset
+curl -d '{"name":"sp_cards","table_ref":"sp_cards","label":"SP Metadata","description":"Contains metadata of scientific products (Core Program & General Program)","display":30,"data_path":"","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,"datatable_enabled":true,"datatable_opened":false,"datatable_selectable_rows":false,"survey_name":"svom"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/2/dataset
+curl -d '{"name":"observations","table_ref":"v_observation","label":"IRiS obs","description":"IRiS observations","display":10,"data_path":"\/IRIS\/observations","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,"datatable_enabled":true,"datatable_opened":false,"datatable_selectable_rows":false,"survey_name":"iris"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/3/dataset
+curl -d '{"name":"vvds_f02_udeep","table_ref":"aspic_vvds_f02_udeep","label":"VVDS2h Ultra Deep","description":"VVDS2h Ultra Deep","display":20,"data_path":"","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,"datatable_enabled":true,"datatable_opened":false,"datatable_selectable_rows":false,"survey_name":"anis_survey"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/1/dataset
+curl -d '{"name":"products","table_ref":"products","label":"Scientific Products","description":"SR3 & SR4 products list","display":20,"data_path":"","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,"datatable_enabled":true,"datatable_opened":false,"datatable_selectable_rows":false,"survey_name":"svom"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/2/dataset
# Add vipers_dr2_w1 attributes
curl -d '{"label":"Default","display":10,"opened":true}' --header 'Content-Type: application/json' -X POST http://localhost/dataset/vipers_dr2_w1/criteria-family
diff --git a/server/src/Action/DatasetAction.php b/server/src/Action/DatasetAction.php
index 55783522..bef65e74 100644
--- a/server/src/Action/DatasetAction.php
+++ b/server/src/Action/DatasetAction.php
@@ -137,8 +137,6 @@ final class DatasetAction extends AbstractAction
$dataset->setSummaryOpened($parsedBody['summary_opened']);
$dataset->setServerLinkEnabled($parsedBody['server_link_enabled']);
$dataset->setServerLinkOpened($parsedBody['server_link_opened']);
- $dataset->setSampEnabled($parsedBody['samp_enabled']);
- $dataset->setSampOpened($parsedBody['samp_opened']);
$dataset->setDatatableEnabled($parsedBody['datatable_enabled']);
$dataset->setDatatableOpened($parsedBody['datatable_opened']);
$dataset->setDatatableSelectableRows($parsedBody['datatable_selectable_rows']);
diff --git a/server/src/Action/DatasetListAction.php b/server/src/Action/DatasetListAction.php
index fca5a341..870ef820 100644
--- a/server/src/Action/DatasetListAction.php
+++ b/server/src/Action/DatasetListAction.php
@@ -141,8 +141,6 @@ final class DatasetListAction extends AbstractAction
$dataset->setSummaryOpened($parsedBody['summary_opened']);
$dataset->setServerLinkEnabled($parsedBody['server_link_enabled']);
$dataset->setServerLinkOpened($parsedBody['server_link_opened']);
- $dataset->setSampEnabled($parsedBody['samp_enabled']);
- $dataset->setSampOpened($parsedBody['samp_opened']);
$dataset->setDatatableEnabled($parsedBody['datatable_enabled']);
$dataset->setDatatableOpened($parsedBody['datatable_opened']);
$dataset->setDatatableSelectableRows($parsedBody['datatable_selectable_rows']);
diff --git a/server/src/Entity/Dataset.php b/server/src/Entity/Dataset.php
index de128dbc..1b90e75e 100644
--- a/server/src/Entity/Dataset.php
+++ b/server/src/Entity/Dataset.php
@@ -185,20 +185,6 @@ class Dataset implements \JsonSerializable
*/
protected $serverLinkOpened;
- /**
- * @var bool
- *
- * @Column(type="boolean", name="samp_enabled", nullable=false)
- */
- protected $sampEnabled;
-
- /**
- * @var bool
- *
- * @Column(type="boolean", name="samp_opened", nullable=false)
- */
- protected $sampOpened;
-
/**
* @var bool
*
@@ -479,26 +465,6 @@ class Dataset implements \JsonSerializable
$this->serverLinkOpened = $serverLinkOpened;
}
- public function getSampEnabled()
- {
- return $this->sampEnabled;
- }
-
- public function setSampEnabled($sampEnabled)
- {
- $this->sampEnabled = $sampEnabled;
- }
-
- public function getSampOpened()
- {
- return $this->sampOpened;
- }
-
- public function setSampOpened($sampOpened)
- {
- $this->sampOpened = $sampOpened;
- }
-
public function getDatatableEnabled()
{
return $this->datatableEnabled;
@@ -580,8 +546,6 @@ class Dataset implements \JsonSerializable
'summary_opened' => $this->getSummaryOpened(),
'server_link_enabled' => $this->getServerLinkEnabled(),
'server_link_opened' => $this->getServerLinkOpened(),
- 'samp_enabled' => $this->getSampEnabled(),
- 'samp_opened' => $this->getSampOpened(),
'datatable_enabled' => $this->getDatatableEnabled(),
'datatable_opened' => $this->getDatatableOpened(),
'datatable_selectable_rows' => $this->getDatatableSelectableRows(),
diff --git a/server/tests/Action/DatasetActionTest.php b/server/tests/Action/DatasetActionTest.php
index e703159f..dc291d4f 100644
--- a/server/tests/Action/DatasetActionTest.php
+++ b/server/tests/Action/DatasetActionTest.php
@@ -143,8 +143,6 @@ final class DatasetActionTest extends TestCase
'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,
diff --git a/server/tests/Action/DatasetListActionTest.php b/server/tests/Action/DatasetListActionTest.php
index b938edbd..6d77b5b6 100644
--- a/server/tests/Action/DatasetListActionTest.php
+++ b/server/tests/Action/DatasetListActionTest.php
@@ -139,8 +139,6 @@ final class DatasetListActionTest extends TestCase
'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,
--
GitLab