Update create-db.sh

Makefile

@@ -78,8 +78,8 @@ phpcs:
 	-w /project jakzal/phpqa:php8.0 phpcs --standard=PSR12 --extensions=php --colors src tests
 
 create-db:
-	@docker-compose exec server sh ./conf-dev/init-keycloak.sh
-	@docker-compose exec server sh ./conf-dev/create-db.sh
+	@docker-compose exec server sh /mnt/init-keycloak.sh
+	@docker-compose exec server sh /mnt/create-db.sh
 
 remove-pgdata:
 	@docker volume rm anis-next_pgdata

client/src/app/metamodel/store/models/dataset.model.ts

@@ -11,39 +11,39 @@ export interface Dataset {
     config: {
         images: any[],
         cone_search: {
-            enabled: boolean;
-            opened: boolean;
-            column_ra: number;
-            column_dec: number;
-            plot_enabled: boolean;
-            sdss_enabled: boolean;
-            sdss_display: number;
-            background: {id: number, enabled: boolean, display: number}[];
+            cone_search_enabled: boolean;
+            cone_search_opened: boolean;
+            cone_search_column_ra: number;
+            cone_search_column_dec: number;
+            cone_search_plot_enabled: boolean;
+            cone_search_sdss_enabled: boolean;
+            cone_search_sdss_display: number;
+            cone_search_background: {id: number, enabled: boolean, display: number}[];
         },
         download: {
-            enabled: boolean;
-            opened: boolean;
-            csv: boolean;
-            ascii: boolean;
-            vo: boolean;
-            archive: boolean;
+            download_enabled: boolean;
+            download_opened: boolean;
+            download_csv: boolean;
+            download_ascii: boolean;
+            download_vo: boolean;
+            download_archive: boolean;
         },
         summary: {
-            enabled: boolean;
-            opened: boolean;
+            summary_enabled: boolean;
+            summary_opened: boolean;
         },
         server_link: {
-            enabled: boolean;
-            opened: boolean;
+            server_link_enabled: boolean;
+            server_link_opened: boolean;
         },
         samp: {
-            enabled: boolean;
-            opened: boolean;
+            samp_enabled: boolean;
+            samp_opened: boolean;
         },
         datatable: {
-            enabled: boolean;
-            opened: boolean;
-            selectable_row: boolean;
+            datatable_enabled: boolean;
+            datatable_opened: boolean;
+            datatable_selectable_rows: boolean;
         }
     };
 }

conf-dev/create-db.sh

@@ -59,7 +59,7 @@ curl -d '{"label":"Spectra graph","value":"spectra_graph","display":20,"select_n
 curl -d '{"label":"Test","dbname":"anis_test","dbtype":"pdo_pgsql","dbhost":"db","dbport":5432,"dblogin":"anis","dbpassword":"anis"}' --header 'Content-Type: application/json' -X POST http://localhost/database
 
 # Add default instance
-curl -d '{"name":"default","label":"Default instance","client_url":"http://localhost:4200","config":{"authentication":{"allowed":false},"search":{"allowed":true},"search_multiple":{"allowed":false},"documentation":{"allowed":false}}}' --header 'Content-Type: application/json' -X POST http://localhost/instance
+curl -d '{"name":"default","label":"Default instance","client_url":"http://localhost:4200","config":{"search":{"search_by_criteria_allowed":true,"search_multiple_allowed":false,"search_multiple_all_datasets_selected":false},"documentation":{"documentation_allowed":false}}}' --header 'Content-Type: application/json' -X POST http://localhost/instance
 
 # Add ANIS, SVOM and IRIS surveys
 curl -d '{"name":"anis_survey","label":"ANIS survey","description":"Survey used for testing","link":"https://anis.lam.fr","manager":"F. Agneray","id_database":1}' --header 'Content-Type: application/json' -X POST http://localhost/survey
