@@ -48,7 +40,7 @@
{{ 'myProjects.settings.project' | translate }}
{{ 'myProjects.settings.redirectLink' | translate }}
{{ 'myProjects.settings.redirectLink' | translate }}
type="text"
pInputText
id="link-url"
- aria-required="true"
- aria-describedby="link-url"
class="mt-2 w-full"
placeholder="{{ 'myProjects.settings.redirectUrlPlaceholder' | translate }}"
[(ngModel)]="redirectUrlData().url"
@@ -51,8 +48,6 @@ {{ 'myProjects.settings.redirectLink' | translate }}
type="text"
pInputText
id="link-label"
- aria-required="true"
- aria-describedby="link-label"
class="mt-2 w-full"
placeholder="{{ 'myProjects.settings.redirectLabelPlaceholder' | translate }}"
[(ngModel)]="redirectUrlData().label"
@@ -62,7 +57,7 @@ {{ 'myProjects.settings.redirectLink' | translate }}
{{ 'myProjects.settings.wiki' | translate }}
{
return this.jsonApiService
- .get(`${this.baseUrl}/nodes/${nodeId}/settings`)
+ .get(`${this.baseUrl}/nodes/${nodeId}/settings/`)
.pipe(map((response) => SettingsMapper.fromResponse(response, nodeId)));
}
updateProjectSettings(model: ProjectSettingsData): Observable {
return this.jsonApiService
- .patch(`${this.baseUrl}/nodes/${model.id}/settings`, { data: model })
+ .patch(`${this.baseUrl}/nodes/${model.id}/settings/`, { data: model })
.pipe(map((response) => SettingsMapper.fromResponse(response, model.id)));
}
deleteProject(projectId: string): Observable {
- return this.jsonApiService.delete(`${this.baseUrl}/nodes/${projectId}`);
+ return this.jsonApiService.delete(`${this.baseUrl}/nodes/${projectId}/`);
}
}
diff --git a/src/app/features/project/settings/settings.component.ts b/src/app/features/project/settings/settings.component.ts
index 9a1039b5d..ce5691c53 100644
--- a/src/app/features/project/settings/settings.component.ts
+++ b/src/app/features/project/settings/settings.component.ts
@@ -13,6 +13,18 @@ import { toSignal } from '@angular/core/rxjs-interop';
import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
+import {
+ GetNotificationSubscriptionsByNodeId,
+ NotificationSubscriptionSelectors,
+ UpdateNotificationSubscriptionForNodeId,
+} from '@osf/features/settings/notifications/store';
+import { SubHeaderComponent } from '@osf/shared/components';
+import { ProjectFormControls, ResourceType, SubscriptionEvent, SubscriptionFrequency } from '@osf/shared/enums';
+import { CustomValidators } from '@osf/shared/helpers';
+import { UpdateNodeRequestModel, ViewOnlyLinkModel } from '@osf/shared/models';
+import { CustomConfirmationService, LoaderService, ToastService } from '@osf/shared/services';
+import { DeleteViewOnlyLink, FetchViewOnlyLinks, ViewOnlyLinkSelectors } from '@osf/shared/stores';
+
import {
ProjectSettingNotificationsComponent,
SettingsAccessRequestsCardComponent,
@@ -22,12 +34,8 @@ import {
SettingsStorageLocationCardComponent,
SettingsViewOnlyLinksCardComponent,
SettingsWikiCardComponent,
-} from '@osf/features/project/settings/components';
-import {
- ProjectDetailsModel,
- ProjectSettingsAttributes,
- ProjectSettingsData,
-} from '@osf/features/project/settings/models';
+} from './components';
+import { ProjectDetailsModel, ProjectSettingsAttributes, ProjectSettingsData } from './models';
import {
DeleteProject,
GetProjectDetails,
@@ -35,18 +43,7 @@ import {
SettingsSelectors,
UpdateProjectDetails,
UpdateProjectSettings,
-} from '@osf/features/project/settings/store';
-import {
- GetNotificationSubscriptionsByNodeId,
- NotificationSubscriptionSelectors,
- UpdateNotificationSubscriptionForNodeId,
-} from '@osf/features/settings/notifications/store';
-import { CustomValidators } from '@osf/shared/helpers';
-import { CustomConfirmationService, LoaderService, ToastService } from '@osf/shared/services';
-import { DeleteViewOnlyLink, FetchViewOnlyLinks, ViewOnlyLinkSelectors } from '@osf/shared/stores';
-import { SubHeaderComponent } from '@shared/components';
-import { ProjectFormControls, ResourceType, SubscriptionEvent, SubscriptionFrequency } from '@shared/enums';
-import { UpdateNodeRequestModel, ViewOnlyLinkModel } from '@shared/models';
+} from './store';
@Component({
selector: 'osf-settings',
diff --git a/src/app/features/project/settings/store/settings.model.ts b/src/app/features/project/settings/store/settings.model.ts
index 87dd0f1ab..8137b3961 100644
--- a/src/app/features/project/settings/store/settings.model.ts
+++ b/src/app/features/project/settings/store/settings.model.ts
@@ -1,5 +1,4 @@
-import { NodeData } from '@shared/models';
-import { AsyncStateModel } from '@shared/models/store';
+import { AsyncStateModel, NodeData } from '@osf/shared/models';
import { ProjectSettingsModel } from '../models';
@@ -7,3 +6,16 @@ export interface SettingsStateModel {
settings: AsyncStateModel;
projectDetails: AsyncStateModel;
}
+
+export const SETTINGS_STATE_DEFAULTS: SettingsStateModel = {
+ settings: {
+ data: {} as ProjectSettingsModel,
+ isLoading: false,
+ error: null,
+ },
+ projectDetails: {
+ data: {} as NodeData,
+ isLoading: false,
+ error: null,
+ },
+};
diff --git a/src/app/features/project/settings/store/settings.state.ts b/src/app/features/project/settings/store/settings.state.ts
index 9263c66b2..218738d60 100644
--- a/src/app/features/project/settings/store/settings.state.ts
+++ b/src/app/features/project/settings/store/settings.state.ts
@@ -1,38 +1,28 @@
import { Action, State, StateContext } from '@ngxs/store';
-import { map, of, throwError } from 'rxjs';
+import { map, of } from 'rxjs';
import { catchError, tap } from 'rxjs/operators';
import { inject, Injectable } from '@angular/core';
-import { SettingsService } from '@osf/features/project/settings/services';
+import { handleSectionError } from '@osf/shared/helpers';
+import { NodeData } from '@osf/shared/models';
+import { MyResourcesService } from '@osf/shared/services';
+
+import { SettingsService } from '../services';
+
import {
DeleteProject,
GetProjectDetails,
GetProjectSettings,
UpdateProjectDetails,
UpdateProjectSettings,
-} from '@osf/features/project/settings/store/settings.actions';
-import { SettingsStateModel } from '@osf/features/project/settings/store/settings.model';
-import { NodeData } from '@shared/models';
-import { MyResourcesService } from '@shared/services';
-
-import { ProjectSettingsModel } from '../models';
+} from './settings.actions';
+import { SETTINGS_STATE_DEFAULTS, SettingsStateModel } from './settings.model';
@State({
name: 'settings',
- defaults: {
- settings: {
- data: {} as ProjectSettingsModel,
- isLoading: false,
- error: null,
- },
- projectDetails: {
- data: {} as NodeData,
- isLoading: false,
- error: null,
- },
- },
+ defaults: SETTINGS_STATE_DEFAULTS,
})
@Injectable()
export class SettingsState {
@@ -45,17 +35,6 @@ export class SettingsState {
return !lastFetched || Date.now() - lastFetched > this.REFRESH_INTERVAL;
}
- private handleError(ctx: StateContext, section: keyof SettingsStateModel, error: Error) {
- ctx.patchState({
- [section]: {
- ...ctx.getState()[section],
- isLoading: false,
- error: error.message,
- },
- });
- return throwError(() => error);
- }
-
@Action(GetProjectSettings)
getProjectSettings(ctx: StateContext, action: GetProjectSettings) {
const state = ctx.getState();
@@ -64,11 +43,7 @@ export class SettingsState {
if (cached.id === action.projectId && !shouldRefresh) {
return of(cached).pipe(
- tap(() =>
- ctx.patchState({
- settings: { ...state.settings, isLoading: false, error: null },
- })
- )
+ tap(() => ctx.patchState({ settings: { ...state.settings, isLoading: false, error: null } }))
);
}
@@ -79,6 +54,7 @@ export class SettingsState {
return this.settingsService.getProjectSettings(action.projectId).pipe(
tap((settings) => {
settings.lastFetched = Date.now();
+
ctx.patchState({
settings: {
data: settings,
@@ -87,7 +63,7 @@ export class SettingsState {
},
});
}),
- catchError((error) => this.handleError(ctx, 'settings', error))
+ catchError((error) => handleSectionError(ctx, 'settings', error))
);
}
@@ -107,9 +83,7 @@ export class SettingsState {
);
}
- ctx.patchState({
- projectDetails: { ...state.projectDetails, isLoading: true, error: null },
- });
+ ctx.patchState({ projectDetails: { ...state.projectDetails, isLoading: true, error: null } });
return this.myProjectService.getProjectById(action.projectId).pipe(
map((response) => response?.data as NodeData),
@@ -127,7 +101,7 @@ export class SettingsState {
},
});
}),
- catchError((error) => this.handleError(ctx, 'projectDetails', error))
+ catchError((error) => handleSectionError(ctx, 'projectDetails', error))
);
}
@@ -138,13 +112,13 @@ export class SettingsState {
ctx.patchState({
projectDetails: {
...ctx.getState().projectDetails,
- data: updatedProject.data,
+ data: updatedProject,
isLoading: false,
error: null,
},
});
}),
- catchError((error) => this.handleError(ctx, 'projectDetails', error))
+ catchError((error) => handleSectionError(ctx, 'projectDetails', error))
);
}
@@ -173,7 +147,7 @@ export class SettingsState {
error: error?.message,
},
});
- return this.handleError(ctx, 'settings', error);
+ return handleSectionError(ctx, 'settings', error);
})
);
}
diff --git a/src/app/features/project/wiki/wiki.component.ts b/src/app/features/project/wiki/wiki.component.ts
index 31922ebdb..102ae95cf 100644
--- a/src/app/features/project/wiki/wiki.component.ts
+++ b/src/app/features/project/wiki/wiki.component.ts
@@ -38,8 +38,6 @@ import {
WikiSelectors,
} from '@osf/shared/stores';
-const HomeWikiName = 'Home';
-
@Component({
selector: 'osf-wiki',
imports: [
@@ -60,7 +58,9 @@ export class WikiComponent {
private readonly route = inject(ActivatedRoute);
private readonly router = inject(Router);
private toastService = inject(ToastService);
+
WikiModes = WikiModes;
+ homeWikiName = 'Home';
readonly projectId = toSignal(this.route.parent?.params.pipe(map((params) => params['id'])) ?? of(undefined));
protected wikiModes = select(WikiSelectors.getWikiModes);
@@ -104,7 +104,7 @@ export class WikiComponent {
this.navigateToWiki(this.wikiList()?.[0]?.id || '');
}
if (!this.wikiList()?.length) {
- this.actions.createWiki(ResourceType.Project, this.projectId(), HomeWikiName);
+ this.actions.createWiki(ResourceType.Project, this.projectId(), this.homeWikiName);
}
})
)
diff --git a/src/app/features/registries/components/registry-services/registry-services.component.scss b/src/app/features/registries/components/registry-services/registry-services.component.scss
index 8378698b2..be27f3dd0 100644
--- a/src/app/features/registries/components/registry-services/registry-services.component.scss
+++ b/src/app/features/registries/components/registry-services/registry-services.component.scss
@@ -1,8 +1,8 @@
@use "assets/styles/mixins" as mix;
-@use "assets/styles/variables" as var;
.services-background-image {
background: url("/assets/images/preprints/preprints-services-background.png") center;
+ background-size: cover;
}
.registry-service-item {
diff --git a/src/app/features/registry/registry.routes.ts b/src/app/features/registry/registry.routes.ts
index 73c66b43b..cbbdb84e1 100644
--- a/src/app/features/registry/registry.routes.ts
+++ b/src/app/features/registry/registry.routes.ts
@@ -2,9 +2,6 @@ import { provideStates } from '@ngxs/store';
import { Routes } from '@angular/router';
-import { RegistryComponentsState } from '@osf/features/registry/store/registry-components';
-import { RegistryLinksState } from '@osf/features/registry/store/registry-links';
-import { RegistryMetadataState } from '@osf/features/registry/store/registry-metadata';
import { ResourceType } from '@osf/shared/enums';
import { LicensesService } from '@osf/shared/services';
import {
@@ -20,8 +17,11 @@ import { RegistriesState } from '../registries/store';
import { LicensesHandlers, ProjectsHandlers, ProvidersHandlers } from '../registries/store/handlers';
import { FilesHandlers } from '../registries/store/handlers/files.handlers';
+import { RegistryComponentsState } from './store/registry-components';
+import { RegistryLinksState } from './store/registry-links';
+import { RegistryMetadataState } from './store/registry-metadata';
import { RegistryOverviewState } from './store/registry-overview';
-import { RegistryResourcesState } from './store/registry-resources/registry-resources.state';
+import { RegistryResourcesState } from './store/registry-resources';
import { RegistryComponent } from './registry.component';
export const registryRoutes: Routes = [
diff --git a/src/app/features/settings/profile-settings/components/education-form/education-form.component.html b/src/app/features/settings/profile-settings/components/education-form/education-form.component.html
index fc7bb904e..5fe9ca914 100644
--- a/src/app/features/settings/profile-settings/components/education-form/education-form.component.html
+++ b/src/app/features/settings/profile-settings/components/education-form/education-form.component.html
@@ -4,14 +4,14 @@
{{ 'settings.profileSettings.education.title' | translate: { index: index() + 1 } }}
-
+ }
diff --git a/src/app/features/settings/profile-settings/components/education-form/education-form.component.ts b/src/app/features/settings/profile-settings/components/education-form/education-form.component.ts
index 2f6ea4892..0bfeab450 100644
--- a/src/app/features/settings/profile-settings/components/education-form/education-form.component.ts
+++ b/src/app/features/settings/profile-settings/components/education-form/education-form.component.ts
@@ -34,6 +34,7 @@ export class EducationFormComponent implements OnInit {
group = input.required
();
index = input.required();
+ showRemove = input(false);
remove = output();
get institutionControl() {
diff --git a/src/app/features/settings/profile-settings/components/education/education.component.html b/src/app/features/settings/profile-settings/components/education/education.component.html
index e488f2233..7e09a236b 100644
--- a/src/app/features/settings/profile-settings/components/education/education.component.html
+++ b/src/app/features/settings/profile-settings/components/education/education.component.html
@@ -2,7 +2,12 @@
@if (educations.controls.length) {
@for (education of educations.controls; track $index; let index = $index) {
-
+
}
}
@@ -20,12 +25,13 @@
class="w-6 btn-full-width md:w-auto"
[label]="'common.buttons.discardChanges' | translate"
severity="info"
+ [disabled]="!hasFormChanges()"
(onClick)="discardChanges()"
/>
{{ 'settings.profileSettings.employment.title' | translate: { index: index() + 1 } }}
-
+ }
diff --git a/src/app/features/settings/profile-settings/components/employment-form/employment-form.component.ts b/src/app/features/settings/profile-settings/components/employment-form/employment-form.component.ts
index 1f8f74fac..da5d0bbe9 100644
--- a/src/app/features/settings/profile-settings/components/employment-form/employment-form.component.ts
+++ b/src/app/features/settings/profile-settings/components/employment-form/employment-form.component.ts
@@ -33,6 +33,7 @@ export class EmploymentFormComponent implements OnInit {
group = input.required
();
index = input.required();
+ showRemove = input(false);
remove = output();
get titleControl() {
diff --git a/src/app/features/settings/profile-settings/components/employment/employment.component.html b/src/app/features/settings/profile-settings/components/employment/employment.component.html
index 13676a884..f6612da00 100644
--- a/src/app/features/settings/profile-settings/components/employment/employment.component.html
+++ b/src/app/features/settings/profile-settings/components/employment/employment.component.html
@@ -1,10 +1,13 @@
-@let havePositions = employment() && employment().length > 0;
-
diff --git a/src/app/features/settings/profile-settings/components/name/name.component.ts b/src/app/features/settings/profile-settings/components/name/name.component.ts
index 805df6f18..2206d7b71 100644
--- a/src/app/features/settings/profile-settings/components/name/name.component.ts
+++ b/src/app/features/settings/profile-settings/components/name/name.component.ts
@@ -13,8 +13,8 @@ import { CustomValidators } from '@osf/shared/helpers';
import { User } from '@osf/shared/models';
import { CustomConfirmationService, LoaderService, ToastService } from '@osf/shared/services';
+import { hasNameChanges } from '../../helpers';
import { NameForm } from '../../models';
-import { hasNameChanges } from '../../utils';
import { CitationPreviewComponent } from '../citation-preview/citation-preview.component';
import { NameFormComponent } from '../name-form/name-form.component';
@@ -105,7 +105,7 @@ export class NameComponent {
});
}
- private hasFormChanges(): boolean {
+ hasFormChanges(): boolean {
const user = this.currentUser();
if (!user) return false;
diff --git a/src/app/features/settings/profile-settings/components/social/social.component.html b/src/app/features/settings/profile-settings/components/social/social.component.html
index 982c001f7..e34553fe1 100644
--- a/src/app/features/settings/profile-settings/components/social/social.component.html
+++ b/src/app/features/settings/profile-settings/components/social/social.component.html
@@ -11,11 +11,13 @@
class="w-6 btn-full-width md:w-auto"
[label]="'common.buttons.discardChanges' | translate"
severity="info"
+ [disabled]="!hasFormChanges()"
(onClick)="discardChanges()"
/>
diff --git a/src/app/features/settings/profile-settings/components/social/social.component.ts b/src/app/features/settings/profile-settings/components/social/social.component.ts
index 66889866a..cd023b17b 100644
--- a/src/app/features/settings/profile-settings/components/social/social.component.ts
+++ b/src/app/features/settings/profile-settings/components/social/social.component.ts
@@ -21,8 +21,8 @@ import { Social } from '@osf/shared/models';
import { CustomConfirmationService, LoaderService, ToastService } from '@osf/shared/services';
import { SOCIALS } from '../../constants/socials';
+import { hasSocialLinkChanges, mapSocialLinkToPayload } from '../../helpers';
import { SocialLinksForm } from '../../models';
-import { hasSocialLinkChanges, mapSocialLinkToPayload } from '../../utils';
import { SocialFormComponent } from '../social-form/social-form.component';
@Component({
@@ -95,7 +95,7 @@ export class SocialComponent {
});
}
- private hasFormChanges(): boolean {
+ hasFormChanges(): boolean {
const currentLinks = this.socialLinksForm.value.links as SocialLinksForm[];
const initialSocialLinks = this.socialLinks();
@@ -110,9 +110,9 @@ export class SocialComponent {
this.socials.forEach((social) => {
const key = social.key;
- const socialLink = socialLinks?.[key] ?? null;
+ const socialLink = socialLinks?.[key] ?? '';
const linkedKey = social.linkedField?.key;
- const linkedValue = linkedKey ? (socialLinks?.[linkedKey] ?? null) : null;
+ const linkedValue = linkedKey ? (socialLinks?.[linkedKey] ?? '') : '';
const socialLinkGroup = this.fb.group({
socialOutput: [social],
webAddress: [socialLink],
diff --git a/src/app/features/settings/profile-settings/utils/education-comparison.util.ts b/src/app/features/settings/profile-settings/helpers/education-comparison.helper.ts
similarity index 90%
rename from src/app/features/settings/profile-settings/utils/education-comparison.util.ts
rename to src/app/features/settings/profile-settings/helpers/education-comparison.helper.ts
index a7ad940db..9ddaae7dc 100644
--- a/src/app/features/settings/profile-settings/utils/education-comparison.util.ts
+++ b/src/app/features/settings/profile-settings/helpers/education-comparison.helper.ts
@@ -4,12 +4,13 @@ import { Education } from '@osf/shared/models';
import { EducationForm } from '../models';
export function mapFormToEducation(education: EducationForm): Education {
+ console.log(education.startDate);
return {
institution: education.institution,
department: education.department,
degree: education.degree,
- startYear: education.startDate?.getFullYear() ?? new Date().getFullYear(),
- startMonth: (education.startDate?.getMonth() ?? 0) + 1,
+ startYear: education.startDate?.getFullYear() ?? null,
+ startMonth: education.startDate?.getMonth() ?? null,
endYear: education.ongoing ? null : (education.endDate?.getFullYear() ?? null),
endMonth: education.ongoing ? null : education.endDate ? education.endDate.getMonth() + 1 : null,
ongoing: education.ongoing,
diff --git a/src/app/features/settings/profile-settings/utils/employment-comparison.util.ts b/src/app/features/settings/profile-settings/helpers/employment-comparison.helper.ts
similarity index 100%
rename from src/app/features/settings/profile-settings/utils/employment-comparison.util.ts
rename to src/app/features/settings/profile-settings/helpers/employment-comparison.helper.ts
diff --git a/src/app/features/settings/profile-settings/helpers/index.ts b/src/app/features/settings/profile-settings/helpers/index.ts
new file mode 100644
index 000000000..73d1e8190
--- /dev/null
+++ b/src/app/features/settings/profile-settings/helpers/index.ts
@@ -0,0 +1,4 @@
+export * from './education-comparison.helper';
+export * from './employment-comparison.helper';
+export * from './name-comparison.helper';
+export * from './social-comparison.helper';
diff --git a/src/app/features/settings/profile-settings/utils/name-comparison.util.ts b/src/app/features/settings/profile-settings/helpers/name-comparison.helper.ts
similarity index 100%
rename from src/app/features/settings/profile-settings/utils/name-comparison.util.ts
rename to src/app/features/settings/profile-settings/helpers/name-comparison.helper.ts
diff --git a/src/app/features/settings/profile-settings/utils/social-comparison.util.ts b/src/app/features/settings/profile-settings/helpers/social-comparison.helper.ts
similarity index 60%
rename from src/app/features/settings/profile-settings/utils/social-comparison.util.ts
rename to src/app/features/settings/profile-settings/helpers/social-comparison.helper.ts
index 3248927cf..fc82bf595 100644
--- a/src/app/features/settings/profile-settings/utils/social-comparison.util.ts
+++ b/src/app/features/settings/profile-settings/helpers/social-comparison.helper.ts
@@ -1,6 +1,6 @@
import { Social } from '@osf/shared/models';
-import { SOCIAL_KEYS, SocialLinksForm, SocialLinksKeys } from '../models';
+import { SOCIAL_KEYS, SocialLinksForm, SocialLinksKeys, SocialLinksModel } from '../models';
export function normalizeValue(value: unknown, key: SocialLinksKeys): unknown {
if (SOCIAL_KEYS.includes(key)) {
@@ -11,12 +11,12 @@ export function normalizeValue(value: unknown, key: SocialLinksKeys): unknown {
export function mapSocialLinkToPayload(link: SocialLinksForm): Partial
{
const key = link.socialOutput.key as SocialLinksKeys;
- const linkedKey = link.socialOutput.linkedField?.key as SocialLinksKeys | undefined;
+ const linkedKey = link.socialOutput.linkedField?.key as SocialLinksKeys;
const value = SOCIAL_KEYS.includes(key)
? Array.isArray(link.webAddress)
? link.webAddress
- : [link.webAddress]
+ : [link.webAddress].filter(Boolean)
: link.webAddress;
const result: Partial = { [key]: value };
@@ -33,30 +33,31 @@ export function hasSocialLinkChanges(
link: SocialLinksForm,
initialSocialLinks: Social,
socialIndex: number,
- socials: readonly { key: string; linkedField?: { key: string } }[]
+ socials: SocialLinksModel[]
): boolean {
- const mappedLink = mapSocialLinkToPayload(link);
const social = socials[socialIndex];
-
if (!social) return true;
- const key = social.key as SocialLinksKeys;
- const linkedKey = social.linkedField?.key as SocialLinksKeys | undefined;
+ const mappedLink = mapSocialLinkToPayload(link);
+ const { key, linkedField } = social;
+
+ const hasChanged = (currentKey: keyof Social) => {
+ const current = mappedLink[currentKey];
+ const initial = normalizeValue(initialSocialLinks[currentKey], currentKey);
+
+ if (!current && !initial) {
+ return false;
+ }
- const currentValue = mappedLink[key];
- const initialValue = normalizeValue(initialSocialLinks[key], key);
+ return JSON.stringify(current) !== JSON.stringify(initial);
+ };
- if (JSON.stringify(currentValue) !== JSON.stringify(initialValue)) {
+ if (hasChanged(key)) {
return true;
}
- if (linkedKey) {
- const currentLinkedValue = mappedLink[linkedKey];
- const initialLinkedValue = normalizeValue(initialSocialLinks[linkedKey], linkedKey);
-
- if (JSON.stringify(currentLinkedValue) !== JSON.stringify(initialLinkedValue)) {
- return true;
- }
+ if (linkedField?.key && hasChanged(linkedField.key)) {
+ return true;
}
return false;
diff --git a/src/app/features/settings/profile-settings/utils/index.ts b/src/app/features/settings/profile-settings/utils/index.ts
deleted file mode 100644
index 76d5d1227..000000000
--- a/src/app/features/settings/profile-settings/utils/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './education-comparison.util';
-export * from './employment-comparison.util';
-export * from './name-comparison.util';
-export * from './social-comparison.util';
diff --git a/src/app/shared/components/index.ts b/src/app/shared/components/index.ts
index 6974e4394..8b6b3a881 100644
--- a/src/app/shared/components/index.ts
+++ b/src/app/shared/components/index.ts
@@ -30,6 +30,7 @@ export { PieChartComponent } from './pie-chart/pie-chart.component';
export { ProjectSelectorComponent } from './project-selector/project-selector.component';
export { ReadonlyInputComponent } from './readonly-input/readonly-input.component';
export { RegistrationBlocksDataComponent } from './registration-blocks-data/registration-blocks-data.component';
+export { RegistrationCardComponent } from './registration-card/registration-card.component';
export { ResourceCardComponent } from './resource-card/resource-card.component';
export { ResourceMetadataComponent } from './resource-metadata/resource-metadata.component';
export { ReusableFilterComponent } from './reusable-filter/reusable-filter.component';
diff --git a/src/app/shared/services/my-resources.service.ts b/src/app/shared/services/my-resources.service.ts
index c4f80cb27..c63d1f178 100644
--- a/src/app/shared/services/my-resources.service.ts
+++ b/src/app/shared/services/my-resources.service.ts
@@ -14,6 +14,7 @@ import {
MyResourcesItemResponseJsonApi,
MyResourcesResponseJsonApi,
MyResourcesSearchFilters,
+ NodeData,
NodeResponseModel,
UpdateNodeRequestModel,
} from '@shared/models';
@@ -212,10 +213,10 @@ export class MyResourcesService {
}
getProjectById(projectId: string): Observable {
- return this.jsonApiService.get(`${this.apiUrl}/nodes/${projectId}`);
+ return this.jsonApiService.get(`${this.apiUrl}/nodes/${projectId}/`);
}
- updateProjectById(model: UpdateNodeRequestModel): Observable {
- return this.jsonApiService.patch(`${this.apiUrl}/nodes/${model?.data?.id}`, model);
+ updateProjectById(model: UpdateNodeRequestModel): Observable {
+ return this.jsonApiService.patch(`${this.apiUrl}/nodes/${model?.data?.id}/`, model);
}
}
diff --git a/src/app/shared/services/view-only-links.service.ts b/src/app/shared/services/view-only-links.service.ts
index 98993c799..7933f3023 100644
--- a/src/app/shared/services/view-only-links.service.ts
+++ b/src/app/shared/services/view-only-links.service.ts
@@ -37,7 +37,7 @@ export class ViewOnlyLinksService {
const params: Record = { embed: 'creator' };
return this.jsonApiService
- .get(`${environment.apiUrl}/${resourcePath}/${projectId}/view_only_links`, params)
+ .get(`${environment.apiUrl}/${resourcePath}/${projectId}/view_only_links/`, params)
.pipe(map((response) => ViewOnlyLinksMapper.fromResponse(response, projectId)));
}
diff --git a/src/app/shared/services/wiki.service.ts b/src/app/shared/services/wiki.service.ts
index 3ee476bc6..e6e6fdeb8 100644
--- a/src/app/shared/services/wiki.service.ts
+++ b/src/app/shared/services/wiki.service.ts
@@ -42,7 +42,7 @@ export class WikiService {
throw new Error(`Unsupported resource type: ${resourceType}`);
}
- return `${baseUrl}/${resourcePath}/${resourceId}/wikis`;
+ return `${baseUrl}/${resourcePath}/${resourceId}/wikis/`;
}
createWiki(projectId: string, name: string): Observable {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index e1bfc9fcc..c217e0403 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -1823,7 +1823,7 @@
"description": "Leading preprint service providers use this open source infrastructure to support their communities."
},
"createServer": {
- "title": "Create your own branded preprint servers backed by the OSF?",
+ "title": "Create your own branded preprint servers backed by the OSF",
"description": "Check out the",
"openSourceCode": "open source code",
"and": "and",