MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

frontend cleanup

This commit is contained in:
Diamantis Tziotzios 2023-12-29 17:04:16 +02:00
parent 244e0e83a2
commit 7b28f499a8
427 changed files with 1526 additions and 17717 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
View File

@ -119,4 +119,8 @@ public class AuditableAction {
public static final EventId Tag_Lookup = new EventId(19001, "Tag_Lookup");
public static final EventId Tag_Persist = new EventId(19002, "Tag_Persist");
public static final EventId Tag_Delete = new EventId(19003, "Tag_Delete");
public static final EventId FileTransformer_GetAvailableConfigurations = new EventId(20000, "FileTransformer_GetAvailableConfigurations");
}

6
dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionController.java
View File

@ -198,10 +198,4 @@ public class DescriptionController {
return this.descriptionService.export(id, exportType);
}
@GetMapping("/export/formats")
public List<FileFormat> getAvailableExportFormats() {
return this.fileTransformerService.getAvailableConfigurations();
}
}

5
dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpController.java
View File

@ -213,11 +213,6 @@ public class DmpController {
return this.dmpService.export(id, exportType);
}
@GetMapping("/export/formats")
public List<FileFormat> getAvailableExportFormats() {
return this.fileTransformerService.getAvailableConfigurations();
}
@PostMapping("{id}/invite-users")
@Transactional
public ResponseEntity inviteUsers(@PathVariable("id") UUID id, @MyValidate @RequestBody DmpUserInvitePersist model) throws InvalidApplicationException, JAXBException {

50
dmp-backend/web/src/main/java/eu/eudat/controllers/v2/FileTransformerController.java Normal file
View File

@ -0,0 +1,50 @@
package eu.eudat.controllers.v2;
import eu.eudat.audit.AuditableAction;
import eu.eudat.controllers.BaseController;
import eu.eudat.file.transformer.model.file.FileFormat;
import eu.eudat.logic.services.ApiContext;
import eu.eudat.service.transformer.FileTransformerService;
import gr.cite.commons.web.authz.service.AuthorizationService;
import gr.cite.tools.auditing.AuditService;
import gr.cite.tools.data.censor.CensorFactory;
import gr.cite.tools.logging.LoggerService;
import gr.cite.tools.logging.MapLogEntry;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/file-transformer/"})
public class FileTransformerController extends BaseController {
private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(FileTransformerController.class));
private final AuthorizationService authorizationService;
private final FileTransformerService depositService;
private final CensorFactory censorFactory;
private final AuditService auditService;
@Autowired
public FileTransformerController(ApiContext apiContext, AuthorizationService authorizationService, FileTransformerService depositService, CensorFactory censorFactory, AuditService auditService){
super(apiContext);
this.authorizationService = authorizationService;
this.depositService = depositService;
this.censorFactory = censorFactory;
this.auditService = auditService;
}
@GetMapping("/available")
public List<FileFormat> getAvailableConfigurations() {
logger.debug(new MapLogEntry("getAvailableConfigurations"));
List<FileFormat> model = this.depositService.getAvailableConfigurations();
this.auditService.track(AuditableAction.FileTransformer_GetAvailableConfigurations);
//this.auditService.trackIdentity(AuditableAction.IdentityTracking_Action);
return model;
}
}

2
dmp-frontend/src/app/app-routing.module.ts
View File

