Skip to content

Commit 702d618

Browse files
committed
Merge branch 'main' into fix/search-updates
# Conflicts: # src/app/features/institutions/institutions.routes.ts # src/app/features/my-profile/components/my-profile-filter-chips/my-profile-filter-chips.component.scss # src/app/features/my-profile/components/my-profile-search/my-profile-search.component.scss # src/app/features/preprints/components/filters/preprints-filter-chips/preprints-filter-chips.component.scss # src/app/features/preprints/components/filters/preprints-resources-filters/preprints-resources-filters.component.scss # src/app/features/preprints/components/filters/preprints-resources/preprints-resources.component.scss # src/app/features/search/components/filter-chips/filter-chips.component.scss # src/app/features/search/components/resource-filters/resource-filters.component.scss # src/app/features/search/components/resources/resources.component.scss # src/app/shared/constants/index.ts # src/app/shared/models/index.ts # src/app/shared/models/user/user.models.ts # src/app/shared/models/view-only-links/view-only-link-response.model.ts # src/app/shared/stores/index.ts
2 parents 1bb26ba + cf5041d commit 702d618

424 files changed

Lines changed: 3890 additions & 7323 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

angular.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"allowedCommonJsDependencies": [
2828
"qrcode",
2929
"cedar-embeddable-editor",
30+
"cedar-artifact-viewer",
3031
"markdown-it-video",
3132
"ace-builds/src-noconflict/ext-language_tools"
3233
],
@@ -43,7 +44,7 @@
4344
}
4445
],
4546
"styles": [
46-
"src/assets/styles/styles.scss",
47+
"src/styles/styles.scss",
4748
"node_modules/primeflex/primeflex.css",
4849
"node_modules/@fortawesome/fontawesome-free/css/all.min.css",
4950
"node_modules/ngx-markdown-editor/assets/highlight.js/agate.min.css"

eslint.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ module.exports = tseslint.config(
8282
],
8383
'simple-import-sort/exports': 'error',
8484
'unused-imports/no-unused-imports': 'error',
85+
'no-console': 'error',
8586
},
8687
},
8788
{

jest.config.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
'^@osf/(.*)$': '<rootDir>/src/app/$1',
99
'^@core/(.*)$': '<rootDir>/src/app/core/$1',
1010
'^@shared/(.*)$': '<rootDir>/src/app/shared/$1',
11-
'^@styles/(.*)$': '<rootDir>/assets/styles/$1',
11+
'^@styles/(.*)$': '<rootDir>/src/styles/$1',
1212
'^@testing/(.*)$': '<rootDir>/src/testing/$1',
1313
'^src/environments/environment$': '<rootDir>/src/environments/environment.ts',
1414
},
@@ -78,10 +78,7 @@ module.exports = {
7878
'<rootDir>/src/app/features/files/',
7979
'<rootDir>/src/app/features/my-projects/',
8080
'<rootDir>/src/app/features/preprints/',
81-
'<rootDir>/src/app/features/project/analytics/',
8281
'<rootDir>/src/app/features/project/contributors/',
83-
'<rootDir>/src/app/features/project/files/',
84-
'<rootDir>/src/app/features/project/metadata/',
8582
'<rootDir>/src/app/features/project/overview/',
8683
'<rootDir>/src/app/features/project/registrations',
8784
'<rootDir>/src/app/features/project/settings',
@@ -101,9 +98,6 @@ module.exports = {
10198
'<rootDir>/src/app/shared/components/pie-chart/',
10299
'<rootDir>/src/app/shared/components/resource-citations/',
103100
'<rootDir>/src/app/shared/components/reusable-filter/',
104-
'<rootDir>/src/app/shared/components/shared-metadata/dialogs/affiliated-institutions-dialog/',
105-
'<rootDir>/src/app/shared/components/shared-metadata/dialogs/contributors-dialog/',
106-
'<rootDir>/src/app/shared/components/shared-metadata/shared-metadata',
107101
'<rootDir>/src/app/shared/components/subjects/',
108102
'<rootDir>/src/app/shared/components/wiki/edit-section/',
109103
'<rootDir>/src/app/shared/components/wiki/wiki-list/',

package-lock.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"@ngxs/store": "^19.0.0",
4747
"@primeng/themes": "^19.0.9",
4848
"ace-builds": "^1.42.0",
49+
"cedar-artifact-viewer": "^0.9.5",
4950
"cedar-embeddable-editor": "^1.5.0",
5051
"chart.js": "^4.4.9",
5152
"diff": "^8.0.2",

src/app/app.routes.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { provideStates } from '@ngxs/store';
22

33
import { Routes } from '@angular/router';
44

5+
import { isFileGuard } from '@core/guards/is-file.guard';
56
import { BookmarksState, ProjectsState } from '@shared/stores';
67

78
import { authGuard, redirectIfLoggedInGuard } from './core/guards';
@@ -165,9 +166,9 @@ export const routes: Routes = [
165166
data: { skipBreadcrumbs: true },
166167
},
167168
{
168-
path: 'files/:fileGuid',
169-
loadComponent: () =>
170-
import('@osf/features/files/pages/file-detail/file-detail.component').then((c) => c.FileDetailComponent),
169+
path: ':id',
170+
canMatch: [isFileGuard],
171+
loadChildren: () => import('./features/files/files.routes').then((m) => m.filesRoutes),
171172
},
172173
{
173174
path: ':id',

src/app/core/components/breadcrumb/breadcrumb.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use "assets/styles/variables" as var;
1+
@use "styles/variables" as var;
22

33
.breadcrumbs {
44
color: var(--header-color, var.$dark-blue-1);

src/app/core/components/footer/footer.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use "assets/styles/mixins" as mix;
1+
@use "styles/mixins" as mix;
22

33
.footer-nav,
44
.footer-secondary-nav {

src/app/core/components/forbidden-page/forbidden-page.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use "assets/styles/mixins" as mix;
1+
@use "styles/mixins" as mix;
22

33
:host {
44
@include mix.flex-center;

src/app/core/components/header/header.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use "assets/styles/mixins" as mix;
1+
@use "styles/mixins" as mix;
22

33
.header {
44
position: absolute;

0 commit comments

Comments
 (0)