@@ -72,10 +72,10 @@ curl -d '{"label":"SVOM dataset family","display":20}' --header 'Content-Type: a
 curl -d '{"label":"IRiS dataset family","display":30}' --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","config":{"images":[],"cone_search":{"enabled":false,"opened":true,"column_ra":null,"column_dec":null,"plot_enabled":false,"sdss_enabled":true,"sdss_display":10,"background":[]},"download":{"enabled":true,"opened":false,"csv":true,"ascii":true,"vo":false,"archive":true},"summary":{"enabled":true,"opened":false},"server_link":{"enabled":false,"opened":false},"samp":{"enabled":false,"opened":false},"datatable":{"enabled":true,"opened":false,"selectable_row":false}},"public":true,"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":20,"data_path":"","config":{"images":[],"cone_search":{"enabled":false,"opened":true,"column_ra":null,"column_dec":null,"plot_enabled":false,"sdss_enabled":true,"sdss_display":10,"background":[]},"download":{"enabled":true,"opened":false,"csv":true,"ascii":true,"vo":false,"archive":true},"summary":{"enabled":true,"opened":false},"server_link":{"enabled":false,"opened":false},"samp":{"enabled":false,"opened":false},"datatable":{"enabled":true,"opened":false,"selectable_row":false}},"public":true,"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","config":{"images":[],"cone_search":{"enabled":false,"opened":true,"column_ra":null,"column_dec":null,"plot_enabled":false,"sdss_enabled":true,"sdss_display":10,"background":[]},"download":{"enabled":true,"opened":false,"csv":true,"ascii":true,"vo":false,"archive":true},"summary":{"enabled":true,"opened":false},"server_link":{"enabled":false,"opened":false},"samp":{"enabled":false,"opened":false},"datatable":{"enabled":true,"opened":false,"selectable_row":false}},"public":true,"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":"","config":{"images":[],"cone_search":{"enabled":false,"opened":true,"column_ra":null,"column_dec":null,"plot_enabled":false,"sdss_enabled":true,"sdss_display":10,"background":[]},"download":{"enabled":true,"opened":false,"csv":true,"ascii":true,"vo":false,"archive":true},"summary":{"enabled":true,"opened":false},"server_link":{"enabled":false,"opened":false},"samp":{"enabled":false,"opened":false},"datatable":{"enabled":true,"opened":false,"selectable_row":false}},"public":true,"survey_name":"anis_survey"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/1/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","config":{"images":[],"cone_search":{"cone_search_enabled":false,"cone_search_opened":true,"cone_search_column_ra":null,"cone_search_column_dec":null,"cone_search_plot_enabled":false,"cone_search_sdss_enabled":true,"cone_search_sdss_display":10,"cone_search_background":[]},"download":{"download_enabled":true,"download_opened":false,"download_csv":true,"download_ascii":true,"download_vo":false,"download_archive":true},"summary":{"summary_enabled":true,"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":false,"datatable_selectable_rows":false}},"public":true,"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":20,"data_path":"","config":{"images":[],"cone_search":{"cone_search_enabled":false,"cone_search_opened":true,"cone_search_column_ra":null,"cone_search_column_dec":null,"cone_search_plot_enabled":false,"cone_search_sdss_enabled":true,"cone_search_sdss_display":10,"cone_search_background":[]},"download":{"download_enabled":true,"download_opened":false,"download_csv":true,"download_ascii":true,"download_vo":false,"download_archive":true},"summary":{"summary_enabled":true,"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":false,"datatable_selectable_rows":false}},"public":true,"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","config":{"images":[],"cone_search":{"cone_search_enabled":false,"cone_search_opened":true,"cone_search_column_ra":null,"cone_search_column_dec":null,"cone_search_plot_enabled":false,"cone_search_sdss_enabled":true,"cone_search_sdss_display":10,"cone_search_background":[]},"download":{"download_enabled":true,"download_opened":false,"download_csv":true,"download_ascii":true,"download_vo":false,"download_archive":true},"summary":{"summary_enabled":true,"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":false,"datatable_selectable_rows":false}},"public":true,"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":"","config":{"images":[],"cone_search":{"cone_search_enabled":false,"cone_search_opened":true,"cone_search_column_ra":null,"cone_search_column_dec":null,"cone_search_plot_enabled":false,"cone_search_sdss_enabled":true,"cone_search_sdss_display":10,"cone_search_background":[]},"download":{"download_enabled":true,"download_opened":false,"download_csv":true,"download_ascii":true,"download_vo":false,"download_archive":true},"summary":{"summary_enabled":true,"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":false,"datatable_selectable_rows":false}},"public":true,"survey_name":"anis_survey"}' --header 'Content-Type: application/json' -X POST http://localhost/dataset-family/1/dataset
 
 # Add vipers_dr2_w1 attributes
 curl -d '{"label":"Default","display":10}' --header 'Content-Type: application/json' -X POST http://localhost/dataset/vipers_dr2_w1/criteria-family

docker-compose.yml

@@ -31,7 +31,7 @@ services:
             LOGGER_PATH: "php://stderr"
             LOGGER_LEVEL: "debug"
             TOKEN_ENABLED: 0
-            TOKEN_PUBLIC_KEY_FILE: /project/conf-dev/public_key
+            TOKEN_PUBLIC_KEY_FILE: /mnt/public_key
             TOKEN_ADMIN_ROLE: anis_admin
         ports:
             - 8080:80
@@ -39,9 +39,9 @@ services:
             - ./server:/project
             - ./conf-dev/dev-php.ini:/usr/local/etc/php/conf.d/dev-php.ini
             - ./conf-dev/vhost.conf:/etc/apache2/sites-available/000-default.conf
-            - ./conf-dev/init-keycloak.sh:/project/conf-dev/init-keycloak.sh
-            - ./conf-dev/create-db.sh:/project/conf-dev/create-db.sh
-            - ./conf-dev/public_key:/project/conf-dev/public_key
+            - ./conf-dev/init-keycloak.sh:/mnt/init-keycloak.sh
+            - ./conf-dev/create-db.sh:/mnt/create-db.sh
+            - ./conf-dev/public_key:/mnt/public_key
             - ./data:/data
     keycloak:
         image: jboss/keycloak