Merge branch 'Development'

.gitignore

@@ -37,3 +37,4 @@ dmp-frontend/.vscode/
 *.docx
 
 
+dmp-frontend/package-lock.json

dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java

@@ -26,12 +26,10 @@ import java.util.Map;
 @RequestMapping(value = {"/api"})
 public class Organisations extends BaseController {
 
-    private OrganisationsExternalSourcesModel organisationsExternalSourcesModel;
     private OrganisationsManager organisationsManager;
     @Autowired
-    public Organisations(ApiContext apiContext, OrganisationsExternalSourcesModel organisationsExternalSourcesModel, OrganisationsManager organisationsManager) {
+    public Organisations(ApiContext apiContext, OrganisationsManager organisationsManager) {
         super(apiContext);
-        this.organisationsExternalSourcesModel = organisationsExternalSourcesModel;
         this.organisationsManager = organisationsManager;
     }
 
@@ -41,7 +39,7 @@ public class Organisations extends BaseController {
             @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type
     ) throws HugeResultSet, NoURLFound {
         List<Map<String, String>> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getOrganisations(query, type);
-        OrganisationsExternalSourcesModel organisationsExternalSourcesModel = this.organisationsExternalSourcesModel.fromExternalItem(remoteRepos);
+        OrganisationsExternalSourcesModel organisationsExternalSourcesModel = new OrganisationsExternalSourcesModel().fromExternalItem(remoteRepos);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<OrganisationsExternalSourcesModel>().payload(organisationsExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE));
     }
 

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java

@@ -334,12 +334,15 @@ public class DatasetManager {
             checkDatasetValidation(dataset);
         UserInfo userInfo = apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class).id(principal.getId()).build();
         dataset.setCreator(userInfo);
-        updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
+
         createRegistriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao(), dataset);
         createDataRepositoriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao(), dataset);
         createServicesIfTheyDontExist(dataset);
         createExternalDatasetsIfTheyDontExist(dataset);
