Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class DeveloperAppAddEditFormComponent implements OnInit {
protected readonly appForm: DeveloperAppForm = new FormGroup({
[DeveloperAppFormFormControls.AppName]: new FormControl('', {
nonNullable: true,
validators: [CustomValidators.requiredTrimmed(), Validators.maxLength(InputLimits.name.maxLength)],
validators: [CustomValidators.requiredTrimmed(), Validators.maxLength(InputLimits.fullName.maxLength)],
}),
[DeveloperAppFormFormControls.ProjectHomePageUrl]: new FormControl('', {
nonNullable: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ export class EmploymentComponent {
private createEmploymentFormGroup(employment?: Partial<EmploymentForm>): FormGroup {
return this.fb.group(
{
institution: [employment?.institution ?? '', CustomValidators.requiredTrimmed()],
title: [employment?.title ?? ''],
title: [employment?.title ?? '', CustomValidators.requiredTrimmed()],
institution: [employment?.institution ?? ''],
department: [employment?.department ?? ''],
startDate: [employment?.startDate ?? null],
endDate: [employment?.endDate ?? null],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ export class SocialComponent {
const mappedLinks = links.map((link) => {
const key = link.socialOutput.key as SocialLinksKeys;

const value = SOCIAL_KEYS.includes(key) ? [link.webAddress] : link.webAddress;
const value = SOCIAL_KEYS.includes(key)
? Array.isArray(link.webAddress)
? link.webAddress
: [link.webAddress]
: link.webAddress;

return {
[key]: value,
Expand Down
26 changes: 26 additions & 0 deletions src/app/features/settings/profile-settings/constants/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,68 +7,94 @@ export const socials: SocialLinksModel[] = [
address: 'http://researchers.com/rid/',
placeholder: 'x-xxxx-xxxx',
key: 'researcherId',
multiple: false,
},
{
id: 1,
label: 'ORCID',
address: 'http://orcid.org/',
placeholder: 'xxxx-xxxx-xxxx',
key: 'orcid',
multiple: false,
},
{
id: 2,
label: 'LinkedIn',
address: 'https://linkedin.com/',
placeholder: 'in/userID, profie/view?profileID, or pub/pubID',
key: 'linkedIn',
multiple: true,
},
{
id: 3,
label: 'X',
address: '@',
placeholder: 'twitterhandle',
key: 'twitter',
multiple: true,
},
{
id: 4,
label: 'GitHub',
address: 'https://github.com/',
placeholder: 'username',
key: 'github',
multiple: true,
},
{
id: 5,
label: 'ImpactStory',
address: 'https://impactstory.org/u/',
placeholder: 'profileID',
key: 'impactStory',
multiple: false,
},
{
id: 6,
label: 'Google Scholar',
address: 'http://scholar.google.com/citations?user=',
placeholder: 'profileID',
key: 'scholar',
multiple: false,
},
{
id: 7,
label: 'ResearchGate',
address: 'https://researchgate.net/profile/',
placeholder: 'profileID',
key: 'researchGate',
multiple: false,
},
{
id: 8,
label: 'Baidu Scholar',
address: 'http://xueshu.baidu.com/scholarID/',
placeholder: 'profileID',
key: 'baiduScholar',
multiple: false,
},
{
id: 9,
label: 'SSRN',
address: 'http://papers.ssrn.com/sol3/cf_dev/AbsByAuth.cfm?per_id=',
placeholder: 'profileID',
key: 'ssrn',
multiple: false,
},
{
id: 10,
label: 'Your website',
address: 'website',
placeholder: 'https://yourwebsite.com',
key: 'profileWebsites',
multiple: true,
},
{
id: 11,
label: 'Academia Profile Id',
address: '.academia.edu/',
placeholder: 'profileId',
key: 'academiaProfileID',
multiple: false,
},
];
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export interface SocialLinksModel {
address: string;
placeholder: string;
key: SocialLinksKeys;
multiple: boolean;
}

export interface SocialLinksForm {
Expand Down
7 changes: 0 additions & 7 deletions src/assets/styles/overrides/date-picker.scss

This file was deleted.

8 changes: 8 additions & 0 deletions src/assets/styles/overrides/datepicker.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "assets/styles/mixins" as mix;

.p-datepicker {
width: 100%;
--p-datepicker-input-icon-color: var(--grey-1);
Expand Down Expand Up @@ -36,3 +38,9 @@
--p-datepicker-date-hover-color: var(--white);
}
}

.half-width-datepicker {
.p-datepicker-panel {
min-width: mix.rem(350px) !important;
}
}
6 changes: 6 additions & 0 deletions src/assets/styles/overrides/dialog.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
@use "assets/styles/mixins" as mix;

.p-dialog-close-button {
--p-button-padding-y: 0.75rem;
--p-button-padding-x: 0.75rem;
border: 0;
}

.upload-dialog {
.p-dialog {
width: mix.rem(356px);
Expand Down
2 changes: 1 addition & 1 deletion src/assets/styles/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
@use "./overrides/stepper";
@use "./overrides/radio";
@use "./overrides/confirmation-dialog";
@use "./overrides/dialog";
@use "./overrides/input-group-addon";
@use "./overrides/iconfield";
@use "./overrides/datepicker";
Expand All @@ -44,5 +45,4 @@
@use "./components/md-editor";
@use "./components/preprints";
@use "./overrides/cedar-metadata";
@use "./overrides/date-picker";
@use "./components/collections";