@ -1,10 +1,10 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { ReloadHelperComponent } from '@app/ui/misc/reload-helper/reload-helper.component';
import { Oauth2DialogComponent } from './ui/misc/oauth2-dialog/oauth2-dialog.component';
import { AppComponent } from './app.component';
import { AppPermission } from './core/common/enum/permission.enum';
import { BreadcrumbService } from './ui/misc/breadcrumb/breadcrumb.service';
import { ReloadHelperComponent } from './ui/misc/reload-helper/reload-helper.component';
const appRoutes: Routes = [
{

4
dmp-frontend/src/app/app.module.ts
View File

@ -13,8 +13,6 @@ import { CoreServiceModule } from '@app/core/core-service.module';
import { NotificationModule } from '@app/library/notification/notification.module';
import { LoginModule } from '@app/ui/auth/login/login.module';
// import { BreadcrumbModule } from '@app/ui/misc/breadcrumb/breadcrumb.module';
import { HelpContentModule } from '@app/ui/misc/help-content/help-content.module';
import { NavigationModule } from '@app/ui/misc/navigation/navigation.module';
import { ReloadHelperComponent } from '@app/ui/misc/reload-helper/reload-helper.component';
import { NavbarModule } from '@app/ui/navbar/navbar.module';
import { SidebarModule } from '@app/ui/sidebar/sidebar.module';
@ -137,9 +135,7 @@ export function InstallationConfigurationFactory(appConfig: ConfigurationService
LoginModule,
//Ui
NotificationModule,
NavigationModule,
// BreadcrumbModule,
HelpContentModule,
ReactiveFormsModule,
FormsModule,
NavbarModule,

8
dmp-frontend/src/app/core/common/enum/api-message-code.ts
View File

@ -1,8 +0,0 @@
export enum ApiMessageCode {
NO_MESSAGE = 0,
SUCCESS_MESSAGE = 200,
WARN_MESSAGE = 300,
ERROR_MESSAGE = 400,
DEFAULT_ERROR_MESSAGE = 444,
VALIDATION_MESSAGE = 445
}

12
dmp-frontend/src/app/core/common/enum/auth-provider.ts
View File

@ -1,12 +0,0 @@
export enum AuthProvider {
Google = 1,
Facebook = 2,
Twitter = 3,
LinkedIn = 4,
//NativeLogin=5,
B2Access = 6,
ORCID = 7,
OpenAire = 8,
Configurable = 9,
Zenodo = 10
}

4
dmp-frontend/src/app/core/common/enum/configurable-provider-type.ts
View File

@ -1,4 +0,0 @@
export enum ConfigurableProviderType {
Oauth2 = "oauth2",
Saml2 = "saml2"
}

4
dmp-frontend/src/app/core/common/enum/dataset-profile-combo-box-type.ts
View File

@ -1,4 +0,0 @@
export enum DatasetProfileComboBoxType {
Autocomplete = "autocomplete",
WordList = "wordlist"
}

28
dmp-frontend/src/app/core/common/enum/dataset-profile-field-view-style.ts
View File

@ -1,28 +0,0 @@
export enum DatasetProfileFieldViewStyle {
TextArea = "textarea",
RichTextArea = "richTextarea",
Table = "table",
Upload = "upload",
BooleanDecision = "booleanDecision",
ComboBox = "combobox",
CheckBox = "checkBox",
FreeText = "freetext",
RadioBox = "radiobox",
DatePicker = "datePicker",
InternalDmpEntities = "internalDmpEntities",
ExternalDatasets = "externalDatasets",
DataRepositories = "dataRepositories",
PubRepositories = "pubRepositories",
JournalRepositories = "journalRepositories",
Taxonomies = "taxonomies",
Licenses = "licenses",
Publications = "publications",
Registries = "registries",
Services = "services",
Tags = "tags",
Researchers = "researchers",
Organizations = "organizations",
DatasetIdentifier = "datasetIdentifier",
Currency = "currency",
Validation = 'validation'
}

5
dmp-frontend/src/app/core/common/enum/dataset-profile-internal-dmp-entities-type.ts
View File

@ -1,5 +0,0 @@
export enum DatasetProfileInternalDmpEntitiesType {
Researchers = "researchers",
Dmps = "dmps",
Datasets = "datasets"
}

5
dmp-frontend/src/app/core/common/enum/dataset-profile.ts
View File

@ -1,5 +0,0 @@
export enum DatasetProfileEnum {
SAVED = 0,
FINALIZED = 1,
DELETED = 99
}

6
dmp-frontend/src/app/core/common/enum/dataset-status.ts
View File

@ -1,6 +0,0 @@
export enum DatasetStatus {
Draft = 0,
Finalized = 1,
Canceled = 2,
Deleted = 99
}

5
dmp-frontend/src/app/core/common/enum/external-dataset-type-enum.ts
View File

@ -1,5 +0,0 @@
export enum ExternalDatasetTypeEnum{
ReusedDataset = "reused_dataset",
ProducedDataset = "produced_dataset",
Other = "other"
}

4
dmp-frontend/src/app/core/common/enum/external-dataset-type.ts
View File

@ -1,4 +0,0 @@
export enum ExternalDatasetType {
Source = 0,
Output = 1
}

4
dmp-frontend/src/app/core/common/enum/grant-state-type.ts
View File

@ -1,4 +0,0 @@
export enum GrantStateType {
OnGoing = 0,
Finished = 1
}

4
dmp-frontend/src/app/core/common/enum/grant-type.ts
View File

@ -1,4 +0,0 @@
export enum GrantType {
External = 0,
Internal = 1
}

4
dmp-frontend/src/app/core/common/enum/project-type.ts
View File

@ -1,4 +0,0 @@
export enum ProjectType {
External = 0,
Internal = 1
}

11
dmp-frontend/src/app/core/common/enum/recent-activity-order.ts
View File

@ -1,14 +1,5 @@
export enum RecentActivityOrder {
UpdatedAt = 0,
Label = 1,
Status = 2,
//TODO: delete them since these are from the prerefactor model
LABEL = "label",
CREATED = "created",
MODIFIED = "modified",
FINALIZED = "finalizedAt",
PUBLISHED = "publishedAt",
DATASETPUBLISHED = "dmp:publishedAt|join|",
STATUS = "status"
Status = 2
}

4
dmp-frontend/src/app/core/common/enum/role.ts
View File

@ -1,4 +0,0 @@
export enum Role {
Owner = 0,
Member = 1
}

5
dmp-frontend/src/app/core/common/enum/save-type.ts
View File

@ -1,5 +0,0 @@
export enum SaveType {
close = 0,
addNew = 1,
finalize = 2
}

4
dmp-frontend/src/app/core/common/enum/status.ts
View File

@ -1,4 +0,0 @@
export enum Status {
Active = 0,
Inactive = 1
}

1
dmp-frontend/src/app/core/common/enum/validation-type.ts
View File

@ -6,6 +6,7 @@ export enum ValidationType {
URL = 2
}
//TODO: move this
export class ValidatorURL {
public static regex = 'https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.' +

67
dmp-frontend/src/app/core/core-service.module.ts
View File

@ -7,61 +7,43 @@ import { AuthService } from './services/auth/auth.service';
import { ContactSupportService } from './services/contact-support/contact-support.service';
import { CultureService } from './services/culture/culture-service';
import { LanguageInfoService } from './services/culture/language-info-service';
import { CurrencyService } from './services/currency/currency.service';
import { DashboardService } from './services/dashboard/dashboard.service';
import { DepositRepositoriesService } from './services/deposit-repositories/deposit-repositories.service';
import { DepositService } from './services/deposit/deposit.service';
import { DescriptionTemplateTypeService } from './services/description-template-type/description-template-type.service';
import { DmpBlueprintService } from './services/dmp/dmp-blueprint.service';
import { DmpInvitationService } from './services/dmp/dmp-invitation.service';
import { DmpService, DmpServiceNew } from './services/dmp/dmp.service';
import { EmailConfirmationService } from './services/email-confirmation/email-confirmation.service';
import { ExternalDataRepositoryService } from './services/external-sources/data-repository/extternal-data-repository.service';
import { ExternalDatasetService } from './services/external-sources/dataset/external-dataset.service';
import { ExternalSourcesConfigurationService } from './services/external-sources/external-sources-configuration.service';
import { ExternalSourcesService } from './services/external-sources/external-sources.service';
import { ExternalRegistryService } from './services/external-sources/registry/external-registry.service';
import { ExternalResearcherService } from './services/external-sources/researcher/external-researcher.service';
import { ExternalServiceService } from './services/external-sources/service/external-service.service';
import { FunderService } from './services/funder/funder.service';
import { GrantFileUploadService } from './services/grant/grant-file-upload.service';
import { GrantService } from './services/grant/grant.service';
import { DmpService } from './services/dmp/dmp.service';
import { BaseHttpV2Service } from './services/http/base-http-v2.service';
import { BaseHttpService } from './services/http/base-http.service';
import { LanguageService } from './services/language/language.service';
import { LockService } from './services/lock/lock.service';
import { LoggingService } from './services/logging/logging-service';
import { MergeEmailConfirmationService } from './services/merge-email-confirmation/merge-email-confirmation.service';
import { UiNotificationService } from './services/notification/ui-notification-service';
import { OrganisationService } from './services/organisation/organisation.service';
import { ProgressIndicationService } from './services/progress-indication/progress-indication-service';
import { ProjectService } from './services/project/project.service';
import { SearchBarService } from './services/search-bar/search-bar.service';
import { TimezoneService } from './services/timezone/timezone-service';
import { UnlinkAccountEmailConfirmationService } from './services/unlink-account-email-confirmation/unlink-account-email-confirmation.service';
import { UserServiceOld } from './services/user/user.service-old';
import { CollectionUtils } from './services/utilities/collection-utils.service';
import { TypeUtils } from './services/utilities/type-utils.service';
import { SpecialAuthGuard } from './special-auth-guard.service';
//import { KeycloakService } from 'keycloak-angular';
import { CanDeactivateGuard } from '@app/library/deactivate/can-deactivate.guard';
import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service';
import { FilterService } from '@common/modules/text-filter/filter-service';
import { DescriptionTemplateService } from './services/description-template/description-template.service';
import { DescriptionService } from './services/description/description.service';
import { FileTransformerService } from './services/file-transformer/file-transformer.service';
import { PrincipalService } from './services/http/principal.service';
import { LanguageHttpService } from './services/language/language.http.service';
import { MaintenanceService } from './services/maintenance/maintenance.service';
import { NotificationTemplateService } from './services/notification-template/notification-template.service';
import { ReferenceTypeService } from './services/reference-type/reference-type.service';
import { ReferenceService } from './services/reference/reference.service';
import { SupportiveMaterialService } from './services/supportive-material/supportive-material.service';
import { TagService } from './services/tag/tag.service';
import { TenantService } from './services/tenant/tenant.service';
import { UserSettingsHttpService } from './services/user-settings/user-settings-http.service';
import { UserSettingsService } from './services/user-settings/user-settings.service';
import { UserService } from './services/user/user.service';
import { FileUtils } from './services/utilities/file-utils.service';
import { QueryParamsService } from './services/utilities/query-params.service';
import { LanguageHttpService } from './services/language/language.http.service';
import { DescriptionService } from './services/description/description.service';
import { MaintenanceService } from './services/maintenance/maintenance.service';
import { NotificationTemplateService } from './services/notification-template/notification-template.service';
import { TagService } from './services/tag/tag.service';
import { CanDeactivateGuard } from '@app/library/deactivate/can-deactivate.guard';
import { FileTransformerHttpService } from './services/file-transformer/file-transformer.http.service';
//
//
// This is shared module that provides all the services. Its imported only once on the AppModule.
@ -83,7 +65,6 @@ export class CoreServiceModule {
providers: [
AuthService,
CookieService,
BaseHttpService,
BaseHttpV2Service,
AdminAuthGuard,
SpecialAuthGuard,
@ -95,34 +76,14 @@ export class CoreServiceModule {
UiNotificationService,
ProgressIndicationService,
LoggingService,
SearchBarService,
DashboardService,
GrantService,
ProjectService,
FunderService,
GrantFileUploadService,
DmpService,
DepositRepositoriesService,
DepositService,
DmpBlueprintService,
ExternalSourcesService,
ExternalSourcesConfigurationService,
ExternalDatasetService,
ExternalDataRepositoryService,
ExternalRegistryService,
ExternalResearcherService,
ExternalServiceService,
UserServiceOld,
DmpInvitationService,
OrganisationService,
EmailConfirmationService,
ContactSupportService,
LanguageService,
LockService,
PrincipalService,
SupportiveMaterialService,
CurrencyService,
MergeEmailConfirmationService,
UnlinkAccountEmailConfirmationService,
LanguageInfoService,
PrefillingService,
DescriptionTemplateTypeService,
@ -138,12 +99,14 @@ export class CoreServiceModule {
TenantService,
UserService,
LanguageHttpService,
DmpServiceNew,
DmpService,
DescriptionService,
MaintenanceService,
NotificationTemplateService,
TagService,
CanDeactivateGuard
CanDeactivateGuard,
FileTransformerService,
FileTransformerHttpService
],
};
}

89
dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts
View File

@ -1,89 +0,0 @@
import { ValidationType } from "../../../common/enum/validation-type";
import { UserInfoListingModel } from "../../user/user-info-listing";
export interface DatasetProfile {
label: string;
type: string;
sections: Section[];
pages: Page[];
status: number;
version: number;
description: string;
language: string;
users: UserInfoListingModel[];
}
export interface Page {
id: string;
ordinal: number;
title: string;
}
export interface Section {
sections: Section[];
fieldSets: FieldSet[];
defaultVisibility: boolean;
page: string;
ordinal: number;
id: string;
title: string;
description: string;
}
export interface FieldSet {
id: string;
ordinal: number;
multiplicity: Multiplicity;
title: string;
description: string;
extendedDescription: string;
additionalInformation:string;
hasCommentField: boolean;
fields: Field[];
}
export interface Multiplicity {
min: number;
max: number;
placeholder: string;
tableView: boolean;
}
export interface Field {
id: string;
ordinal: number;
value: string;
viewStyle: ViewStyle;
datatype: string;
page: number;
defaultValue: DefaultValue;
data: any;
visible: Visibility;
validations: ValidationType[];
schematics: string[];
export: boolean;
}
export interface ViewStyle {
renderStyle: string;
cssClass: string;
}
export interface DefaultValue {
type: string;
value: string;
}
export interface Visibility {
rules: Rule[];
style: string;
}
export interface Rule {
ruleType: string;
target: string;
ruleStyle: string;
value: string;
valueType: string;
}

2
dmp-frontend/src/app/core/model/auth/principal.ts
View File

@ -4,7 +4,6 @@ import { Guid } from "@common/types/guid";
export interface AppAccount {
isAuthenticated: boolean;
// permissions: AppPermission[];
roles: AppRole[];
permissions: AppPermission[];
principal: AppPrincipalInfo;
@ -22,6 +21,7 @@ export interface AppPrincipalInfo{
userId: Guid;
more: Record<string, string[]>
}
export interface UserProfileInfo {
culture: string;
language: string;

4
dmp-frontend/src/app/core/model/base-form-model.ts
View File

@ -1,4 +0,0 @@
import { UntypedFormBuilder } from '@angular/forms';
export abstract class BaseFormModel {
public formBuilder: UntypedFormBuilder = new UntypedFormBuilder();
}

8
dmp-frontend/src/app/core/model/dashboard/search-bar-item.ts
View File

@ -1,8 +0,0 @@
import { SearchBarType } from "../../../ui/misc/navigation/navigation.component";
export interface SearchBarItem {
id: string;
label: string;
type: SearchBarType;
isPublished: boolean;
}

9
dmp-frontend/src/app/core/model/data-repository/data-repository.ts
View File

@ -1,9 +0,0 @@
export interface DataRepositoryModel {
id: string;
name: string;
abbreviation: string;
uri: string;
pid: string;
info: string;
source: string;
}

3
dmp-frontend/src/app/core/model/data-table/column-ordering.ts
View File

@ -1,3 +0,0 @@
export class ColumnOrdering {
public fields: Array<string> = new Array();
}

4
dmp-frontend/src/app/core/model/data-table/data-table-data.ts
View File

@ -1,4 +0,0 @@
export class DataTableData<T> {
data = new Array<T>();
totalCount = 0;
}

28
dmp-frontend/src/app/core/model/data-table/data-table-request.ts
View File

@ -1,28 +0,0 @@
import { RequestItem } from '../../query/request-item';
import { ColumnOrdering } from './column-ordering';
export class DataTableRequest<T> extends RequestItem<T> {
offset = 0;
length = 0;
public orderings: ColumnOrdering;
constructor(offset: number, length: number, orderings: ColumnOrdering) {
super();
this.length = length;
this.offset = offset;
this.orderings = orderings;
}
}
export class DataTableMultiTypeRequest<T> extends RequestItem<T> {
dmpOffset = 0;
datasetOffset = 0;
length = 0;
public orderings: ColumnOrdering;
constructor(dmpOffset: number, datasetOffset: number, length: number, orderings: ColumnOrdering) {
super();
this.length = length;
this.dmpOffset = dmpOffset;
this.datasetOffset = datasetOffset;
this.orderings = orderings;
}
}

3
dmp-frontend/src/app/core/model/dataset-profile-definition/auth-type.enum.ts
View File

@ -1,3 +0,0 @@
export enum AuthType {
BEARER = 'Bearer'
}

17
dmp-frontend/src/app/core/model/dataset-profile-definition/composite-field.ts
View File

@ -1,17 +0,0 @@
import { Field } from './field';
import { Multiplicity } from './multiplicity';
export interface CompositeField {
fields: Array<Field>;
ordinal: number;
id: string;
numbering: string;
multiplicity: Multiplicity;
multiplicityItems: Array<CompositeField>;
title: string;
description: string;
extendedDescription: string;
additionalInformation:string;
hasCommentField: boolean;
commentFieldValue: string;
}

8
dmp-frontend/src/app/core/model/dataset-profile-definition/dataset-profile-definition.ts
View File

@ -1,8 +0,0 @@
import { Page } from "./page";
import { Rule } from "./rule";
export interface DatasetProfileDefinitionModel {
status: number;
pages: Page[];
rules: Rule[];
}

4
dmp-frontend/src/app/core/model/dataset-profile-definition/default-value.ts
View File

@ -1,4 +0,0 @@
export interface DefaultValue {
type: string;
value: string;
}

150
dmp-frontend/src/app/core/model/dataset-profile-definition/field-data/field-data.ts
View File

@ -1,150 +0,0 @@
import { ExternalDatasetTypeEnum } from "@app/core/common/enum/external-dataset-type-enum";
import { DatasetProfileComboBoxType } from "../../../common/enum/dataset-profile-combo-box-type";
import { DatasetProfileInternalDmpEntitiesType } from "../../../common/enum/dataset-profile-internal-dmp-entities-type";
export interface FieldData {
label: string;
}
export interface AutoCompleteFieldData extends FieldData {
type: DatasetProfileComboBoxType;
autoCompleteSingleDataList: AutoCompleteSingleData[];
multiAutoComplete: boolean;
}
export interface AuthAutoCompleteData extends FieldData {
url: string;
method: string;
body: string;
path: string;
type: string;
}
export interface AutoCompleteSingleData extends FieldData {
url: string;
optionsRoot: string;
autoCompleteOptions: FieldDataOption;
autocompleteType: number;
hasAuth: boolean;
method: string;
auth: AuthAutoCompleteData;
}
export interface CheckBoxFieldData extends FieldData {
}
export interface BooleanDecisionFieldData extends FieldData {
}
export interface FreeTextFieldData extends FieldData {
}
export interface RadioBoxFieldData extends FieldData {
options: Array<FieldDataOption>;
}
export interface TextAreaFieldData extends FieldData {
}
export interface RichTextAreaFieldData extends FieldData {
}
// export interface TableFieldData extends FieldData {
// headers: string[];
// rows: Array<string[]>;
// }
export interface UploadFieldData extends FieldData {
types: Array<FieldDataOption>;
maxFileSizeInMB: number;
}
export interface WordListFieldData extends FieldData {
type: DatasetProfileComboBoxType;
options: Array<FieldDataOption>;
multiList: boolean;
}
export interface FieldDataOption extends FieldData {
label: string;
value: string;
source: string;
}
export interface DatePickerFieldData extends FieldData {
}
export interface ResearchersAutoCompleteFieldData extends FieldData {
type: DatasetProfileInternalDmpEntitiesType;
multiAutoComplete: boolean;
}
export interface DatasetsAutoCompleteFieldData extends FieldData {
type: DatasetProfileInternalDmpEntitiesType;
multiAutoComplete: boolean;
autoCompleteType: number;
}
export interface DmpsAutoCompleteFieldData extends FieldData {
type: DatasetProfileInternalDmpEntitiesType;
multiAutoComplete: boolean;
}
export interface ExternalDatasetsFieldData extends FieldData {
multiAutoComplete: boolean;
type?: ExternalDatasetTypeEnum;
}
export interface DataRepositoriesFieldData extends FieldData {
multiAutoComplete: boolean;
}
export interface TaxonomiesFieldData extends FieldData {
multiAutoComplete: boolean;
}
export interface LicensesFieldData extends FieldData {
multiAutoComplete: boolean;
}
export interface PublicationsFieldData extends FieldData {
multiAutoComplete: boolean;
}
export interface RegistriesFieldData extends FieldData {
multiAutoComplete: boolean;
}
export interface ServicesFieldData extends FieldData {
multiAutoComplete: boolean;
}
export interface TagsFieldData extends FieldData {
}
export interface ResearchersFieldData extends FieldData {
multiAutoComplete: boolean;
}
export interface OrganizationsFieldData extends AutoCompleteFieldData {
}
export interface DatasetIdentifierFieldData extends FieldData {
}
export interface CurrencyFieldData extends FieldData {
}
export interface ValidationFieldData extends FieldData {
}

51
dmp-frontend/src/app/core/model/dataset-profile-definition/field-group.ts
View File

@ -1,51 +0,0 @@
// import { FormGroup } from "@angular/forms";
// import { JsonSerializer } from "../../../common/types/json/json-serializer";
// import { Serializable } from "../../../common/types/json/serializable";
// import { BaseModel } from "../../../models/BaseModel";
// import { CompositeField } from "./composite-field";
// export class FieldGroup extends BaseModel implements Serializable<FieldGroup> {
// public id: string;
// public title: string;
// public section: string;
// public value: string;
// public description: string;
// public extendedDescription: string;
// public defaultVisibility: boolean;
// public page: number;
// public compositeFields: Array<CompositeField> = new Array<CompositeField>();
// fromJSONObject(item: any): FieldGroup {
// this.id = item.id;
// this.title = item.title;
// this.value = item.value;
// this.description = item.description;
// this.extendedDescription = item.extendedDescription;
// this.defaultVisibility = item.defaultVisibility;
// this.page = item.page;
// this.compositeFields = new JsonSerializer<CompositeField>(CompositeField).fromJSONArray(item.compositeFields);
// return this;
// }
// buildForm(): FormGroup {
// const formGroup: FormGroup = this.formBuilder.group({
// /* id: [this.id],
// title: [this.title],
// value: [this.value],
// description: [this.description],
// extendedDescription: [this.extendedDescription],
// defaultVisibility: [this.defaultVisibility],
// page: [this.page] */
// });
// const compositeFieldsFormArray = new Array<FormGroup>();
// if (this.compositeFields) {
// this.compositeFields.forEach(item => {
// const form: FormGroup = item.buildForm();
// compositeFieldsFormArray.push(form);
// });
// }
// formGroup.addControl('compositeFields', this.formBuilder.array(compositeFieldsFormArray));
// return formGroup;
// }
// }

26
dmp-frontend/src/app/core/model/dataset-profile-definition/field.ts
View File

@ -1,26 +0,0 @@
import { ValidationType } from "../../common/enum/validation-type";
import { DefaultValue } from "./default-value";
import { Multiplicity } from "./multiplicity";
import { ViewStyle } from "./view-style";
export interface Field {
id: string;
title: string;
value: any;
defaultValue: DefaultValue;
description: string;
numbering: string;
extendedDescription: string;
additionalInformation: string;
viewStyle: ViewStyle;
defaultVisibility: boolean;
page: number;
multiplicity: Multiplicity;
multiplicityItems: Array<Field>;
data: any;
validations: Array<ValidationType>;
validationRequired;
validationURL;
ordinal: number;
}

6
dmp-frontend/src/app/core/model/dataset-profile-definition/html-method.enum.ts
View File

@ -1,6 +0,0 @@
export enum HtmlMethod {
GET = 'GET',
POST = 'POST',
PUT = 'PUT',
PATCH = 'PATCH'
}

9
dmp-frontend/src/app/core/model/dataset-profile-definition/multiplicity.ts
View File

@ -1,9 +0,0 @@
export interface Multiplicity {
min: number;
max: number;
placeholder: string;
tableView: boolean;
}

7
dmp-frontend/src/app/core/model/dataset-profile-definition/page.ts
View File

@ -1,7 +0,0 @@
import { Section } from "./section";
export interface Page {
ordinal: number;
title: string;
sections: Array<Section>;
}

13
dmp-frontend/src/app/core/model/dataset-profile-definition/section.ts
View File

@ -1,13 +0,0 @@
import { CompositeField } from "./composite-field";
export interface Section {
sections: Array<Section>;
defaultVisibility: boolean;
page: number;
numbering: string;
ordinal: number;
id: string;
title: string;
description: string;
compositeFields: Array<CompositeField>;
}

4
dmp-frontend/src/app/core/model/dataset-profile-definition/view-style.ts
View File

@ -1,4 +0,0 @@
export interface ViewStyle {
cssClass: string;
renderStyle: string;
}

34
dmp-frontend/src/app/core/model/dataset/dataset-id.model.ts
View File

@ -1,34 +0,0 @@
import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
import { isNullOrUndefined } from '@app/utilities/enhancers/utils';
export class DatasetIdModel {
identifier: string;
type: string;
constructor(data: any) {
try{
const parsed = JSON.parse(data);
if (!isNullOrUndefined(parsed)) {
if(typeof parsed !== 'string'){
this.identifier = parsed.identifier;
this.type = parsed.type;
}
else{
const parsedObjectFromString = JSON.parse(parsed);
this.identifier = parsedObjectFromString.identifier;
this.type = parsedObjectFromString.type;
}
}
}
catch(error){
console.warn('Could not parse DatasetIdModel');
}
}
buildForm(): UntypedFormGroup {
return new UntypedFormBuilder().group({
identifier: [this.identifier],
type: [this.type]
});
}
}

25
dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
View File

@ -1,25 +0,0 @@
import { DatasetProfileModel } from './dataset-profile';
export interface DatasetListingModel {
id: string;
label: string;
dmp: String;
dmpId: String;
grant: String;
grantId: String;
grantAbbreviation: String;
profile: DatasetProfileModel;
dataRepositories: String;
registries: String;
services: String;
description: String;
status: number;
created: Date;
modified: Date;
finalizedAt: Date;
dmpPublishedAt?: Date;
version: number;
users: any[];
public: boolean;
isProfileLatestVersion: boolean;
}

17
dmp-frontend/src/app/core/model/dataset/dataset-overview.ts
View File

@ -1,17 +0,0 @@
import { DatasetProfileModel } from "./dataset-profile";
import { GrantOverviewModel } from '../grant/grant-overview';
import { DmpOverviewModel } from '../dmp/dmp-overview';
export interface DatasetOverviewModel {
id: string;
label: string;
status: number;
datasetTemplate: DatasetProfileModel;
users: any[];
dmp: DmpOverviewModel;
grant: GrantOverviewModel;
description: String;
public: boolean;
modified: Date;
}

34
dmp-frontend/src/app/core/model/dataset/dataset-profile.ts
View File

@ -1,34 +0,0 @@
export interface DatasetProfileModel {
id: string;
label: string;
description: string;
}
// export class DatasetProfileModel implements Serializable<DatasetProfileModel> {
// public id: String;
// public label: String;
// fromJSONObject(item: any): DatasetProfileModel {
// this.id = item.id;
// this.label = item.label;
// return this;
// }
// buildForm(context: ValidationContext = null, disabled: boolean = false): FormGroup {
// if (context == null) { context = this.createValidationContext(); }
// const formGroup = new FormBuilder().group({
// id: [{ value: this.id, disabled: disabled }],
// });
// return formGroup;
// }
// createValidationContext(): ValidationContext {
// const baseContext: ValidationContext = new ValidationContext();
// //baseContext.validation.push({ key: 'id', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'id')] });
// return baseContext;
// }
// }

4
dmp-frontend/src/app/core/model/dataset/dataset-url-listing.ts
View File

@ -1,4 +0,0 @@
export interface DatasetUrlListing {
label: String;
url: String;
}

27
dmp-frontend/src/app/core/model/dataset/dataset-wizard.ts
View File

@ -1,27 +0,0 @@
import { DataRepositoryModel } from "../data-repository/data-repository";
import { DatasetProfileDefinitionModel } from "../dataset-profile-definition/dataset-profile-definition";
import { DmpModel } from "../dmp/dmp";
import { ExternalDatasetModel } from "../external-dataset/external-dataset";
import { RegistryModel } from "../registry/registry";
import { ServiceModel } from "../service/service";
import { TagModel } from "../tag/tag";
import { DatasetProfileModel } from "./dataset-profile";
export interface DatasetWizardModel {
id?: string;
label?: string;
uri?: String;
description?: String;
status?: number;
dmp?: DmpModel;
dmpSectionIndex?: number;
datasetProfileDefinition?: DatasetProfileDefinitionModel;
registries?: RegistryModel[];
services?: ServiceModel[];
dataRepositories?: DataRepositoryModel[];
tags?: TagModel[];
externalDatasets?: ExternalDatasetModel[];
profile?: DatasetProfileModel;
isProfileLatestVersion?: Boolean;
modified?: Date;
}

73
dmp-frontend/src/app/core/model/dataset/dataset.ts
View File

@ -1,73 +0,0 @@
import { DataRepositoryModel } from '../data-repository/data-repository';
import { RegistryModel } from '../registry/registry';
import { ServiceModel } from '../service/service';
export interface DatasetModel {
id: String;
label: String;
profile: String;
uri: String;
status: String;
description: String;
services: ServiceModel[];
registries: RegistryModel[];
dataRepositories: DataRepositoryModel[];
}
// export class DatasetModel implements Serializable<DatasetModel> {
// public id: String;
// public label: String;
// public profile: String;
// public uri: String;
// public status: String;
// public description: String;
// public services: ServiceModel[] = [];
// public registries: RegistryModel[] = [];
// public dataRepositories: DataRepositoryModel[] = [];
// public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
// fromJSONObject(item: any): DatasetModel {
// this.id = item.id;
// this.label = item.label;
// this.profile = item.profile;
// this.uri = item.uri;
// this.status = item.status;
// this.description = item.description;
// this.services = new JsonSerializer<ServiceModel>(ServiceModel).fromJSONArray(item.services);
// this.registries = new JsonSerializer<RegistryModel>(RegistryModel).fromJSONArray(item.registries);
// this.dataRepositories = new JsonSerializer<DataRepositoryModel>(DataRepositoryModel).fromJSONArray(item.dataRepositories);
// return this;
// }
// buildForm(context: ValidationContext = null, disabled: boolean = false): FormGroup {
// if (context == null) { context = this.createValidationContext(); }
// const formGroup = new FormBuilder().group({
// label: [{ value: this.label, disabled: disabled }, context.getValidation('label').validators],
// profile: [{ value: this.profile, disabled: disabled }, context.getValidation('profile').validators],
// uri: [{ value: this.uri, disabled: disabled }, context.getValidation('uri').validators],
// status: [{ value: this.status, disabled: disabled }, context.getValidation('status').validators],
// description: [{ value: this.description, disabled: disabled }, context.getValidation('description').validators],
// services: [{ value: this.services, disabled: disabled }, context.getValidation('services').validators],
// registries: [{ value: this.registries, disabled: disabled }, context.getValidation('registries').validators],
// dataRepositories: [{ value: this.dataRepositories, disabled: disabled }, context.getValidation('dataRepositories').validators]
// });
// return formGroup;
// }
// createValidationContext(): ValidationContext {
// const baseContext: ValidationContext = new ValidationContext();
// baseContext.validation.push({ key: 'label', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'label')] });
// baseContext.validation.push({ key: 'profile', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'profile')] });
// baseContext.validation.push({ key: 'uri', validators: [BackendErrorValidator(this.validationErrorModel, 'uri')] });
// baseContext.validation.push({ key: 'status', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'status')] });
// baseContext.validation.push({ key: 'description', validators: [BackendErrorValidator(this.validationErrorModel, 'description')] });
// baseContext.validation.push({ key: 'services', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'services')] });
// baseContext.validation.push({ key: 'registries', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'registries')] });
// baseContext.validation.push({ key: 'dataRepositories', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'dataRepositories')] });
// return baseContext;
// }
// }

3
dmp-frontend/src/app/core/model/dataset/datasets-toBeFinalized.ts
View File

@ -1,3 +0,0 @@
export interface DatasetsToBeFinalized {
uuids: string[];
}

7
dmp-frontend/src/app/core/model/dataset/prefilling.ts
View File

@ -1,7 +0,0 @@
export interface Prefilling {
pid: string;
name: string;
data: any;
key: string;
tag: string;
}

2
dmp-frontend/src/app/core/model/deposit/deposit-configuration.ts
View File

@ -1,6 +1,6 @@
import { DepositConfigurationStatus } from "@app/core/common/enum/deposit-configuration-status";
export class DepositConfigurationModel {
export class DepositConfiguration {
depositType: DepositConfigurationStatus;
repositoryId: string;
repositoryAuthorizationUrl: string;

8
dmp-frontend/src/app/core/model/deposit/deposit-request.ts
View File

@ -1,10 +1,12 @@
import { Guid } from "@common/types/guid";
export class DepositRequest {
repositoryId: string;
dmpId: string;
accessToken: string;
dmpId: Guid;
accessToken: String;
}
export class DepositCode {
export class DepositAuthenticateRequest {
repositoryId: string;
code: string;
}

4
dmp-frontend/src/app/core/model/description/description.ts
View File

@ -2,13 +2,11 @@ import { DescriptionStatus } from "@app/core/common/enum/description-status";
import { BaseEntity, BaseEntityPersist } from "@common/base/base-entity.model";
import { Guid } from "@common/types/guid";
import { DescriptionTemplate } from "../description-template/description-template";
import { Dmp, DmpDescriptionTemplate, DmpDescriptionTemplatePersist } from "../dmp/dmp";
import { Dmp, DmpDescriptionTemplate } from "../dmp/dmp";
import { Reference, ReferencePersist } from "../reference/reference";
import { Tag } from "../tag/tag";
import { User } from "../user/user";
export interface Description extends BaseEntity {
label: string;
properties: PropertyDefinition;

4
dmp-frontend/src/app/core/model/dmp-blueprint/dmp-blueprint.ts
View File

@ -1,9 +1,9 @@
import { DmpBlueprintExtraFieldDataType } from "@app/core/common/enum/dmp-blueprint-field-type";
import { DmpBlueprintSectionFieldCategory } from "@app/core/common/enum/dmp-blueprint-section-field-category";
import { DmpBlueprintStatus } from "@app/core/common/enum/dmp-blueprint-status";
import { DmpBlueprintSystemFieldType } from "@app/core/common/enum/dmp-blueprint-system-field-type";
import { BaseEntity, BaseEntityPersist } from "@common/base/base-entity.model";
import { Guid } from "@common/types/guid";
import { DmpBlueprintExtraFieldDataType } from "@app/core/common/enum/dmp-blueprint-field-type";
import { DmpBlueprintSystemFieldType } from "@app/core/common/enum/dmp-blueprint-system-field-type";
export interface DmpBlueprint extends BaseEntity {

9
dmp-frontend/src/app/core/model/dmp/cost.ts
View File

@ -1,9 +0,0 @@
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { ValidationContext } from '@common/forms/validation/validation-context';
export interface CostModel {
code: string;
description: string;
title: string;
value: number;
}

38
dmp-frontend/src/app/core/model/dmp/dmp-create-wizard/dmp-create-wizard-form.model.ts
View File

@ -1,38 +0,0 @@
import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
import { DmpModel } from '@app/core/model/dmp/dmp';
import { BackendErrorValidator } from '@common/forms/validation/custom-validator';
import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
import { ValidationContext } from '@common/forms/validation/validation-context';
export class DmpCreateWizardFormModel {
dmp: DmpModel;
datasetProfile: DatasetProfileModel;
public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
fromModel(item: DmpCreateWizardFormModel): DmpCreateWizardFormModel {
this.dmp = item.dmp;
this.datasetProfile = item.datasetProfile;
return this;
}
buildForm(context: ValidationContext = null): UntypedFormGroup {
if (context == null) { context = this.createValidationContext(); }
const formBuilder = new UntypedFormBuilder();
const formGroup = formBuilder.group({
dmp: [this.dmp, context.getValidation('dmp').validators],
datasetProfile: [this.datasetProfile, context.getValidation('datasetProfile').validators],
});
return formGroup;
}
createValidationContext(): ValidationContext {
const baseContext: ValidationContext = new ValidationContext();
baseContext.validation.push({ key: 'datasetProfile', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'datasetProfile')] });
baseContext.validation.push({ key: 'dmp', validators: [BackendErrorValidator(this.validationErrorModel, 'dmp')] });
return baseContext;
}
}

28
dmp-frontend/src/app/core/model/dmp/dmp-dataset-profile/dmp-dataset-profile-sections-form.model.ts
View File

@ -1,28 +0,0 @@
import { UntypedFormGroup, UntypedFormBuilder } from "@angular/forms";
import { BackendErrorValidator } from "@common/forms/validation/custom-validator";
import { ValidationErrorModel } from "@common/forms/validation/error-model/validation-error-model";
import { ValidationContext } from "@common/forms/validation/validation-context";
export class DmpDatasetProfileSectionsFormModel {
public dmpSectionIndex: number[] = [];
public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
fromModel(item: any): DmpDatasetProfileSectionsFormModel {
this.dmpSectionIndex = item.dmpSectionIndex;
return this;
}
buildForm(context: ValidationContext = null, disabled: boolean = false): UntypedFormGroup {
if (context == null) { context = this.createValidationContext(); }
const formGroup = new UntypedFormBuilder().group({
language: [{ value: this.dmpSectionIndex, disabled: disabled }, context.getValidation('dmpSectionIndex').validators],
});
return formGroup;
}
createValidationContext(): ValidationContext {
const baseContext: ValidationContext = new ValidationContext();
baseContext.validation.push({ key: 'dmpSectionIndex', validators: [BackendErrorValidator(this.validationErrorModel, 'dmpSectionIndex')] });
return baseContext;
}
}

8
dmp-frontend/src/app/core/model/dmp/dmp-dataset-profile/dmp-dataset-profile.ts
View File

@ -1,8 +0,0 @@
import { DmpDatasetProfileSectionsFormModel } from "./dmp-dataset-profile-sections-form.model";
export interface DmpDatasetProfile {
id: string;
descriptionTemplateId: string;
label: string;
data: DmpDatasetProfileSectionsFormModel;
}

4
dmp-frontend/src/app/core/model/dmp/dmp-dynamic-field-dependency.ts
View File

@ -1,4 +0,0 @@
export interface DmpDynamicFieldDependency {
id: string;
queryProperty: string;
}

10
dmp-frontend/src/app/core/model/dmp/dmp-dynamic-field.ts
View File

@ -1,10 +0,0 @@
import { DmpDynamicFieldDependency } from "./dmp-dynamic-field-dependency";
export interface DmpDynamicField {
id: string;
name: string;
required: boolean;
queryProperty;
value: string;
dependencies: Array<DmpDynamicFieldDependency>;
}

4
dmp-frontend/src/app/core/model/dmp/dmp-extra-field.ts
View File

@ -1,4 +0,0 @@
export interface DmpExtraField {
id: string;
value: string;
}

22
dmp-frontend/src/app/core/model/dmp/dmp-listing.ts
View File

@ -1,22 +0,0 @@
import { DmpStatus } from "../../common/enum/dmp-status";
export interface DmpListingModel {
id: string;
label: string;
description: String;
status: DmpStatus;
grant: String;
grantId: String;
grantAbbreviation: String;
profile: String;
creationTime: string;
modifiedTime: string;
publishedAt: Date;
finalizedAt: Date;
organisations: String;
groupId: string;
version: number;
datasets: any[];
users: any[];
public: boolean;
}

29
dmp-frontend/src/app/core/model/dmp/dmp-overview.ts
View File

@ -1,29 +0,0 @@
import { OrganizationModel } from "../organisation/organization";
import { UserInfoListingModel } from "../user/user-info-listing";
import { ResearcherModel } from "../researcher/researcher";
import { GrantOverviewModel } from "../grant/grant-overview";
import { DatasetOverviewModel } from "../dataset/dataset-overview";
import { DoiModel } from "../doi/doi";
export interface DmpOverviewModel {
id: string;
label: string;
profile: string;
creationTime: string;
modifiedTime: string;
version: number;
status: number;
isPublic: boolean;
groupId: string;
description: string;
grant: GrantOverviewModel;
users: UserInfoListingModel[];
organisations: OrganizationModel[];
datasets: DatasetOverviewModel[];
datasetsToBeFinalized: string[];
researchers: ResearcherModel[];
finalizedAt: Date;
publishedAt: Date;
doi: string;
dois: DoiModel[];
}

5
dmp-frontend/src/app/core/model/dmp/dmp-reference.ts
View File

@ -1,10 +1,7 @@
import { BaseEntity, BaseEntityPersist } from "@common/base/base-entity.model";
import { Guid } from "@common/types/guid";
import { BaseEntity } from "@common/base/base-entity.model";
import { Reference } from "../reference/reference";
import { Dmp } from "./dmp";
export interface DmpReference extends BaseEntity {
dmp?: Dmp;
reference?: Reference;

65
dmp-frontend/src/app/core/model/dmp/dmp.ts
View File

@ -4,51 +4,14 @@ import { DmpUserRole } from '@app/core/common/enum/dmp-user-role';
import { DmpVersionStatus } from '@app/core/common/enum/dmp-version-status';
import { BaseEntity, BaseEntityPersist } from '@common/base/base-entity.model';
import { Guid } from '@common/types/guid';
import { DatasetWizardModel } from '../dataset/dataset-wizard';
import { DescriptionTemplate } from '../description-template/description-template';
import { Description } from '../description/description';
import { EntityDoi } from '../entity-doi/entity-doi';
import { FunderModel } from "../funder/funder";
import { GrantListingModel } from "../grant/grant-listing";
import { OrganizationModel } from "../organisation/organization";
import { ProjectModel } from "../project/project";
import { ReferencePersist } from '../reference/reference';
import { ResearcherModel } from "../researcher/researcher";
import { User, UserModel } from "../user/user";
import { UserInfoListingModel } from "../user/user-info-listing";
import { DmpDatasetProfile } from "./dmp-dataset-profile/dmp-dataset-profile";
import { DmpDynamicField } from "./dmp-dynamic-field";
import { DmpExtraField } from "./dmp-extra-field";
import { DmpBlueprint } from '../dmp-blueprint/dmp-blueprint';
import { EntityDoi } from '../entity-doi/entity-doi';
import { ReferencePersist } from '../reference/reference';
import { User } from "../user/user";
import { DmpReference } from './dmp-reference';
export interface DmpModel { //TODO: Delete
id: string;
label: string;
groupId: String;
profile: DmpBlueprint;
version: number;
status: DmpStatus;
lockable: boolean;
description: String;
grant: GrantListingModel;
project: ProjectModel;
funder: FunderModel;
datasets: DatasetWizardModel[];
datasetsToBeFinalized: string[];
profiles: DmpDatasetProfile[];
organisations: OrganizationModel[];
researchers: ResearcherModel[];
associatedUsers: UserModel[];
users: UserInfoListingModel[];
creator: UserModel;
extraFields: Array<DmpExtraField>;
dynamicFields: Array<DmpDynamicField>;
modified: Date;
extraProperties: Map<String, any>;
language: String;
}
export interface Dmp extends BaseEntity {
label: string;
version: number;
@ -69,28 +32,6 @@ export interface Dmp extends BaseEntity {
descriptions: Description[];
dmpDescriptionTemplates: DmpDescriptionTemplate[];
entityDois: EntityDoi[];
// TODO: delete
// grant: GrantListingModel;
// project: ProjectModel;
// funder: FunderModel;
// organisations: OrganizationModel[];
// researchers: ResearcherModel[];
// datasets: DatasetWizardModel[];
// datasetsToBeFinalized: string[];
// profiles: DmpDatasetProfile[];
// associatedUsers: UserModel[];
// users: UserInfoListingModel[];
// creator: UserModel;
// extraFields: Array<DmpExtraField>;
// dynamicFields: Array<DmpDynamicField>;
// extraProperties: Map<String, any>;
// language: String;
}
export interface DmpUser extends BaseEntity {

25
dmp-frontend/src/app/core/model/dmp/invitation/dmp-invitation-user.ts
View File

@ -1,25 +0,0 @@
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { Serializable } from '@common/types/json/serializable';
export class DmpInvitationUser implements Serializable<DmpInvitationUser> {
public id: string;
public email: string;
public name: string;
fromJSONObject(item: any): DmpInvitationUser {
this.id = item.id;
this.email = item.email;
this.name = item.name;
return this;
}
buildForm(): UntypedFormGroup {
return new UntypedFormBuilder().group({
id: [this.id],
email: [this.email],
name: [this.name]
});
}
}

19
dmp-frontend/src/app/core/model/dmp/invitation/dmp-invitation.ts
View File

@ -1,19 +0,0 @@
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { DmpInvitationUser } from './dmp-invitation-user';
export class DmpInvitation {
public dataManagementPlan: string;
public users = new Array<DmpInvitationUser>();
public role: number;
buildForm(): UntypedFormGroup {
const formGroup = new UntypedFormBuilder().group({
dataManagementPlan: [this.dataManagementPlan],
users: [this.users],
role: [this.role]
});
return formGroup;
}
}

7
dmp-frontend/src/app/core/model/doi/doi.ts
View File

@ -1,7 +0,0 @@
export interface DoiModel {
id: string;
repositoryId: string;
doi: string;
createdAt: Date;
updatedAt: Date;
}

11
dmp-frontend/src/app/core/model/external-dataset/external-dataset.ts
View File

@ -1,11 +0,0 @@
import { ExternalDatasetType } from '../../common/enum/external-dataset-type';
export interface ExternalDatasetModel {
abbreviation: String;
id: String;
name: String;
reference: String;
type: ExternalDatasetType;
info: String;
source: String;
}

5
dmp-frontend/src/app/core/model/external-sources/external-source-item.ts
View File

@ -1,5 +0,0 @@
export interface ExternalSourceItemModel {
id: String;
name: String;
description: String;
}

4
dmp-frontend/src/app/core/model/external-sources/external-source-url.ts
View File

@ -1,4 +0,0 @@
export class ExternalSourceUrlModel {
public key: String;
public label: String;
}

9
dmp-frontend/src/app/core/model/external-sources/external-sources-configuration.ts
View File

@ -1,9 +0,0 @@
import { ExternalSourceUrlModel } from "./external-source-url";
export class ExternalSourcesConfiguration {
public registries: Array<ExternalSourceUrlModel>;
public dataRepositories: Array<ExternalSourceUrlModel>;
public services: Array<ExternalSourceUrlModel>;
public externalDatasets: Array<ExternalSourceUrlModel>;
public tags: Array<ExternalSourceUrlModel>;
}

12
dmp-frontend/src/app/core/model/funder/funder.ts
View File

@ -1,12 +0,0 @@
import { Status } from "../../common/enum/status";
export class FunderModel {
id: string;
label: string;
reference: string;
definition: string;
status: Status;
created: Date;
modified: Date;
type: number;
}

26
dmp-frontend/src/app/core/model/grant/grant-listing.ts
View File

@ -1,26 +0,0 @@
import { GrantType } from '../../common/enum/grant-type';
import { Status } from '../../common/enum/status';
export interface GrantListingModel {
id?: string;
label?: string;
abbreviation?: string;
reference?: string;
type?: GrantType;
uri?: String;
status?: Status;
startDate?: Date;
endDate?: Date;
description?: String;
contentUrl?: string;
funderId?: string;
files?: ContentFile[];
source?: string;
}
export interface ContentFile {
filename?: string;
id?: string;
location?: string;
type?: string;
}

9
dmp-frontend/src/app/core/model/grant/grant-overview.ts
View File

@ -1,9 +0,0 @@
export interface GrantOverviewModel {
id: String;
label: String;
uri: String;
abbreviation: String;
description: String;
startDate: Date;
endDate: Date;
}

10
dmp-frontend/src/app/core/model/help-content/active-topic-questions.ts
View File

@ -1,10 +0,0 @@
/**
* Created by stefania on 4/26/17.
*/
import { Topic } from './topic';
import { Question } from './question';
export interface ActiveTopicQuestions {
topic: Topic;
questionList: Question[];
}

24
dmp-frontend/src/app/core/model/help-content/page-help-content.ts
View File

@ -1,24 +0,0 @@
/**
* Created by stefania on 7/13/17.
*/
import { Page } from './page';
export interface PageHelpContent {
_id: string;
page: Page | string;
placement: string;
order: number;
content: string;
isActive: boolean;
}
export interface CheckPageHelpContent {
pageHelpContent: PageHelpContent;
checked: boolean;
}
export interface PageHelpContentFilterOptions {
id: string;
active: Boolean;
text: RegExp;
}

13
dmp-frontend/src/app/core/model/help-content/page.ts
View File

@ -1,13 +0,0 @@
/**
* Created by stefania on 7/13/17.
*/
export interface Page {
_id: string;
route: string;
name: string;
}
export interface CheckPage {
page: Page;
checked: boolean;
}

26
dmp-frontend/src/app/core/model/help-content/question.ts
View File

@ -1,26 +0,0 @@
/**
* Created by stefania on 4/26/17.
*/
import { Topic } from './topic';
export interface Question {
_id: string;
question: string;
answer: string;
date: Date;
isActive: boolean;
weight: number;
hitCount: number;
topics: Topic[] | string[];
}
export interface CheckQuestion {
question: Question;
checked: boolean;
}
export interface QuestionFilterOptions {
id: string;
active: Boolean;
text: RegExp;
}

16
dmp-frontend/src/app/core/model/help-content/topic.ts
View File

@ -1,16 +0,0 @@
/**
* Created by stefania on 4/26/17.
*/
export interface Topic {
_id: string;
name: string;
description: string;
date: Date;
weight: number;
questionOrder: string;
}
export interface CheckTopic {
topic: Topic;
checked: boolean;
}

9
dmp-frontend/src/app/core/model/license/license.ts
View File

@ -1,9 +0,0 @@
export interface LicenseModel {
id: string;
name: string;
abbreviation: string;
uri: string;
pid: string;
info: string;
source: string;
}

4
dmp-frontend/src/app/core/model/local-fetch/local-fetch.model.ts
View File

@ -1,4 +0,0 @@
export class LocalFetchModel {
name: string;
value: string;
}

21
dmp-frontend/src/app/core/model/lock/lock.model.ts
View File

@ -1,26 +1,7 @@
import { Guid } from '@common/types/guid';
import { UserInfoListingModel } from '../user/user-info-listing';
import { LockTargetType } from '@app/core/common/enum/lock-target-type';
import { Guid } from '@common/types/guid';
import { User } from '../user/user';
// old model
export class LockModel {
id: Guid;
target: Guid;
lockedBy: UserInfoListingModel;
lockedAt: Date;
touchedAt: Date;
constructor(targetId: string, lockedBy: any) {
this.lockedAt = new Date();
this.touchedAt = new Date();
this.target = Guid.parse(targetId);
this.lockedBy = lockedBy;
}
}
export interface Lock {
id: Guid;
target: Guid;

5
dmp-frontend/src/app/core/model/merge/user-merge-request.ts
View File

@ -1,5 +0,0 @@
export class UserMergeRequestModel {
userId: String;
email: String;
provider: number;
}

10
dmp-frontend/src/app/core/model/organisation/organization.ts
View File

@ -1,10 +0,0 @@
import { Status } from "../../common/enum/status";
export interface OrganizationModel {
id: string;
name: string;
label: string;
status: Status;
tag: string;
reference?: string;
}

24
dmp-frontend/src/app/core/model/project/project.ts
View File

@ -1,24 +0,0 @@
import { Status } from "../../common/enum/status";
import { ProjectType } from "../../common/enum/project-type";
export class ProjectModel {
id?: string;
label?: string;
abbreviation?: string;
reference?: string;
type?: ProjectType;
uri?: String;
status?: Status;
startDate?: Date;
endDate?: Date;
description?: String;
contentUrl?: string;
files?: ContentFile[];
}
export interface ContentFile {
filename?: string;
id?: string;
location?: string;
type?: string;
}

9
dmp-frontend/src/app/core/model/publication/publication.ts
View File

@ -1,9 +0,0 @@
export interface PublicationModel {
id: string;
name: string;
abbreviation: string;
uri: string;
pid: string;
info: string;
source: string;
}

3
dmp-frontend/src/app/core/model/reference/reference.ts
View File

@ -1,8 +1,6 @@
import { ReferenceFieldDataType } from "@app/core/common/enum/reference-field-data-type";
import { ReferenceSourceType } from "@app/core/common/enum/reference-source-type";
import { ReferenceType } from "@app/core/common/enum/reference-type";
import { UUID } from "crypto";
import { DmpModel } from "../dmp/dmp";
import { BaseEntity, BaseEntityPersist } from "@common/base/base-entity.model";
export interface Reference extends BaseEntity {
@ -14,7 +12,6 @@ export interface Reference extends BaseEntity{
abbreviation: string;
source: string;
sourceType: ReferenceSourceType;
// dmpReferences: DmpReference[];
}
export interface Definition {

11
dmp-frontend/src/app/core/model/registry/registry.ts
View File

@ -1,11 +0,0 @@
export interface RegistryModel {
abbreviation: String;
definition: String;
id: String;
pid: String;
label: String;
reference: String;
uri: String;
source: String;
}

8
dmp-frontend/src/app/core/model/researcher/researcher.ts
View File

@ -1,8 +0,0 @@
export interface ResearcherModel {
id: string;
name: String;
reference: String;
lastName: String;
uri: String;
email: String;
}

10
dmp-frontend/src/app/core/model/service/service.ts
View File

@ -1,10 +0,0 @@
export interface ServiceModel {
id: String;
abbreviation: String;
definition: String;
uri: String;
label: String;
reference: String;
source: String;
}

5
dmp-frontend/src/app/core/model/tag/tag.ts
View File

@ -1,11 +1,6 @@
import { BaseEntity, BaseEntityPersist } from "@common/base/base-entity.model";
import { User } from "../user/user";
export interface TagModel { //TODO: old entity, delete
id: string;
name: string;
}
export interface Tag extends BaseEntity {
label?: string;
createdBy?: User;

9
dmp-frontend/src/app/core/model/taxonomy/taxonomy.ts
View File

@ -1,9 +0,0 @@
export interface TaxonomyModel {
id: string;
name: string;
abbreviation: string;
uri: string;
pid: string;
info: string;
source: string;
}

5
dmp-frontend/src/app/core/model/unlink-account/unlink-account.ts
View File

@ -1,5 +0,0 @@
export class UnlinkAccountRequestModel {
userId: String;
email: String;
provider: number;
}

6
dmp-frontend/src/app/core/model/user/user-credential.ts
View File

@ -1,6 +0,0 @@
import { AuthProvider } from '@app/core/common/enum/auth-provider';
export class UserCredentialModel {
email: string;
provider: AuthProvider;
}

6
dmp-frontend/src/app/core/model/user/user-info-listing.ts
View File

@ -1,6 +0,0 @@
export interface UserInfoListingModel {
id: String;
name: String;
role: number;
email: String;
}

Some files were not shown because too many files have changed in this diff Show More