-        return apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset);
+        Dataset dataset1 = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset);
+        datasetWizardModel.setId(dataset1.getId());
+        updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
+        return dataset1;
     }
 
     private void checkDatasetValidation(Dataset dataset) throws Exception {

dmp-frontend/src/app/ui/about/about.component.html

@@ -6,8 +6,8 @@
 	</div>
 	<div class="row">
 		<div class="col-md-12">
-			<p>OpenDMP is an online tool in support of automated processes to creating, managing, sharing and linking DMPs with research artifacts they correspond to. It is the joint effort of OpenAIRE and EUDAT to deliver an open platform for Data Management Planning that addresses FAIR and Open best practices and assumes no barriers for its use and adoption. It does so by applying common standards for machine-actionable DMPs as defined by the global research data community of RDA and by communicating and consulting with researchers, research communities and funders to better reflect on their needs.
+			<p>ARGOS is an online tool in support of automated processes to creating, managing, sharing and linking DMPs with research artifacts they correspond to. It is the joint effort of OpenAIRE and EUDAT to deliver an open platform for Data Management Planning that addresses FAIR and Open best practices and assumes no barriers for its use and adoption. It does so by applying common standards for machine-actionable DMPs as defined by the global research data community of RDA and by communicating and consulting with researchers, research communities and funders to better reflect on their needs.
-				<br /><br />OpenDMP provides a flexible environment and an easy interface for users to navigate and use.</p>
+				<br /><br />ARGOS provides a flexible environment and an easy interface for users to navigate and use.</p>
 		</div>
 	</div>
 

dmp-frontend/src/app/ui/auth/login/login.component.scss

@@ -1,6 +1,6 @@
 .login-screen {
   margin-top: 70px;
-  height: calc(100vh - 10px);
+  min-height: calc(100vh - 10px);
 }
 
 .login-card {
@@ -102,7 +102,8 @@
   min-height: 200px;
   padding: 25px;
   border-radius: 3px;
-  background: rgb(0, 112, 192);
+  background: #0c7489;
+  //   background: rgb(0, 112, 192);
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -202,10 +203,9 @@ span.orcidIconMedium {
 
 .login-logo {
   background: url(img/open-dmp.png) no-repeat;
-  width: 370px;
+  width: 273px;
   height: 300px;
   background-size: cover;
-  margin-top: -10em;
 }
 
 .login-bg {

dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html

@@ -16,7 +16,7 @@
 			<div class="col-10 gray-container" >
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.STATUS'| translate}}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
-					<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="0" [checked]="status == 0">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-STATUS.FINALISED' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="null">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button></mat-list-item>
 				</mat-radio-group>

dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts

@@ -43,6 +43,7 @@ import { DatasetService } from '../../../../core/services/dataset/dataset.servic
 export class DatasetCriteriaComponent extends BaseCriteriaComponent implements OnInit {
 
 	@Input() dmpSearchEnabled;
+	@Input() status;
 	public criteria: any;
 	public filteringTagsAsync = false;
 	public filteredTags: ExternalSourceItemModel[];

dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html

@@ -15,7 +15,7 @@
 			<div class="card-body table-responsive">
 				<div class="listing row">
 					<div class="col-3">
-						<app-dataset-criteria-component class="col-auto"></app-dataset-criteria-component>
+						<app-dataset-criteria-component [status]="status" class="col-auto"></app-dataset-criteria-component>
 					</div>
 					<div class="col-9">
 						<div *ngFor="let item of listingItems; let i = index">

dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts

@@ -81,8 +81,8 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 
 				if (this.status != null && this.status == DatasetStatus.Draft) {
 					this.criteria.setCriteria(this.getDraftCriteria());
-					this.refresh();
 					this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
+					this.refresh();
 				}
 			});
 	}

dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html

@@ -1,6 +1,6 @@
 <div class="header-image">
 	<div class="header-text-container">
-		<h3>Welcome to OpenDMP</h3>
+		<h3>Welcome to ARGOS</h3>
 		<h4>Create, Link, Share Data Management Plans</h4>
 	</div>
 </div>

dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html

@@ -7,16 +7,16 @@
 	</div>
 </div>
 <div mat-dialog-content class="row">
-	<h4>What is OpenDMP?</h4>
+	<h4>What is ARGOS?</h4>
-	<p>OpenDMP is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. OpenDMP technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. OpenDMP is comprised of two major features: the OpenDMP template and the Dataset Description.</p>
+	<p>ARGOS is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. ARGOS technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. ARGOS is comprised of two major features: the ARGOS template and the Dataset Description.</p>
 
 	<br />
 	<h4>Who is it for?</h4>
-	<p>OpenDMP is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. OpenDMP may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.</p>
+	<p>ARGOS is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. ARGOS may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.</p>
 
 	<br />
 	<h4>How can I use it?</h4>
-	<p>OpenDMP is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.<br />OpenDMP can be used for:
+	<p>ARGOS is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.<br />ARGOS can be used for:
 		<br /><br /><u style="padding:20px;"> A. viewing/ consulting publicly released DMPs and Dataset Descriptions or Projects corresponding to DMPs</u><br /><br />
 		The tool offers options for publishing DMPs in two modes, private or public. To view public DMPs and Dataset Descriptions, there is no need for login to the platform.
 
@@ -24,7 +24,7 @@
 		The tool helps researchers comply with mandates that may be attached to their grant proposal/ project funding. They can therefore choose from the most suitable to their needs template from the Dataset Descriptions collection and proceed with answering the corresponding questions. Once finalized, researchers can assign a DOI to their DMP, publish and eventually cite it.
 
 		<br /><br /><u style="padding:20px;"> C. practicing in writing DMPs and Dataset Descriptions</u><br /><br />
-		Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), openDMP may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions.
+		Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), ARGOS may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions.
 	</p>
 
 	<br />

dmp-frontend/src/app/ui/sidebar/sidebar.component.css

@@ -2,11 +2,11 @@
 	width: 60px;
 	display: block;
 	max-height: none;
-	margin-left: 100px;
+	margin-left: 50px;
 }
 
 .logo-img img {
-	width: 60px;
+	width: 155px;
 	top: 0px;
 	position: inherit;
 }

dmp-frontend/src/assets/i18n/en.json

