diff --git a/src/app/features/admin-institutions/components/admin-table/admin-table.component.scss b/src/app/features/admin-institutions/components/admin-table/admin-table.component.scss
index d67e31b8a..6a4fbf927 100644
--- a/src/app/features/admin-institutions/components/admin-table/admin-table.component.scss
+++ b/src/app/features/admin-institutions/components/admin-table/admin-table.component.scss
@@ -1,7 +1,3 @@
-.p-06 {
- padding: 0.625rem;
-}
-
.hover-group {
.icon-button {
opacity: 0;
diff --git a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.html b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.html
index 5d2f02e8c..0f657dde5 100644
--- a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.html
+++ b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.html
@@ -1,5 +1,5 @@
@if (summaryMetricsLoading()) {
-
+
} @else {
diff --git a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.scss b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.scss
index 24526d1ae..c09d87014 100644
--- a/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.scss
+++ b/src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.scss
@@ -1,5 +1,11 @@
@use "styles/variables" as var;
+:host {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+}
+
.width-25 {
width: calc(25% - 1.5rem);
diff --git a/src/app/features/files/models/get-contributors-response.model.ts b/src/app/features/files/models/get-contributors-response.model.ts
deleted file mode 100644
index ed19f0e76..000000000
--- a/src/app/features/files/models/get-contributors-response.model.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models';
-
-export type GetContributorsResponse = JsonApiResponse<
- ApiData<
- {
- full_name: string;
- active: boolean;
- },
- null,
- null,
- null
- >[],
- null
->;
diff --git a/src/app/features/files/models/get-resource-short-info-response.model.ts b/src/app/features/files/models/get-resource-short-info-response.model.ts
index fde3a7134..8dcadd492 100644
--- a/src/app/features/files/models/get-resource-short-info-response.model.ts
+++ b/src/app/features/files/models/get-resource-short-info-response.model.ts
@@ -1,5 +1,4 @@
-import { ApiData, JsonApiResponse } from '@osf/shared/models';
-import { IdentifiersJsonApiResponse } from '@shared/models/identifiers/identifier-json-api.model';
+import { ApiData, IdentifiersJsonApiResponse, JsonApiResponse } from '@osf/shared/models';
export type GetResourceShortInfoResponse = JsonApiResponse<
ApiData<
diff --git a/src/app/features/files/models/get-short-info-response.model.ts b/src/app/features/files/models/get-short-info-response.model.ts
index 15ed93578..a3df1cf20 100644
--- a/src/app/features/files/models/get-short-info-response.model.ts
+++ b/src/app/features/files/models/get-short-info-response.model.ts
@@ -1,5 +1,4 @@
-import { ApiData, JsonApiResponse } from '@shared/models';
-import { IdentifiersJsonApiResponse } from '@shared/models/identifiers/identifier-json-api.model';
+import { ApiData, IdentifiersJsonApiResponse, JsonApiResponse } from '@shared/models';
export type GetShortInfoResponse = JsonApiResponse<
ApiData<
diff --git a/src/app/features/files/models/index.ts b/src/app/features/files/models/index.ts
index 078892263..9cf5a6298 100644
--- a/src/app/features/files/models/index.ts
+++ b/src/app/features/files/models/index.ts
@@ -3,7 +3,6 @@ export * from './file-custom-metadata.model';
export * from './file-revisions.model';
export * from './file-target.model';
export * from './files-metadata-fields.model';
-export * from './get-contributors-response.model';
export * from './get-custom-metadata-response.model';
export * from './get-file-metadata-response.model';
export * from './get-file-revisions-response.model';
diff --git a/src/app/features/files/pages/file-detail/file-detail.component.ts b/src/app/features/files/pages/file-detail/file-detail.component.ts
index f8b4c59dd..cdb6785eb 100644
--- a/src/app/features/files/pages/file-detail/file-detail.component.ts
+++ b/src/app/features/files/pages/file-detail/file-detail.component.ts
@@ -9,6 +9,7 @@ import { Tab, TabList, Tabs } from 'primeng/tabs';
import { switchMap } from 'rxjs';
+import { Clipboard } from '@angular/cdk/clipboard';
import { DatePipe } from '@angular/common';
import {
ChangeDetectionStrategy,
@@ -97,9 +98,12 @@ export class FileDetailComponent {
readonly sanitizer = inject(DomSanitizer);
readonly toastService = inject(ToastService);
readonly customConfirmationService = inject(CustomConfirmationService);
+
private readonly metaTags = inject(MetaTagsService);
private readonly datePipe = inject(DatePipe);
private readonly translateService = inject(TranslateService);
+ private readonly clipboard = inject(Clipboard);
+
readonly dataciteService = inject(DataciteService);
private readonly actions = createDispatchMap({
@@ -267,14 +271,8 @@ export class FileDetailComponent {
}
copyToClipboard(embedHtml: string): void {
- navigator.clipboard
- .writeText(embedHtml)
- .then(() => {
- this.toastService.showSuccess('files.detail.toast.copiedToClipboard');
- })
- .catch((err) => {
- this.toastService.showError(err.message);
- });
+ this.clipboard.copy(embedHtml);
+ this.toastService.showSuccess('files.toast.copiedToClipboard');
}
deleteEntry(link: string): void {
diff --git a/src/app/features/files/store/index.ts b/src/app/features/files/store/index.ts
index 04f101f76..ee049089a 100644
--- a/src/app/features/files/store/index.ts
+++ b/src/app/features/files/store/index.ts
@@ -1,3 +1,4 @@
export * from './files.actions';
+export * from './files.model';
export * from './files.selectors';
export * from './files.state';
diff --git a/src/app/features/institutions/institutions.component.scss b/src/app/features/institutions/institutions.component.scss
index 5f81e6c60..da0c027b5 100644
--- a/src/app/features/institutions/institutions.component.scss
+++ b/src/app/features/institutions/institutions.component.scss
@@ -1,3 +1,5 @@
:host {
+ display: flex;
+ flex-direction: column;
flex: 1;
}
diff --git a/src/app/features/institutions/pages/institutions-search/institutions-search.component.html b/src/app/features/institutions/pages/institutions-search/institutions-search.component.html
index 43b00e7df..9dfe80209 100644
--- a/src/app/features/institutions/pages/institutions-search/institutions-search.component.html
+++ b/src/app/features/institutions/pages/institutions-search/institutions-search.component.html
@@ -1,4 +1,4 @@
-
+
@if (isInstitutionLoading()) {
diff --git a/src/app/features/metadata/dialogs/resource-tooltip-info/resource-tooltip-info.component.html b/src/app/features/metadata/dialogs/resource-tooltip-info/resource-tooltip-info.component.html
index 30b5db0c8..78f670046 100644
--- a/src/app/features/metadata/dialogs/resource-tooltip-info/resource-tooltip-info.component.html
+++ b/src/app/features/metadata/dialogs/resource-tooltip-info/resource-tooltip-info.component.html
@@ -7,11 +7,15 @@
{{ 'project.metadata.resourceInformation.tooltipDialog.dataTypeLink' | translate }}
-
+
{{ 'project.metadata.resourceInformation.tooltipDialog.dataTypeLink' | translate }}.
{{ 'project.metadata.resourceInformation.tooltipDialog.endText' | translate }}
-
+
{{ 'project.metadata.resourceInformation.tooltipDialog.helpLink' | translate }}.
diff --git a/src/app/features/metadata/metadata.component.html b/src/app/features/metadata/metadata.component.html
index 2ac7d88d0..cefa5d1b1 100644
--- a/src/app/features/metadata/metadata.component.html
+++ b/src/app/features/metadata/metadata.component.html
@@ -2,6 +2,7 @@
diff --git a/src/app/features/metadata/metadata.component.scss b/src/app/features/metadata/metadata.component.scss
index e69de29bb..da0c027b5 100644
--- a/src/app/features/metadata/metadata.component.scss
+++ b/src/app/features/metadata/metadata.component.scss
@@ -0,0 +1,5 @@
+:host {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+}
diff --git a/src/app/features/metadata/metadata.component.ts b/src/app/features/metadata/metadata.component.ts
index 457384475..8f47a4e8d 100644
--- a/src/app/features/metadata/metadata.component.ts
+++ b/src/app/features/metadata/metadata.component.ts
@@ -287,7 +287,7 @@ export class MetadataComponent implements OnInit {
.subscribe({
next: () => {
this.cedarFormReadonly.set(true);
- this.toastService.showSuccess('CEDAR record updated successfully');
+ this.toastService.showSuccess(this.translateService.instant('files.detail.toast.cedarUpdated'));
this.actions.getCedarRecords(this.resourceId, this.resourceType());
},
});
diff --git a/src/app/features/moderation/pages/my-preprint-reviewing/my-preprint-reviewing.component.html b/src/app/features/moderation/pages/my-preprint-reviewing/my-preprint-reviewing.component.html
index f82def47c..b831a3bc7 100644
--- a/src/app/features/moderation/pages/my-preprint-reviewing/my-preprint-reviewing.component.html
+++ b/src/app/features/moderation/pages/my-preprint-reviewing/my-preprint-reviewing.component.html
@@ -1,4 +1,4 @@
-
+
diff --git a/src/app/features/moderation/pages/my-preprint-reviewing/my-preprint-reviewing.component.scss b/src/app/features/moderation/pages/my-preprint-reviewing/my-preprint-reviewing.component.scss
index e69de29bb..da0c027b5 100644
--- a/src/app/features/moderation/pages/my-preprint-reviewing/my-preprint-reviewing.component.scss
+++ b/src/app/features/moderation/pages/my-preprint-reviewing/my-preprint-reviewing.component.scss
@@ -0,0 +1,5 @@
+:host {
+ display: flex;
+ flex-direction: column;
+ flex: 1;
+}
diff --git a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts
index 9de274a63..bdf624537 100644
--- a/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts
+++ b/src/app/features/project/addons/components/connect-configured-addon/connect-configured-addon.component.ts
@@ -14,7 +14,7 @@ import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { OperationNames } from '@osf/features/project/addons/enums';
-import { AddonConfigMap } from '@osf/features/project/addons/utils';
+import { AddonConfigMap } from '@osf/features/project/addons/models';
import { SubHeaderComponent } from '@osf/shared/components';
import { AddonType, ProjectAddonsStepperValue } from '@osf/shared/enums';
import { getAddonTypeString } from '@osf/shared/helpers';
diff --git a/src/app/features/project/addons/models/addon-config-map.type.ts b/src/app/features/project/addons/models/addon-config-map.type.ts
new file mode 100644
index 000000000..1873fd2a9
--- /dev/null
+++ b/src/app/features/project/addons/models/addon-config-map.type.ts
@@ -0,0 +1,3 @@
+import { AddonConfigActions } from '.';
+
+export type AddonConfigMap = Record
;
diff --git a/src/app/features/project/addons/models/index.ts b/src/app/features/project/addons/models/index.ts
index 78d25d7d0..488a1c42c 100644
--- a/src/app/features/project/addons/models/index.ts
+++ b/src/app/features/project/addons/models/index.ts
@@ -1 +1,2 @@
export * from './addon-config-actions.model';
+export * from './addon-config-map.type';
diff --git a/src/app/features/project/addons/utils/addon-config-map.type.ts b/src/app/features/project/addons/utils/addon-config-map.type.ts
deleted file mode 100644
index 54007dfeb..000000000
--- a/src/app/features/project/addons/utils/addon-config-map.type.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { AddonConfigActions } from '@osf/features/project/addons/models';
-
-export type AddonConfigMap = Record;
diff --git a/src/app/features/project/addons/utils/index.ts b/src/app/features/project/addons/utils/index.ts
deleted file mode 100644
index 298c14eb3..000000000
--- a/src/app/features/project/addons/utils/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './addon-config-map.type';
diff --git a/src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html b/src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html
index ec1de2b40..889a82a25 100644
--- a/src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html
+++ b/src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html
@@ -11,13 +11,13 @@
-
-
+
+
+
diff --git a/src/app/features/project/contributors/contributors.component.html b/src/app/features/project/contributors/contributors.component.html
index e87bcbeda..24a3fe118 100644
--- a/src/app/features/project/contributors/contributors.component.html
+++ b/src/app/features/project/contributors/contributors.component.html
@@ -1,6 +1,6 @@
{{ 'navigation.contributors' | translate }}
-
+
@if (isCurrentUserAdminContributor()) {
{{ 'myProjects.settings.accessRequests' | translate }}
[binary]="true"
[ngModel]="accessRequest()"
(ngModelChange)="accessRequestChange.emit($event)"
- id="accessRequest"
+ inputId="accessRequest"
name="ongoing"
>
-
diff --git a/src/app/features/project/settings/components/settings-wiki-card/settings-wiki-card.component.html b/src/app/features/project/settings/components/settings-wiki-card/settings-wiki-card.component.html
index 0a70898ab..fbe01563e 100644
--- a/src/app/features/project/settings/components/settings-wiki-card/settings-wiki-card.component.html
+++ b/src/app/features/project/settings/components/settings-wiki-card/settings-wiki-card.component.html
@@ -5,8 +5,8 @@ {{ 'myProjects.settings.wiki' | translate }}
diff --git a/src/app/features/project/settings/mappers/settings.mapper.ts b/src/app/features/project/settings/mappers/settings.mapper.ts
index 96429ca98..f51d8d70f 100644
--- a/src/app/features/project/settings/mappers/settings.mapper.ts
+++ b/src/app/features/project/settings/mappers/settings.mapper.ts
@@ -19,7 +19,6 @@ export class SettingsMapper {
id: nodeId,
attributes: {
accessRequestsEnabled: result.attributes.access_requests_enabled,
- anyoneCanComment: result.attributes.anyone_can_comment,
anyoneCanEditWiki: result.attributes.anyone_can_edit_wiki,
wikiEnabled: result.attributes.wiki_enabled,
},
diff --git a/src/app/features/project/settings/models/project-settings-response.model.ts b/src/app/features/project/settings/models/project-settings-response.model.ts
index 5a27c0e97..a1dc13596 100644
--- a/src/app/features/project/settings/models/project-settings-response.model.ts
+++ b/src/app/features/project/settings/models/project-settings-response.model.ts
@@ -1,6 +1,5 @@
export interface ProjectSettingsAttributes {
access_requests_enabled: boolean;
- anyone_can_comment: boolean;
anyone_can_edit_wiki: boolean;
wiki_enabled: boolean;
}
diff --git a/src/app/features/project/settings/settings.component.ts b/src/app/features/project/settings/settings.component.ts
index 9efc60829..c54c88917 100644
--- a/src/app/features/project/settings/settings.component.ts
+++ b/src/app/features/project/settings/settings.component.ts
@@ -207,7 +207,6 @@ export class SettingsComponent implements OnInit {
case 'access_requests_enabled':
case 'wiki_enabled':
case 'anyone_can_edit_wiki':
- case 'anyone_can_comment':
payload[changedField] = value as boolean;
break;
}
diff --git a/src/app/features/registries/components/new-registration/new-registration.component.html b/src/app/features/registries/components/new-registration/new-registration.component.html
index b60af0269..9f622d218 100644
--- a/src/app/features/registries/components/new-registration/new-registration.component.html
+++ b/src/app/features/registries/components/new-registration/new-registration.component.html
@@ -3,7 +3,7 @@
@@ -18,7 +18,7 @@ {{ ('registries.new.steps.title' | translate) + '1' }}
severity="info"
[label]="'common.buttons.yes' | translate"
[raised]="fromProject"
- (click)="toggleFromProject()"
+ (onClick)="toggleFromProject()"
/>
{{ ('registries.new.steps.title' | translate) + '1' }}
severity="info"
[label]="'common.buttons.no' | translate"
[raised]="!fromProject"
- (click)="toggleFromProject()"
+ (onClick)="toggleFromProject()"
/>
diff --git a/src/app/features/registries/components/new-registration/new-registration.component.ts b/src/app/features/registries/components/new-registration/new-registration.component.ts
index 4f3243ddb..a557bb4d6 100644
--- a/src/app/features/registries/components/new-registration/new-registration.component.ts
+++ b/src/app/features/registries/components/new-registration/new-registration.component.ts
@@ -113,7 +113,7 @@ export class NewRegistrationComponent {
projectId: this.fromProject ? (project ?? undefined) : undefined,
})
.subscribe(() => {
- this.toastService.showSuccess('Draft created successfully');
+ this.toastService.showSuccess('registries.new.createdSuccessfully');
this.router.navigate(['/registries/drafts/', this.draftRegistration()?.id, 'metadata']);
});
}
diff --git a/src/app/shared/components/files-tree/files-tree.component.ts b/src/app/shared/components/files-tree/files-tree.component.ts
index 98a2ee568..63a605d6e 100644
--- a/src/app/shared/components/files-tree/files-tree.component.ts
+++ b/src/app/shared/components/files-tree/files-tree.component.ts
@@ -7,6 +7,7 @@ import { Tree, TreeNodeDropEvent } from 'primeng/tree';
import { EMPTY, finalize, firstValueFrom, Observable, take } from 'rxjs';
+import { Clipboard } from '@angular/cdk/clipboard';
import { DatePipe } from '@angular/common';
import {
AfterViewInit,
@@ -70,6 +71,7 @@ export class FilesTreeComponent implements OnDestroy, AfterViewInit {
readonly dialogService = inject(DialogService);
readonly translateService = inject(TranslateService);
readonly dataciteService = inject(DataciteService);
+ readonly clipboard = inject(Clipboard);
files = input.required();
totalCount = input(0);
@@ -389,14 +391,8 @@ export class FilesTreeComponent implements OnDestroy, AfterViewInit {
}
copyToClipboard(embedHtml: string): void {
- navigator.clipboard
- .writeText(embedHtml)
- .then(() => {
- this.toastService.showSuccess('files.toast.copiedToClipboard');
- })
- .catch((err) => {
- this.toastService.showError(err.message);
- });
+ this.clipboard.copy(embedHtml);
+ this.toastService.showSuccess('files.toast.copiedToClipboard');
}
async dropNode(event: TreeNodeDropEvent) {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 64a828227..e7d3000fd 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -2680,7 +2680,7 @@
},
"institutions": {
"title": "Institutions",
- "description": "OSF Institutions enhances transparency and increases the visibility of research outputs, accelerating discovery and reuse. Institutional members focus on generating and sharing research, and let OSF Institutions handle the infrastructure.
Read more",
+ "description": "OSF Institutions enhances transparency and increases the visibility of research outputs, accelerating discovery and reuse. Institutional members focus on generating and sharing research, and let OSF Institutions handle the infrastructure.
Read more",
"searchInstitutions": "Search institutions",
"searchInstitutionsDesctiption": "Please select an institution to apply to your search. Only OSF Institutions member affiliations are discoverable. ",
"learnMore": "Learn more about OSF Institutions."
@@ -2950,4 +2950,4 @@
"software": "Software",
"other": "Other"
}
-}
+}
\ No newline at end of file