@@ -107,12 +107,12 @@
 		"DATASETS": "Dataset Descriptions",
 		"LOGIN": {
 			"TITLE": "Login",
-			"TEXT": "You don't need to have a registered account for OpenDMP"
+			"TEXT": "You don't need to have a registered account for ARGOS"
 		}
 	},
 	"NAV-BAR": {
 		"BREADCRUMB-ROOT": "Dashboard",
-		"TITLE": "OpenDMP",
+		"TITLE": "ARGOS",
 		"GRANTS": "Grants",
 		"GRANT": "Grant",
 		"DMP": "DMP",
@@ -120,7 +120,7 @@
 		"MY-DMPS": "MY DMPs",
 		"DATASETS": "Dataset Descriptions",
 		"DATASET": "Dataset",
-		"PUBLIC-DATASETS": "Explore OpenDMP",
+		"PUBLIC-DATASETS": "Explore ARGOS",
 		"USERS": "Users",
 		"DATASETS-ADMIN": "Dataset Templates",
 		"DMP-PROFILES": "DMP Templates",
@@ -728,9 +728,9 @@
 			"DATAREPOSITORIES": "Data Repositories",
 			"REGISTRIES": "Registries",
 			"SERVICES": "Services",
-			"EXTERNAL-DATASETS": "External Dataset Descriptions",
+			"EXTERNAL-DATASETS": "External Dataset",
-			"EXTERNAL-DATASET-TYPE": "External Dataset Descriptions Type",
+			"EXTERNAL-DATASET-TYPE": "External Dataset Type",
-			"EXTERNAL-DATASET-INFO": "External Dataset Descriptions Info",
+			"EXTERNAL-DATASET-INFO": "External Dataset Info",
 			"DATAREPOSITORIES-INFO": "Data Repositories Info",
 			"TAGS": "Tags",
 			"CREATE": "Create New"
@@ -902,7 +902,7 @@
 	},
 	"HOMEPAGE": {
 		"OPEN-DMPS": {
-			"STATS": "OpenDMP Dashboard"
+			"STATS": "ARGOS Dashboard"
 		},
 		"MY-DMPS": {
 			"STATS": "My Dashboard"
@@ -912,7 +912,7 @@
 		"TITLE": "-About-",
 		"MAIN-CONTENT": "Our goal is to make your research data FAIR, that is findable, accessible,interoperable and re-usable. These principles precede implementation choices and do not necessarily suggest any specific technology, standard, or implementation solution.",
 		"CONTRIBUTORS": "Contributors",
-		"WELCOME": "Welcome to OpenDMP",
+		"WELCOME": "Welcome to ARGOS",
 		"WELCOME-MESSAGE": "Create, Link, Share Data Management Plans"
 	},
 	"FOOTER": {
@@ -945,8 +945,8 @@
 		"MY-GRANTS": "My Grants",
 		"GRANTS": "Grants",
 		"MY-DMPS": "My DMPs",
-		"TITLE": "What is OpenDMP.eu?",
+		"TITLE": "What is ARGOS?",
-		"INFO-TEXT": "OpenDMP.eu is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.",
+		"INFO-TEXT": "ARGOS is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.",
 		"ORGANIZATIONS": "Related Organizations",
 		"DMPS": "DMPs",
 		"MY-DATASETS": "My Dataset Descriptions",
@@ -1032,7 +1032,7 @@
 			"AT-LEAST-ONE-DATASET-FINALISED": "You need to have at least one Dataset Description Finalized"
 		},
 		"IMPACT": "This action will finalize your DMP, and you won't be able to edit it again.",
-		"AFTER-FINALIZATION": "After finalizing your DMP you can Publish it, and it'll be publicly available to the OpenDMP tool."
+		"AFTER-FINALIZATION": "After finalizing your DMP you can Publish it, and it'll be publicly available to the ARGOS tool."
 	},
 	"DRAFTS": {
 		"FOR-DMP": "For DMP:",

dmp-frontend/src/assets/scss/core/_sidebar-and-main-panel.scss

@@ -31,7 +31,8 @@
   }
   .logo-img {
     width: 35px;
-    display: block;
+	display: block;
+	height: 100%;
     max-height: 30px;
     margin-left: 13px;
     margin-right: 15px;