diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..3e43c5b22 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,41 @@ +# Compiled output +/dist +/tmp +/out-tsc +/bazel-out + +# Node +/node_modules +npm-debug.log +yarn-error.log + +# IDEs and editors +.idea/ +.project +.classpath +.c9/ +*.launch +.settings/ +*.sublime-workspace +bun.lock + +# Visual Studio Code +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +.history/* + +# Miscellaneous +/.angular/cache +.sass-cache/ +/connect.lock +/coverage +/libpeerconnection.log +testem.log +/typings + +# System files +.DS_Store +Thumbs.db \ No newline at end of file diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..dba01222a --- /dev/null +++ b/.prettierrc @@ -0,0 +1,23 @@ +{ + "semi": true, + "trailingComma": "es5", + "singleQuote": true, + "printWidth": 120, + "tabWidth": 2, + "endOfLine": "auto", + "bracketSpacing": true, + "overrides": [ + { + "files": "*.scss", + "options": { + "singleQuote": false + } + }, + { + "files": "*.html", + "options": { + "printWidth": 120 + } + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 93a2be92f..739a7519a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "editor.formatOnSave": false, + "editor.formatOnSave": true, "eslint.format.enable": true, "editor.codeActionsOnSave": { "source.fixAll.stylelint": "explicit", @@ -9,5 +9,5 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "scss.lint.unknownAtRules": "ignore", - "eslint.validate": ["json"], + "eslint.validate": ["json"] } diff --git a/angular.json b/angular.json index f68268696..fb981a90c 100644 --- a/angular.json +++ b/angular.json @@ -21,9 +21,7 @@ "outputPath": "dist/osf", "index": "src/index.html", "browser": "src/main.ts", - "polyfills": [ - "zone.js" - ], + "polyfills": ["zone.js"], "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", "assets": [ @@ -92,18 +90,11 @@ "test": { "builder": "@angular-devkit/build-angular:karma", "options": { - "polyfills": [ - "zone.js", - "zone.js/testing" - ], + "polyfills": ["zone.js", "zone.js/testing"], "tsConfig": "tsconfig.spec.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/assets" - ], - "styles": [ - "src/assets/styles/styles.scss" - ], + "assets": ["src/assets"], + "styles": ["src/assets/styles/styles.scss"], "stylePreprocessorOptions": { "includePaths": ["src"] }, @@ -113,19 +104,14 @@ "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "lintFilePatterns": [ - "src/**/*.ts", - "src/**/*.html" - ] + "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"] } } } } }, "cli": { - "schematicCollections": [ - "angular-eslint" - ], + "schematicCollections": ["angular-eslint"], "packageManager": "bun", "analytics": false } diff --git a/bun.lock b/bun.lock index 878274769..171cc5245 100644 --- a/bun.lock +++ b/bun.lock @@ -6,7 +6,6 @@ "dependencies": { "@angular/animations": "^19.2.0", "@angular/cdk": "^19.2.1", - "@angular/cli": "^19.2.0", "@angular/common": "^19.2.0", "@angular/compiler": "^19.2.0", "@angular/core": "^19.2.0", @@ -47,9 +46,9 @@ "lint-staged": "^15.4.3", "prettier": "3.5.2", "typescript": "~5.7.2", - "typescript-eslint": "8.23.0", - }, - }, + "typescript-eslint": "8.23.0" + } + } }, "packages": { "@ampproject/remapping": ["@ampproject/remapping@2.3.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw=="], diff --git a/commitlint.config.cjs b/commitlint.config.cjs index 0a0e5a2a6..33a11c3e9 100644 --- a/commitlint.config.cjs +++ b/commitlint.config.cjs @@ -1,31 +1,31 @@ module.exports = { - extends: ["@commitlint/config-conventional"], + extends: ['@commitlint/config-conventional'], rules: { - "type-enum": [ + 'type-enum': [ 2, - "always", + 'always', [ - "feat", // New feature - "fix", // Bug fix - "docs", // Documentation update - "style", // Code style (formatting, missing semicolons, etc.) - "refactor", // Code refactoring (no feature changes) - "perf", // Performance improvements - "test", // Adding tests - "chore", // Build process, CI/CD, dependencies - "revert" // Reverting changes - ] + 'feat', // New feature + 'fix', // Bug fix + 'docs', // Documentation update + 'style', // Code style (formatting, missing semicolons, etc.) + 'refactor', // Code refactoring (no feature changes) + 'perf', // Performance improvements + 'test', // Adding tests + 'chore', // Build process, CI/CD, dependencies + 'revert', // Reverting changes + ], ], - "scope-empty": [2, "never"], // Scope must always be present - "subject-case": [ + 'scope-empty': [2, 'never'], // Scope must always be present + 'subject-case': [ 2, - "always", - ["sentence-case", "start-case", "lower-case"] // Enforce casing + 'always', + ['sentence-case', 'start-case', 'lower-case'], // Enforce casing ], - "subject-empty": [2, "never"], // Prevent empty subjects - "header-max-length": [2, "always", 100], // Max length of the commit message header - "body-leading-blank": [2, "always"], // Enforce blank line before the body - "footer-leading-blank": [2, "always"], // Enforce blank line before footer - "body-max-line-length": [2, "always", 200] // Set max length for body lines - } + 'subject-empty': [2, 'never'], // Prevent empty subjects + 'header-max-length': [2, 'always', 100], // Max length of the commit message header + 'body-leading-blank': [2, 'always'], // Enforce blank line before the body + 'footer-leading-blank': [2, 'always'], // Enforce blank line before footer + 'body-max-line-length': [2, 'always', 200], // Set max length for body lines + }, }; diff --git a/docs/arch.md b/docs/arch.md index 7da5851f9..c926abcef 100644 --- a/docs/arch.md +++ b/docs/arch.md @@ -56,3 +56,4 @@ ng generate component feature-name/components/new-component | ✨ **Directive** | `ng g d shared/directives/highlight` | +``` diff --git a/docs/git-convention.md b/docs/git-convention.md index 013ce2f61..9536e0628 100644 --- a/docs/git-convention.md +++ b/docs/git-convention.md @@ -22,6 +22,7 @@ short-description – a brief description of the change. # 📌 Available Types (type) ### We use the following types to categorize changes: + ```bash | Type --- Purpose | feat --- Adding a new feature @@ -40,6 +41,7 @@ short-description – a brief description of the change. # 📝 Branch Naming Examples ### Here are some examples of branch names: + ```bash * feat/1234-add-user-authentication * fix/5678-fix-login-bug @@ -48,9 +50,11 @@ short-description – a brief description of the change. * test/8765-add-e2e-tests-for-dashboard ``` + # 🛠 Example of Creating a Branch: ### To create a new branch, use the following command: + ```bash git checkout -b feat/1234-add-user-authentication @@ -58,11 +62,11 @@ git checkout -b feat/1234-add-user-authentication # 🏆 Best Practices -* ✅ Use short and clear descriptions in branch names. -* ✅ Follow a consistent style across all branches for better project structure. -* ✅ Avoid redundant words, e.g., fix/1234-fix-bug (the word "fix" is redundant). -* ✅ Use kebab-case (- instead of _ or CamelCase). -* ✅ If there is no issue ID, omit it, e.g., docs/update-contributing-guide. +- ✅ Use short and clear descriptions in branch names. +- ✅ Follow a consistent style across all branches for better project structure. +- ✅ Avoid redundant words, e.g., fix/1234-fix-bug (the word "fix" is redundant). +- ✅ Use kebab-case (- instead of \_ or CamelCase). +- ✅ If there is no issue ID, omit it, e.g., docs/update-contributing-guide. # 🔗 Additional Resources @@ -126,4 +130,3 @@ Angular Commit Guidelines: https://github.com/angular/angular/blob/main/CONTRIBU Git Flow: https://nvie.com/posts/a-successful-git-branching-model/ This branch naming and commit message strategy ensures better traceability and improves commit history readability. 🚀 - diff --git a/eslint.config.js b/eslint.config.js index 7c32eb328..df13110bc 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,90 +1,89 @@ // @ts-check -const eslint = require("@eslint/js"); -const tseslint = require("typescript-eslint"); -const angular = require("angular-eslint"); -const pluginImport = require("eslint-plugin-import"); -const pluginSimpleImportSort = require("eslint-plugin-simple-import-sort"); -const pluginUnusedImports = require("eslint-plugin-unused-imports"); +const eslint = require('@eslint/js'); +const tseslint = require('typescript-eslint'); +const angular = require('angular-eslint'); +const pluginImport = require('eslint-plugin-import'); +const pluginSimpleImportSort = require('eslint-plugin-simple-import-sort'); +const pluginUnusedImports = require('eslint-plugin-unused-imports'); +const eslintPluginPrettierRecommended = require('eslint-plugin-prettier/recommended'); module.exports = tseslint.config( { - files: ["**/*.ts"], + files: ['**/*.ts'], extends: [ eslint.configs.recommended, ...tseslint.configs.recommended, ...tseslint.configs.stylistic, ...angular.configs.tsRecommended, + eslintPluginPrettierRecommended, ], processor: angular.processInlineTemplates, plugins: { import: pluginImport, - "simple-import-sort": pluginSimpleImportSort, - "unused-imports": pluginUnusedImports, + 'simple-import-sort': pluginSimpleImportSort, + 'unused-imports': pluginUnusedImports, }, rules: { - "@typescript-eslint/no-unused-vars": "warn", - "@angular-eslint/directive-selector": [ - "error", + '@typescript-eslint/no-unused-vars': 'warn', + '@angular-eslint/directive-selector': [ + 'error', { - type: "attribute", - prefix: "osf", - style: "camelCase", + type: 'attribute', + prefix: 'osf', + style: 'camelCase', }, ], - "@angular-eslint/component-selector": [ - "error", + '@angular-eslint/component-selector': [ + 'error', { - type: "element", - prefix: "osf", - style: "kebab-case", + type: 'element', + prefix: 'osf', + style: 'kebab-case', }, ], - "import/first": "error", - "import/no-duplicates": "warn", - "import/newline-after-import": "warn", - "simple-import-sort/imports": [ - "warn", + 'import/first': 'error', + 'import/no-duplicates': 'warn', + 'import/newline-after-import': 'warn', + 'simple-import-sort/imports': [ + 'warn', { groups: [ // NGXS packages - ["^@ngxs"], + ['^@ngxs'], // NGX packages (ngx-... or @ngx/...) - ["^ngx-", "^@ngx"], + ['^ngx-', '^@ngx'], // Third-party packages (primeng) - ["^primeng"], + ['^primeng'], // RxJS packages (rxjs or @rxjs/...) - ["^rxjs", "^rxjs/operators"], + ['^rxjs', '^rxjs/operators'], // Angular packages - ["^@angular"], + ['^@angular'], // Internal aliases (customize as needed) - ["^@core/", "^@osf/", "^@shared/"], + ['^@core/', '^@osf/', '^@shared/'], // Side effect imports - ["^\\u0000"], + ['^\\u0000'], // Parent imports - ["^\\.\\.(?!/?$)", "^\\.\\./?$"], + ['^\\.\\.(?!/?$)', '^\\.\\./?$'], // Sibling and current directory imports - ["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"], + ['^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'], ], }, ], - "simple-import-sort/exports": "warn", - "unused-imports/no-unused-imports": "warn", + 'simple-import-sort/exports': 'warn', + 'unused-imports/no-unused-imports': 'warn', }, }, { - files: ["**/*.html"], - extends: [ - ...angular.configs.templateRecommended, - ...angular.configs.templateAccessibility, - ], + files: ['**/*.html'], + extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility], rules: {}, - }, + } ); diff --git a/package.json b/package.json index 816005c3c..b1fb161c5 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "dependencies": { "@angular/animations": "^19.2.0", "@angular/cdk": "^19.2.1", - "@angular/cli": "^19.2.0", "@angular/common": "^19.2.0", "@angular/compiler": "^19.2.0", "@angular/core": "^19.2.0", @@ -51,7 +50,9 @@ "@types/jasmine": "~5.1.0", "angular-eslint": "19.1.0", "eslint": "^9.20.0", + "eslint-config-prettier": "^10.1.5", "eslint-plugin-import": "^2.31.0", + "eslint-plugin-prettier": "^5.4.0", "eslint-plugin-simple-import-sort": "^12.1.1", "eslint-plugin-unused-imports": "^4.1.4", "fantasticon": "^3.0.0", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1f413c5e5..7ca737092 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,11 +1,6 @@ import { Store } from '@ngxs/store'; -import { - ChangeDetectionStrategy, - Component, - inject, - OnInit, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core'; import { RouterOutlet } from '@angular/router'; import { GetCurrentUser } from '@core/store/user'; @@ -15,7 +10,6 @@ import { GetCurrentUser } from '@core/store/user'; imports: [RouterOutlet], templateUrl: './app.component.html', styleUrl: './app.component.scss', - standalone: true, changeDetection: ChangeDetectionStrategy.OnPush, }) export class AppComponent implements OnInit { diff --git a/src/app/app.config.ts b/src/app/app.config.ts index dd7d26346..b6d04d7a1 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -7,14 +7,9 @@ import { ConfirmationService } from 'primeng/api'; import { providePrimeNG } from 'primeng/config'; import { provideHttpClient } from '@angular/common/http'; -import { - ApplicationConfig, - importProvidersFrom, - provideZoneChangeDetection, -} from '@angular/core'; +import { ApplicationConfig, importProvidersFrom, provideZoneChangeDetection } from '@angular/core'; import { provideAnimations } from '@angular/platform-browser/animations'; import { provideRouter } from '@angular/router'; -import { provideServiceWorker } from '@angular/service-worker'; import { STATES } from '@core/constants/ngxs-states.constant'; import { provideTranslation } from '@core/helpers/i18n.helper'; @@ -42,10 +37,6 @@ export const appConfig: ApplicationConfig = { }), provideAnimations(), provideHttpClient(), - provideServiceWorker('ngsw-worker.js', { - enabled: true, - registrationStrategy: 'registerWhenStable:30000', - }), ConfirmationService, importProvidersFrom(TranslateModule.forRoot(provideTranslation())), ], diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index fc1d6c8a1..6b7fd219c 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -8,10 +8,7 @@ import { ResourceFiltersState } from '@shared/components/resources/resource-filt export const routes: Routes = [ { path: '', - loadComponent: () => - import('./core/components/root/root.component').then( - (mod) => mod.RootComponent, - ), + loadComponent: () => import('./core/components/root/root.component').then((mod) => mod.RootComponent), children: [ { path: '', @@ -20,73 +17,51 @@ export const routes: Routes = [ }, { path: 'sign-up', - loadComponent: () => - import('./features/auth/sign-up/sign-up.component').then( - (mod) => mod.SignUpComponent, - ), + loadComponent: () => import('./features/auth/sign-up/sign-up.component').then((mod) => mod.SignUpComponent), }, { path: 'forgot-password', loadComponent: () => - import( - './features/auth/forgot-password/forgot-password.component' - ).then((mod) => mod.ForgotPasswordComponent), + import('./features/auth/forgot-password/forgot-password.component').then( + (mod) => mod.ForgotPasswordComponent + ), }, { path: 'reset-password', loadComponent: () => - import( - './features/auth/reset-password/reset-password.component' - ).then((mod) => mod.ResetPasswordComponent), + import('./features/auth/reset-password/reset-password.component').then((mod) => mod.ResetPasswordComponent), }, { path: 'home', - loadComponent: () => - import('./features/home/home.component').then( - (mod) => mod.HomeComponent, - ), + loadComponent: () => import('./features/home/home.component').then((mod) => mod.HomeComponent), }, { path: 'home-logged-out', loadComponent: () => - import('./features/home/logged-out/home-logged-out.component').then( - (mod) => mod.HomeLoggedOutComponent, - ), + import('./features/home/logged-out/home-logged-out.component').then((mod) => mod.HomeLoggedOutComponent), }, { path: 'support', - loadComponent: () => - import('./features/support/support.component').then( - (mod) => mod.SupportComponent, - ), + loadComponent: () => import('./features/support/support.component').then((mod) => mod.SupportComponent), }, { path: 'terms-of-use', loadComponent: () => - import('./features/terms-of-use/terms-of-use.component').then( - (mod) => mod.TermsOfUseComponent, - ), + import('./features/terms-of-use/terms-of-use.component').then((mod) => mod.TermsOfUseComponent), }, { path: 'privacy-policy', loadComponent: () => - import('./features/privacy-policy/privacy-policy.component').then( - (mod) => mod.PrivacyPolicyComponent, - ), + import('./features/privacy-policy/privacy-policy.component').then((mod) => mod.PrivacyPolicyComponent), }, { path: 'my-projects', loadComponent: () => - import('./features/my-projects/my-projects.component').then( - (mod) => mod.MyProjectsComponent, - ), + import('./features/my-projects/my-projects.component').then((mod) => mod.MyProjectsComponent), }, { path: 'my-projects/:id', - loadComponent: () => - import('@osf/features/project/project.component').then( - (mod) => mod.ProjectComponent, - ), + loadComponent: () => import('@osf/features/project/project.component').then((mod) => mod.ProjectComponent), children: [ { path: '', @@ -96,66 +71,51 @@ export const routes: Routes = [ { path: 'overview', loadComponent: () => - import( - '@osf/features/project/overview/project-overview.component' - ).then((mod) => mod.ProjectOverviewComponent), + import('@osf/features/project/overview/project-overview.component').then( + (mod) => mod.ProjectOverviewComponent + ), }, { path: 'metadata', loadComponent: () => - import( - '@osf/features/project/metadata/project-metadata.component' - ).then((mod) => mod.ProjectMetadataComponent), + import('@osf/features/project/metadata/project-metadata.component').then( + (mod) => mod.ProjectMetadataComponent + ), }, { path: 'files', loadComponent: () => - import( - '@osf/features/project/files/project-files.component' - ).then((mod) => mod.ProjectFilesComponent), + import('@osf/features/project/files/project-files.component').then((mod) => mod.ProjectFilesComponent), }, { path: 'files/:fileId', loadComponent: () => - import( - '@osf/features/project/files/file-detail/file-detail.component' - ).then((mod) => mod.FileDetailComponent), + import('@osf/features/project/files/file-detail/file-detail.component').then( + (mod) => mod.FileDetailComponent + ), }, { path: 'registrations', loadComponent: () => - import( - '@osf/features/project/registrations/registrations.component' - ).then((mod) => mod.RegistrationsComponent), + import('@osf/features/project/registrations/registrations.component').then( + (mod) => mod.RegistrationsComponent + ), }, ], }, { path: 'settings', - loadChildren: () => - import('./features/settings/settings.routes').then( - (mod) => mod.settingsRoutes, - ), + loadChildren: () => import('./features/settings/settings.routes').then((mod) => mod.settingsRoutes), }, { path: 'search', - loadComponent: () => - import('./features/search/search.component').then( - (mod) => mod.SearchComponent, - ), - providers: [ - provideStates([ResourceFiltersState, ResourceFiltersOptionsState]), - ], + loadComponent: () => import('./features/search/search.component').then((mod) => mod.SearchComponent), + providers: [provideStates([ResourceFiltersState, ResourceFiltersOptionsState])], }, { path: 'my-profile', - loadComponent: () => - import('./features/my-profile/my-profile.component').then( - (mod) => mod.MyProfileComponent, - ), - providers: [ - provideStates([ResourceFiltersState, ResourceFiltersOptionsState]), - ], + loadComponent: () => import('./features/my-profile/my-profile.component').then((mod) => mod.MyProfileComponent), + providers: [provideStates([ResourceFiltersState, ResourceFiltersOptionsState])], }, ], }, diff --git a/src/app/core/components/breadcrumb/breadcrumb.component.html b/src/app/core/components/breadcrumb/breadcrumb.component.html index 5cf0b7aca..291606465 100644 --- a/src/app/core/components/breadcrumb/breadcrumb.component.html +++ b/src/app/core/components/breadcrumb/breadcrumb.component.html @@ -1,4 +1,4 @@ -@if (parsedUrl()[0] !== "home") { +@if (parsedUrl()[0] !== 'home') {

/

diff --git a/src/app/core/components/breadcrumb/breadcrumb.component.ts b/src/app/core/components/breadcrumb/breadcrumb.component.ts index 98e01b387..65a4bae6b 100644 --- a/src/app/core/components/breadcrumb/breadcrumb.component.ts +++ b/src/app/core/components/breadcrumb/breadcrumb.component.ts @@ -21,12 +21,10 @@ export class BreadcrumbComponent { }); constructor() { - this.#router.events - .pipe(takeUntilDestroyed(this.#destroyRef)) - .subscribe((event) => { - if (event instanceof NavigationEnd) { - this.url.set(this.#router.url); - } - }); + this.#router.events.pipe(takeUntilDestroyed(this.#destroyRef)).subscribe((event) => { + if (event instanceof NavigationEnd) { + this.url.set(this.#router.url); + } + }); } } diff --git a/src/app/core/components/footer/footer.component.html b/src/app/core/components/footer/footer.component.html index fd5ac9aba..90815a9f7 100644 --- a/src/app/core/components/footer/footer.component.html +++ b/src/app/core/components/footer/footer.component.html @@ -2,23 +2,16 @@
- {{ "footer.links.centerForOpenScience" | translate }} + {{ 'footer.links.centerForOpenScience' | translate }} | - {{ - "footer.links.reproducibilityProjectPsychology" | translate - }} + {{ 'footer.links.reproducibilityProjectPsychology' | translate }} | - {{ - "footer.links.reproducibilityProjectCancerBiology" | translate - }} + {{ 'footer.links.reproducibilityProjectCancerBiology' | translate }}
@for (icon of socialIcons; track icon.name) { - + social media icon
- {{ - "footer.links.termsOfUse" | translate - }} + {{ 'footer.links.termsOfUse' | translate }} | - {{ - "footer.links.privacyPolicy" | translate - }} + {{ 'footer.links.privacyPolicy' | translate }} | - {{ "footer.links.status" | translate }} + {{ 'footer.links.status' | translate }} | - {{ "footer.links.api" | translate }} + {{ 'footer.links.api' | translate }} | - {{ "footer.links.topGuidelines" | translate }} + {{ 'footer.links.topGuidelines' | translate }}
-
{{ "footer.copyright" | translate }}
+
{{ 'footer.copyright' | translate }}
diff --git a/src/app/core/components/header/header.component.ts b/src/app/core/components/header/header.component.ts index cb72e33ce..a5e04c017 100644 --- a/src/app/core/components/header/header.component.ts +++ b/src/app/core/components/header/header.component.ts @@ -7,12 +7,7 @@ import { MenuModule } from 'primeng/menu'; import { map } from 'rxjs'; -import { - ChangeDetectionStrategy, - Component, - computed, - inject, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { Router } from '@angular/router'; @@ -44,12 +39,8 @@ export class HeaderComponent { #currentUrl = toSignal(this.#router.events.pipe(map(() => this.#router.url))); protected readonly authButtonText = computed(() => - this.#currentUrl()?.includes('sign-up') - ? 'navigation.signIn' - : 'navigation.signUp', + this.#currentUrl()?.includes('sign-up') ? 'navigation.signIn' : 'navigation.signUp' ); - protected readonly authButtonLink = computed(() => - this.#currentUrl()?.includes('sign-up') ? '/login' : '/sign-up', - ); + protected readonly authButtonLink = computed(() => (this.#currentUrl()?.includes('sign-up') ? '/login' : '/sign-up')); } diff --git a/src/app/core/components/nav-menu/nav-menu.component.html b/src/app/core/components/nav-menu/nav-menu.component.html index 2b6f0c83f..8a1a6b780 100644 --- a/src/app/core/components/nav-menu/nav-menu.component.html +++ b/src/app/core/components/nav-menu/nav-menu.component.html @@ -5,14 +5,10 @@ [routerLink]="item.routerLink" routerLinkActive="active" [routerLinkActiveOptions]="{ - exact: - item.label !== 'navigation.myProjects' ? item.useExactMatch : true, + exact: item.label !== 'navigation.myProjects' ? item.useExactMatch : true, }" class="nav-link flex" - [class.mt-5]=" - item.label === 'navigation.settings' || - item.label === 'navigation.myProjects' - " + [class.mt-5]="item.label === 'navigation.settings' || item.label === 'navigation.myProjects'" (click)="goToLink()" > @if (item.icon) { @@ -20,23 +16,16 @@ } {{ item.label | translate }} @if (item.items) { - + } - @if (item.label === "navigation.myProjects" && isProjectRoute()) { + @if (item.label === 'navigation.myProjects' && isProjectRoute()) {
{{ item.label | translate }} @if (item.items) { } diff --git a/src/app/core/components/nav-menu/nav-menu.component.ts b/src/app/core/components/nav-menu/nav-menu.component.ts index 721cefdcd..36cd5059d 100644 --- a/src/app/core/components/nav-menu/nav-menu.component.ts +++ b/src/app/core/components/nav-menu/nav-menu.component.ts @@ -7,18 +7,9 @@ import { filter, map } from 'rxjs'; import { Component, computed, inject, output } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; -import { - ActivatedRoute, - NavigationEnd, - Router, - RouterLink, - RouterLinkActive, -} from '@angular/router'; +import { ActivatedRoute, NavigationEnd, Router, RouterLink, RouterLinkActive } from '@angular/router'; -import { - NAV_ITEMS, - PROJECT_MENU_ITEMS, -} from '@core/constants/nav-items.constant'; +import { NAV_ITEMS, PROJECT_MENU_ITEMS } from '@core/constants/nav-items.constant'; import { NavItem } from '@shared/entities/nav-item.interface'; @Component({ @@ -32,25 +23,21 @@ export class NavMenuComponent { readonly #route = inject(ActivatedRoute); protected readonly navItems = NAV_ITEMS; protected readonly myProjectMenuItems = PROJECT_MENU_ITEMS; - protected readonly mainMenuItems = this.navItems.map((item) => - this.#convertToMenuItem(item), - ); + protected readonly mainMenuItems = this.navItems.map((item) => this.#convertToMenuItem(item)); closeMenu = output(); protected readonly currentRoute = toSignal( this.#router.events.pipe( filter((event): event is NavigationEnd => event instanceof NavigationEnd), - map(() => this.#getRouteInfo()), + map(() => this.#getRouteInfo()) ), { initialValue: this.#getRouteInfo(), - }, + } ); - protected readonly currentProjectId = computed( - () => this.currentRoute().projectId, - ); + protected readonly currentProjectId = computed(() => this.currentRoute().projectId); protected readonly isProjectRoute = computed(() => !!this.currentProjectId()); #convertToMenuItem(item: NavItem): MenuItem { @@ -58,8 +45,7 @@ export class NavMenuComponent { const isExpanded = item.isCollapsible && (currentUrl.startsWith(item.path) || - (item.items?.some((subItem) => currentUrl.startsWith(subItem.path)) ?? - false)); + (item.items?.some((subItem) => currentUrl.startsWith(subItem.path)) ?? false)); return { label: item.label, @@ -72,8 +58,7 @@ export class NavMenuComponent { #getRouteInfo() { const projectId = this.#route.firstChild?.snapshot.params['id'] || null; - const section = - this.#route.firstChild?.firstChild?.snapshot.url[0]?.path || 'overview'; + const section = this.#route.firstChild?.firstChild?.snapshot.url[0]?.path || 'overview'; return { projectId, section }; } diff --git a/src/app/core/components/topnav/topnav.component.html b/src/app/core/components/topnav/topnav.component.html index 6fff0ef9b..9cfdf83c8 100644 --- a/src/app/core/components/topnav/topnav.component.html +++ b/src/app/core/components/topnav/topnav.component.html @@ -8,14 +8,7 @@ > - - + + diff --git a/src/app/core/helpers/http.helper.ts b/src/app/core/helpers/http.helper.ts index cc672cfff..56531b2be 100644 --- a/src/app/core/helpers/http.helper.ts +++ b/src/app/core/helpers/http.helper.ts @@ -3,7 +3,7 @@ import { Params } from '@angular/router'; import { SortOrder } from '@shared/utils/sort-order.enum'; export const parseQueryFilterParams = ( - params: Params, + params: Params ): { page: number; size: number; @@ -15,8 +15,7 @@ export const parseQueryFilterParams = ( const size = parseInt(params['size'], 10); const search = params['search']; const sortColumn = params['sortColumn']; - const sortOrder = - params['sortOrder'] === 'desc' ? SortOrder.Desc : SortOrder.Asc; + const sortOrder = params['sortOrder'] === 'desc' ? SortOrder.Desc : SortOrder.Asc; return { page, diff --git a/src/app/core/services/json-api/json-api.service.ts b/src/app/core/services/json-api/json-api.service.ts index 4709a0b41..ea16cdf27 100644 --- a/src/app/core/services/json-api/json-api.service.ts +++ b/src/app/core/services/json-api/json-api.service.ts @@ -10,8 +10,7 @@ import { JsonApiResponse } from '@core/services/json-api/json-api.entity'; }) export class JsonApiService { http: HttpClient = inject(HttpClient); - readonly #token = - 'Bearer 2rjFZwmdDG4rtKj7hGkEMO6XyHBM2lN7XBbsA1e8OqcFhOWu6Z7fQZiheu9RXtzSeVrgOt'; + readonly #token = 'Bearer 2rjFZwmdDG4rtKj7hGkEMO6XyHBM2lN7XBbsA1e8OqcFhOWu6Z7fQZiheu9RXtzSeVrgOt'; readonly #headers = new HttpHeaders({ Authorization: this.#token, Accept: 'application/vnd.api+json', @@ -45,11 +44,7 @@ export class JsonApiService { return httpParams; } - post( - url: string, - body: unknown, - params?: Record, - ): Observable { + post(url: string, body: unknown, params?: Record): Observable { return this.http .post>(url, body, { headers: this.#headers, diff --git a/src/app/core/services/service-worker/check-update.service.ts b/src/app/core/services/service-worker/check-update.service.ts index 160b79964..3b6dca31d 100644 --- a/src/app/core/services/service-worker/check-update.service.ts +++ b/src/app/core/services/service-worker/check-update.service.ts @@ -29,21 +29,17 @@ export class NewVersionCheckerService { } private promptOnUpdateAvailable(): void { - this.swUpdate.versionUpdates - .pipe(takeUntilDestroyed()) - .subscribe((event: VersionEvent) => { - console.info('Current version is', event); - - if (event.type !== 'NO_NEW_VERSION_DETECTED') { - this.isNewVersionAvailable.next(true); - } - }); + this.swUpdate.versionUpdates.pipe(takeUntilDestroyed()).subscribe((event: VersionEvent) => { + console.info('Current version is', event); + + if (event.type !== 'NO_NEW_VERSION_DETECTED') { + this.isNewVersionAvailable.next(true); + } + }); } private checkForUpdateAfterInterval(updateInterval: number) { - const appIsStable$ = this.appRef.isStable.pipe( - first((isStable) => isStable === true), - ); + const appIsStable$ = this.appRef.isStable.pipe(first((isStable) => isStable === true)); const everyInterval$ = interval(updateInterval); const everyIntervalOnceAppIsStable$ = concat(appIsStable$, everyInterval$); diff --git a/src/app/core/store/user/user.state.ts b/src/app/core/store/user/user.state.ts index 4ee54a4f4..731e909a4 100644 --- a/src/app/core/store/user/user.state.ts +++ b/src/app/core/store/user/user.state.ts @@ -26,7 +26,7 @@ export class UserState { tap((user) => { ctx.dispatch(new SetCurrentUser(user)); ctx.dispatch(new SetupProfileSettings()); - }), + }) ); } diff --git a/src/app/features/auth/auth.service.ts b/src/app/features/auth/auth.service.ts index b4cd6e127..9f9b4c37a 100644 --- a/src/app/features/auth/auth.service.ts +++ b/src/app/features/auth/auth.service.ts @@ -22,12 +22,7 @@ export class AuthService { //TODO: rewrite/refactor methods according to the API async login(credentials: LoginCredentials): Promise { try { - const response = await firstValueFrom( - this.#http.post( - `${this.#API_URL}/auth/login`, - credentials, - ), - ); + const response = await firstValueFrom(this.#http.post(`${this.#API_URL}/auth/login`, credentials)); if (response.accessToken) { this.#setAuthToken(response.accessToken); diff --git a/src/app/features/auth/forgot-password/forgot-password.component.html b/src/app/features/auth/forgot-password/forgot-password.component.html index 4715c193c..f64de6c71 100644 --- a/src/app/features/auth/forgot-password/forgot-password.component.html +++ b/src/app/features/auth/forgot-password/forgot-password.component.html @@ -1,9 +1,9 @@
-

{{ "auth.forgotPassword.title" | translate }}

-

{{ "auth.forgotPassword.description" | translate }}

+

{{ 'auth.forgotPassword.title' | translate }}

+

{{ 'auth.forgotPassword.description' | translate }}

- + -

{{ "auth.resetPassword.title" | translate }}

+

{{ 'auth.resetPassword.title' | translate }}

- + {{ "auth.resetPassword.title" | translate }} >
- + {{ "auth.resetPassword.title" | translate }} autocomplete="new-password" > @if ( - resetPasswordForm.get("confirmNewPassword")?.errors?.[ - "passwordMismatch" - ] && resetPasswordForm.get("confirmNewPassword")?.touched + resetPasswordForm.get('confirmNewPassword')?.errors?.['passwordMismatch'] && + resetPasswordForm.get('confirmNewPassword')?.touched ) { - {{ - "auth.common.password.mismatch" | translate - }} + {{ 'auth.common.password.mismatch' | translate }} }
@@ -55,9 +45,9 @@

{{ "auth.resetPassword.title" | translate }}

} @else {
-

{{ "auth.resetPassword.success.title" | translate }}

+

{{ 'auth.resetPassword.success.title' | translate }}

- {{ "auth.resetPassword.success.message" | translate }} + {{ 'auth.resetPassword.success.message' | translate }}

-

{{ "auth.signUp.title" | translate }}

+

{{ 'auth.signUp.title' | translate }}

- - Orchid icon + + Orchid icon - +
- {{ "auth.signUp.divider" | translate }} + {{ 'auth.signUp.divider' | translate }}
{{ "auth.signUp.title" | translate }}
- + {{ "auth.signUp.title" | translate }}
{{ "auth.signUp.title" | translate }} autocomplete="new-password" >
{{ "auth.signUp.title" | translate }} autocomplete="new-password" > @if ( - signUpForm.get("confirmPassword")?.errors?.["passwordMismatch"] && - signUpForm.get("confirmPassword")?.touched + signUpForm.get('confirmPassword')?.errors?.['passwordMismatch'] && + signUpForm.get('confirmPassword')?.touched ) { - {{ "auth.common.password.mismatch" | translate }} + {{ 'auth.common.password.mismatch' | translate }} }
- + {{ - "auth.signUp.form.terms.termsOfUse" | translate - }} - {{ "auth.signUp.form.terms.and" | translate }} - {{ - "auth.signUp.form.terms.privacyPolicy" | translate - }} + {{ 'auth.signUp.form.terms.agree' | translate }} + {{ 'auth.signUp.form.terms.termsOfUse' | translate }} + {{ 'auth.signUp.form.terms.and' | translate }} + {{ 'auth.signUp.form.terms.privacyPolicy' | translate }}
@@ -125,7 +103,7 @@

{{ "auth.signUp.title" | translate }}

} @else {
-

{{ "auth.signUp.success.title" | translate }}

-

{{ "auth.signUp.success.message" | translate }}

+

{{ 'auth.signUp.success.title' | translate }}

+

{{ 'auth.signUp.success.message' | translate }}

} diff --git a/src/app/features/auth/sign-up/sign-up.component.ts b/src/app/features/auth/sign-up/sign-up.component.ts index 35f9ba991..2050c2863 100644 --- a/src/app/features/auth/sign-up/sign-up.component.ts +++ b/src/app/features/auth/sign-up/sign-up.component.ts @@ -9,12 +9,7 @@ import { PasswordModule } from 'primeng/password'; import { CommonModule, NgOptimizedImage } from '@angular/common'; import { Component, inject, OnInit, signal } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; -import { - FormBuilder, - FormGroup, - ReactiveFormsModule, - Validators, -} from '@angular/forms'; +import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { Router, RouterLink } from '@angular/router'; import { PasswordInputHintComponent } from '@shared/components/password-input-hint/password-input-hint.component'; @@ -60,16 +55,13 @@ export class SignUpComponent implements OnInit { { fullName: ['', Validators.required], email: ['', [Validators.required, Validators.email]], - password: [ - '', - [Validators.required, Validators.pattern(this.passwordRegex)], - ], + password: ['', [Validators.required, Validators.pattern(this.passwordRegex)]], confirmPassword: ['', Validators.required], agreeToTerms: [false, Validators.requiredTrue], }, { validators: passwordMatchValidator(), - }, + } ); } diff --git a/src/app/features/auth/sign-up/sign-up.helper.ts b/src/app/features/auth/sign-up/sign-up.helper.ts index 4e6cf47d5..e89b2ab08 100644 --- a/src/app/features/auth/sign-up/sign-up.helper.ts +++ b/src/app/features/auth/sign-up/sign-up.helper.ts @@ -1,11 +1,10 @@ import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms'; -export const PASSWORD_REGEX = - /^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[^\w\s]).{8,}$/; +export const PASSWORD_REGEX = /^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*[^\w\s]).{8,}$/; export function passwordMatchValidator( passwordField = 'password', - confirmPasswordField = 'confirmPassword', + confirmPasswordField = 'confirmPassword' ): ValidatorFn { return (control: AbstractControl): ValidationErrors | null => { const password = control.get(passwordField); diff --git a/src/app/features/home/home.component.html b/src/app/features/home/home.component.html index b0b1a80ab..6dc6134c8 100644 --- a/src/app/features/home/home.component.html +++ b/src/app/features/home/home.component.html @@ -1,8 +1,4 @@ -
+

- {{ "home.loggedIn.dashboard.quickSearch.goTo" | translate }} + {{ 'home.loggedIn.dashboard.quickSearch.goTo' | translate }} - {{ "home.loggedIn.dashboard.quickSearch.myProjects" | translate }} + {{ 'home.loggedIn.dashboard.quickSearch.myProjects' | translate }} - {{ "home.loggedIn.dashboard.quickSearch.toOrganize" | translate }} + {{ 'home.loggedIn.dashboard.quickSearch.toOrganize' | translate }} - {{ "home.loggedIn.dashboard.quickSearch.search" | translate }} + {{ 'home.loggedIn.dashboard.quickSearch.search' | translate }} - {{ "home.loggedIn.dashboard.quickSearch.osf" | translate }} + {{ 'home.loggedIn.dashboard.quickSearch.osf' | translate }}

-

{{ "home.loggedIn.publicProjects.title" | translate }}

+

{{ 'home.loggedIn.publicProjects.title' | translate }}

-

{{ "home.loggedIn.latestResearch.title" | translate }}

-

{{ "home.loggedIn.latestResearch.subtitle" | translate }}

+

{{ 'home.loggedIn.latestResearch.title' | translate }}

+

{{ 'home.loggedIn.latestResearch.subtitle' | translate }}

- +
-

{{ "home.loggedIn.hosting.title" | translate }}

-

{{ "home.loggedIn.hosting.subtitle" | translate }}

+

{{ 'home.loggedIn.hosting.title' | translate }}

+

{{ 'home.loggedIn.hosting.subtitle' | translate }}

- +
diff --git a/src/app/features/home/home.component.ts b/src/app/features/home/home.component.ts index 3564428aa..3e903035d 100644 --- a/src/app/features/home/home.component.ts +++ b/src/app/features/home/home.component.ts @@ -9,15 +9,7 @@ import { TablePageEvent } from 'primeng/table'; import { debounceTime, distinctUntilChanged, Subject } from 'rxjs'; -import { - Component, - computed, - DestroyRef, - effect, - inject, - OnInit, - signal, -} from '@angular/core'; +import { Component, computed, DestroyRef, effect, inject, OnInit, signal } from '@angular/core'; import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; @@ -25,11 +17,7 @@ import { MY_PROJECTS_TABLE_PARAMS } from '@core/constants/my-projects-table.cons import { GetUserInstitutions } from '@osf/features/institutions/store'; import { MyProjectsItem } from '@osf/features/my-projects/entities/my-projects.entities'; import { MyProjectsSearchFilters } from '@osf/features/my-projects/entities/my-projects-search-filters.models'; -import { - ClearMyProjects, - GetMyProjects, - MyProjectsSelectors, -} from '@osf/features/my-projects/store'; +import { ClearMyProjects, GetMyProjects, MyProjectsSelectors } from '@osf/features/my-projects/store'; import { AddProjectFormComponent } from '@shared/components/add-project-form/add-project-form.component'; import { MyProjectsTableComponent } from '@shared/components/my-projects-table/my-projects-table.component'; import { SubHeaderComponent } from '@shared/components/sub-header/sub-header.component'; @@ -40,13 +28,7 @@ import { SortOrder } from '@shared/utils/sort-order.enum'; @Component({ selector: 'osf-home', standalone: true, - imports: [ - RouterLink, - Button, - SubHeaderComponent, - MyProjectsTableComponent, - TranslatePipe, - ], + imports: [RouterLink, Button, SubHeaderComponent, MyProjectsTableComponent, TranslatePipe], templateUrl: './home.component.html', styleUrl: './home.component.scss', providers: [DialogService], @@ -76,18 +58,12 @@ export class HomeComponent implements OnInit { ...MY_PROJECTS_TABLE_PARAMS, }); - protected readonly projects = this.#store.selectSignal( - MyProjectsSelectors.getProjects, - ); - protected readonly totalProjectsCount = this.#store.selectSignal( - MyProjectsSelectors.getTotalProjectsCount, - ); + protected readonly projects = this.#store.selectSignal(MyProjectsSelectors.getProjects); + protected readonly totalProjectsCount = this.#store.selectSignal(MyProjectsSelectors.getTotalProjectsCount); protected readonly filteredProjects = computed(() => { const search = this.searchValue().toLowerCase(); - return this.projects().filter((project) => - project.title.toLowerCase().includes(search), - ); + return this.projects().filter((project) => project.title.toLowerCase().includes(search)); }); constructor() { @@ -102,41 +78,35 @@ export class HomeComponent implements OnInit { } #setupQueryParamsSubscription(): void { - this.#route.queryParams - .pipe(takeUntilDestroyed(this.#destroyRef)) - .subscribe((params) => { - const page = Number(params['page']) || 1; - const rows = Number(params['rows']) || MY_PROJECTS_TABLE_PARAMS.rows; - const sortField = params['sortField']; - const sortOrder = params['sortOrder'] as SortOrder; - const search = params['search'] || ''; - - this.tableParams.update((current) => ({ - ...current, - firstRowIndex: (page - 1) * rows, - rows, - })); - - if (sortField) { - this.sortColumn.set(sortField); - this.sortOrder.set(sortOrder || SortOrder.Asc); - } - - if (search) { - this.searchValue.set(search); - } - - this.#fetchProjects(); - }); + this.#route.queryParams.pipe(takeUntilDestroyed(this.#destroyRef)).subscribe((params) => { + const page = Number(params['page']) || 1; + const rows = Number(params['rows']) || MY_PROJECTS_TABLE_PARAMS.rows; + const sortField = params['sortField']; + const sortOrder = params['sortOrder'] as SortOrder; + const search = params['search'] || ''; + + this.tableParams.update((current) => ({ + ...current, + firstRowIndex: (page - 1) * rows, + rows, + })); + + if (sortField) { + this.sortColumn.set(sortField); + this.sortOrder.set(sortOrder || SortOrder.Asc); + } + + if (search) { + this.searchValue.set(search); + } + + this.#fetchProjects(); + }); } #setupSearchSubscription(): void { this.#searchSubject - .pipe( - debounceTime(300), - distinctUntilChanged(), - takeUntilDestroyed(this.#destroyRef), - ) + .pipe(debounceTime(300), distinctUntilChanged(), takeUntilDestroyed(this.#destroyRef)) .subscribe((searchValue) => { this.#handleSearch(searchValue); }); @@ -161,9 +131,7 @@ export class HomeComponent implements OnInit { #fetchProjects(): void { this.isLoading.set(true); const filters = this.#createFilters(); - const page = - Math.floor(this.tableParams().firstRowIndex / this.tableParams().rows) + - 1; + const page = Math.floor(this.tableParams().firstRowIndex / this.tableParams().rows) + 1; this.#store .dispatch(new GetMyProjects(page, this.tableParams().rows, filters)) .pipe(takeUntilDestroyed(this.#destroyRef)) @@ -192,9 +160,7 @@ export class HomeComponent implements OnInit { } #updateQueryParams(): void { - const page = - Math.floor(this.tableParams().firstRowIndex / this.tableParams().rows) + - 1; + const page = Math.floor(this.tableParams().firstRowIndex / this.tableParams().rows) + 1; const queryParams = { page, rows: this.tableParams().rows, diff --git a/src/app/features/home/logged-out/home-logged-out.component.html b/src/app/features/home/logged-out/home-logged-out.component.html index 77d29c903..bcff11b65 100644 --- a/src/app/features/home/logged-out/home-logged-out.component.html +++ b/src/app/features/home/logged-out/home-logged-out.component.html @@ -1,9 +1,4 @@ -
+

@@ -18,19 +13,14 @@

- better-research + better-research

-

{{ "home.loggedOut.discover.subtitle" | translate }}

+

{{ 'home.loggedOut.discover.subtitle' | translate }}

@@ -50,104 +40,59 @@

- search icon - search icon + search icon + search icon

- {{ "home.loggedOut.support.sections.search.title" | translate }} + {{ 'home.loggedOut.support.sections.search.title' | translate }}

- {{ - "home.loggedOut.support.sections.search.description" | translate - }} + {{ 'home.loggedOut.support.sections.search.description' | translate }}

- search icon - search icon + search icon + search icon

- {{ "home.loggedOut.support.sections.design.title" | translate }} + {{ 'home.loggedOut.support.sections.design.title' | translate }}

- {{ - "home.loggedOut.support.sections.design.description" | translate - }} + {{ 'home.loggedOut.support.sections.design.description' | translate }}

- search icon - search icon + search icon + search icon

- {{ "home.loggedOut.support.sections.collect.title" | translate }} + {{ 'home.loggedOut.support.sections.collect.title' | translate }}

- {{ - "home.loggedOut.support.sections.collect.description" - | translate - }} + {{ 'home.loggedOut.support.sections.collect.description' | translate }}

- search icon + search icon

- {{ "home.loggedOut.support.sections.publish.title" | translate }} + {{ 'home.loggedOut.support.sections.publish.title' | translate }}

- {{ - "home.loggedOut.support.sections.publish.description" - | translate - }} + {{ 'home.loggedOut.support.sections.publish.description' | translate }}

@@ -164,10 +109,7 @@

- +
@@ -176,13 +118,7 @@

- +
@@ -201,55 +137,37 @@

{{ slide.facility | translate }}

-

+

@if (isMedium() || isWeb()) {

- {{ - "home.loggedOut.integrations.categories.authentication" - | translate - }} + {{ 'home.loggedOut.integrations.categories.authentication' | translate }}

- {{ "home.loggedOut.integrations.categories.discovery" | translate }} + {{ 'home.loggedOut.integrations.categories.discovery' | translate }}

- {{ - "home.loggedOut.integrations.categories.references" | translate - }} + {{ 'home.loggedOut.integrations.categories.references' | translate }}

- {{ "home.loggedOut.integrations.categories.storage" | translate }} + {{ 'home.loggedOut.integrations.categories.storage' | translate }}

- incommon - sso + incommon + sso
@@ -259,42 +177,17 @@

height="36" width="215" /> - orcid + orcid

- mendeley - zotero + mendeley + zotero
- dropbox - google-drive + dropbox + google-drive
@@ -302,27 +195,15 @@

- {{ - "home.loggedOut.integrations.categories.authentication" | translate - }} + {{ 'home.loggedOut.integrations.categories.authentication' | translate }}

- incommon - sso + incommon + sso

- {{ "home.loggedOut.integrations.categories.discovery" | translate }} + {{ 'home.loggedOut.integrations.categories.discovery' | translate }}

height="36" width="215" /> - orcid + orcid

- {{ "home.loggedOut.integrations.categories.references" | translate }} + {{ 'home.loggedOut.integrations.categories.references' | translate }}

- mendeley - zotero + mendeley + zotero

- {{ "home.loggedOut.integrations.categories.storage" | translate }} + {{ 'home.loggedOut.integrations.categories.storage' | translate }}

- dropbox - google-drive + dropbox + google-drive
} @else {
- +

{{ icon.title | translate }}

diff --git a/src/app/features/home/logged-out/home-logged-out.component.ts b/src/app/features/home/logged-out/home-logged-out.component.ts index 2d41f326a..adc5c04a3 100644 --- a/src/app/features/home/logged-out/home-logged-out.component.ts +++ b/src/app/features/home/logged-out/home-logged-out.component.ts @@ -9,26 +9,14 @@ import { Component, inject, signal } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; -import { - IS_MEDIUM, - IS_SMALL, - IS_WEB, - IS_XSMALL, -} from '@shared/utils/breakpoints.tokens'; +import { IS_MEDIUM, IS_SMALL, IS_WEB, IS_XSMALL } from '@shared/utils/breakpoints.tokens'; import { integrationIcons, slides } from './data'; @Component({ selector: 'osf-home-logged-out', standalone: true, - imports: [ - CarouselModule, - FormsModule, - Button, - InputText, - NgOptimizedImage, - TranslatePipe, - ], + imports: [CarouselModule, FormsModule, Button, InputText, NgOptimizedImage, TranslatePipe], templateUrl: './home-logged-out.component.html', styleUrl: './home-logged-out.component.scss', }) diff --git a/src/app/features/institutions/institutions.service.ts b/src/app/features/institutions/institutions.service.ts index f80cd0482..72f93fe97 100644 --- a/src/app/features/institutions/institutions.service.ts +++ b/src/app/features/institutions/institutions.service.ts @@ -6,10 +6,7 @@ import { inject, Injectable } from '@angular/core'; import { JsonApiResponse } from '@core/services/json-api/json-api.entity'; import { JsonApiService } from '@core/services/json-api/json-api.service'; -import { - Institution, - UserInstitutionGetResponse, -} from './entities/institutions.models'; +import { Institution, UserInstitutionGetResponse } from './entities/institutions.models'; import { InstitutionsMapper } from './mappers/institutions.mapper'; @Injectable({ @@ -24,10 +21,6 @@ export class InstitutionsService { // const url = this.#baseUrl + 'users/26c59/institutions/'; return this.#jsonApiService .get>(url) - .pipe( - map((response) => - response.data.map((item) => InstitutionsMapper.fromResponse(item)), - ), - ); + .pipe(map((response) => response.data.map((item) => InstitutionsMapper.fromResponse(item)))); } } diff --git a/src/app/features/institutions/mappers/institutions.mapper.ts b/src/app/features/institutions/mappers/institutions.mapper.ts index c4e4f9254..9fa2faa25 100644 --- a/src/app/features/institutions/mappers/institutions.mapper.ts +++ b/src/app/features/institutions/mappers/institutions.mapper.ts @@ -1,7 +1,4 @@ -import { - Institution, - UserInstitutionGetResponse, -} from '../entities/institutions.models'; +import { Institution, UserInstitutionGetResponse } from '../entities/institutions.models'; export class InstitutionsMapper { static fromResponse(response: UserInstitutionGetResponse): Institution { @@ -14,8 +11,7 @@ export class InstitutionsMapper { rorIri: response.attributes.ror_iri, iris: response.attributes.iris, assets: response.attributes.assets, - institutionalRequestAccessEnabled: - response.attributes.institutional_request_access_enabled, + institutionalRequestAccessEnabled: response.attributes.institutional_request_access_enabled, logoPath: response.attributes.logo_path, }; } diff --git a/src/app/features/institutions/store/institutions.state.ts b/src/app/features/institutions/store/institutions.state.ts index 8bcc6d84a..1e6eb9163 100644 --- a/src/app/features/institutions/store/institutions.state.ts +++ b/src/app/features/institutions/store/institutions.state.ts @@ -26,7 +26,7 @@ export class InstitutionsState { ctx.patchState({ userInstitutions: institutions, }); - }), + }) ); } } diff --git a/src/app/features/my-profile/my-profile.component.html b/src/app/features/my-profile/my-profile.component.html index f13d93c7c..5afdbd793 100644 --- a/src/app/features/my-profile/my-profile.component.html +++ b/src/app/features/my-profile/my-profile.component.html @@ -2,11 +2,7 @@

{{ currentUser()?.fullName }}

@if (!isMobile()) { - + }
@@ -16,60 +12,34 @@

{{ currentUser()?.employment?.[0]?.title }}, {{ currentUser()?.employment?.[0]?.institution }}

-

- Member since: {{ currentUser()?.dateRegistered | date: "MMM d, yyyy" }} -

+

Member since: {{ currentUser()?.dateRegistered | date: 'MMM d, yyyy' }}

- orcid - + https://orcid.org/{{ currentUser()?.socials?.orcid }}
- cos-shield - {{ - currentUser()?.link - }} + cos-shield + {{ currentUser()?.link }}
- institution + institution

{{ currentUser()?.education?.[0]?.institution }}

- cos-shield + cos-shield

{{ currentUser()?.employment?.[0]?.institution }}

@@ -78,11 +48,7 @@

@if (isMobile()) {
- +
}

@@ -106,9 +72,7 @@

Employment

Job title: {{ employment.title }}

-

- Department / Institute (optional): {{ employment.institution }} -

+

Department / Institute (optional): {{ employment.institution }}

 } @@ -134,9 +98,7 @@

Education

Degree: {{ education.degree }}

-

- Department / Institute (optional): {{ education.institution }} -

+

Department / Institute (optional): {{ education.institution }}

 } diff --git a/src/app/features/my-profile/my-profile.component.ts b/src/app/features/my-profile/my-profile.component.ts index fe16a4e67..f20273769 100644 --- a/src/app/features/my-profile/my-profile.component.ts +++ b/src/app/features/my-profile/my-profile.component.ts @@ -4,14 +4,7 @@ import { AccordionModule } from 'primeng/accordion'; import { Button } from 'primeng/button'; import { DatePipe, NgOptimizedImage } from '@angular/common'; -import { - ChangeDetectionStrategy, - Component, - effect, - inject, - OnDestroy, - signal, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, effect, inject, OnDestroy, signal } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { Router } from '@angular/router'; @@ -30,15 +23,7 @@ import { SearchComponent } from '../search/search.component'; @Component({ selector: 'osf-my-profile', standalone: true, - imports: [ - Button, - DatePipe, - NgOptimizedImage, - AccordionModule, - FormsModule, - ReactiveFormsModule, - SearchComponent, - ], + imports: [Button, DatePipe, NgOptimizedImage, AccordionModule, FormsModule, ReactiveFormsModule, SearchComponent], templateUrl: './my-profile.component.html', styleUrl: './my-profile.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, @@ -62,12 +47,7 @@ export class MyProfileComponent implements OnDestroy { this.#store.dispatch(new SetIsMyProfile(true)); effect(() => { - this.#store.dispatch( - new SetCreator( - this.currentUser()?.fullName ?? '', - this.currentUser()?.iri ?? '', - ), - ); + this.#store.dispatch(new SetCreator(this.currentUser()?.fullName ?? '', this.currentUser()?.iri ?? '')); }); } diff --git a/src/app/features/my-projects/entities/my-projects.entities.ts b/src/app/features/my-projects/entities/my-projects.entities.ts index 4b56578b5..f405f9a7b 100644 --- a/src/app/features/my-projects/entities/my-projects.entities.ts +++ b/src/app/features/my-projects/entities/my-projects.entities.ts @@ -60,8 +60,7 @@ export interface MyProjectsItemResponse { }; } -export interface MyProjectsJsonApiResponse - extends JsonApiResponse { +export interface MyProjectsJsonApiResponse extends JsonApiResponse { links: { meta: { total: number; diff --git a/src/app/features/my-projects/entities/my-projects.types.ts b/src/app/features/my-projects/entities/my-projects.types.ts index 9bf202d9a..90e5e60b7 100644 --- a/src/app/features/my-projects/entities/my-projects.types.ts +++ b/src/app/features/my-projects/entities/my-projects.types.ts @@ -1,5 +1 @@ -export type EndpointType = - | 'nodes' - | 'registrations' - | 'preprints' - | `collections/${string}/linked_nodes/`; +export type EndpointType = 'nodes' | 'registrations' | 'preprints' | `collections/${string}/linked_nodes/`; diff --git a/src/app/features/my-projects/mappers/my-projects.mapper.ts b/src/app/features/my-projects/mappers/my-projects.mapper.ts index 6b39e06e4..c2a0bd243 100644 --- a/src/app/features/my-projects/mappers/my-projects.mapper.ts +++ b/src/app/features/my-projects/mappers/my-projects.mapper.ts @@ -1,7 +1,4 @@ -import { - MyProjectsItem, - MyProjectsItemGetResponse, -} from '@osf/features/my-projects/entities/my-projects.entities'; +import { MyProjectsItem, MyProjectsItemGetResponse } from '@osf/features/my-projects/entities/my-projects.entities'; export class MyProjectsMapper { static fromResponse(response: MyProjectsItemGetResponse): MyProjectsItem { @@ -11,14 +8,12 @@ export class MyProjectsMapper { title: response.attributes.title, dateModified: response.attributes.date_modified, isPublic: response.attributes.public, - contributors: response.embeds.bibliographic_contributors.data.map( - (contributor) => ({ - familyName: contributor.embeds.users.data.attributes.family_name, - fullName: contributor.embeds.users.data.attributes.full_name, - givenName: contributor.embeds.users.data.attributes.given_name, - middleName: contributor.embeds.users.data.attributes.middle_name, - }), - ), + contributors: response.embeds.bibliographic_contributors.data.map((contributor) => ({ + familyName: contributor.embeds.users.data.attributes.family_name, + fullName: contributor.embeds.users.data.attributes.full_name, + givenName: contributor.embeds.users.data.attributes.given_name, + middleName: contributor.embeds.users.data.attributes.middle_name, + })), }; } } diff --git a/src/app/features/my-projects/my-projects.component.html b/src/app/features/my-projects/my-projects.component.html index bec39fdf0..0f54fd475 100644 --- a/src/app/features/my-projects/my-projects.component.html +++ b/src/app/features/my-projects/my-projects.component.html @@ -8,25 +8,13 @@ />
- + @if (!isMobile()) { - {{ - "myProjects.tabs.myProjects" | translate - }} - {{ - "myProjects.tabs.myRegistrations" | translate - }} - {{ - "myProjects.tabs.myPreprints" | translate - }} - {{ - "myProjects.tabs.bookmarks" | translate - }} + {{ 'myProjects.tabs.myProjects' | translate }} + {{ 'myProjects.tabs.myRegistrations' | translate }} + {{ 'myProjects.tabs.myPreprints' | translate }} + {{ 'myProjects.tabs.bookmarks' | translate }} } @@ -100,7 +88,7 @@ @if (!bookmarks().length && !isLoading()) { -

{{ "myProjects.bookmarks.emptyState" | translate }}

+

{{ 'myProjects.bookmarks.emptyState' | translate }}

} @else { { this.#handleSearch(searchValue); }); @@ -202,8 +180,7 @@ export class MyProjectsComponent implements OnInit { const params = this.queryParams(); if (!params) return; - const { page, size, search, sortColumn, sortOrder } = - parseQueryFilterParams(params); + const { page, size, search, sortColumn, sortOrder } = parseQueryFilterParams(params); this.#updateComponentState({ page, size, search, sortColumn, sortOrder }); this.#fetchDataForCurrentTab({ @@ -249,29 +226,18 @@ export class MyProjectsComponent implements OnInit { let action$; switch (this.selectedTab()) { case 0: - action$ = this.#store.dispatch( - new GetMyProjects(pageNumber, pageSize, filters), - ); + action$ = this.#store.dispatch(new GetMyProjects(pageNumber, pageSize, filters)); break; case 1: - action$ = this.#store.dispatch( - new GetMyRegistrations(pageNumber, pageSize, filters), - ); + action$ = this.#store.dispatch(new GetMyRegistrations(pageNumber, pageSize, filters)); break; case 2: - action$ = this.#store.dispatch( - new GetMyPreprints(pageNumber, pageSize, filters), - ); + action$ = this.#store.dispatch(new GetMyPreprints(pageNumber, pageSize, filters)); break; case 3: if (this.bookmarksCollectionId()) { action$ = this.#store.dispatch( - new GetMyBookmarks( - this.bookmarksCollectionId(), - pageNumber, - pageSize, - filters, - ), + new GetMyBookmarks(this.bookmarksCollectionId(), pageNumber, pageSize, filters) ); } break; @@ -302,8 +268,7 @@ export class MyProjectsComponent implements OnInit { search: searchValue, page: 1, sortColumn: currentParams['sortColumn'], - sortOrder: - currentParams['sortOrder'] === 'desc' ? SortOrder.Desc : SortOrder.Asc, + sortOrder: currentParams['sortOrder'] === 'desc' ? SortOrder.Desc : SortOrder.Asc, }); } @@ -328,8 +293,7 @@ export class MyProjectsComponent implements OnInit { if ('sortColumn' in updates) { if (updates.sortColumn) { queryParams['sortColumn'] = updates.sortColumn; - queryParams['sortOrder'] = - updates.sortOrder === SortOrder.Desc ? 'desc' : 'asc'; + queryParams['sortOrder'] = updates.sortOrder === SortOrder.Desc ? 'desc' : 'asc'; } } else if (currentParams['sortColumn']) { queryParams['sortColumn'] = currentParams['sortColumn']; @@ -355,8 +319,7 @@ export class MyProjectsComponent implements OnInit { page, size: event.rows, sortColumn: currentParams['sortColumn'], - sortOrder: - currentParams['sortOrder'] === 'desc' ? SortOrder.Desc : SortOrder.Asc, + sortOrder: currentParams['sortOrder'] === 'desc' ? SortOrder.Desc : SortOrder.Asc, }); } diff --git a/src/app/features/my-projects/my-projects.service.ts b/src/app/features/my-projects/my-projects.service.ts index 94e9de06b..34bb63b9d 100644 --- a/src/app/features/my-projects/my-projects.service.ts +++ b/src/app/features/my-projects/my-projects.service.ts @@ -34,12 +34,11 @@ export class MyProjectsService { endpoint: EndpointType, filters?: MyProjectsSearchFilters, pageNumber?: number, - pageSize?: number, + pageSize?: number ): Observable { const params: Record = { 'embed[]': ['bibliographic_contributors'], - [`fields[${endpoint}]`]: - 'title,date_modified,public,bibliographic_contributors', + [`fields[${endpoint}]`]: 'title,date_modified,public,bibliographic_contributors', 'fields[users]': 'family_name,full_name,given_name,middle_name', }; @@ -67,22 +66,18 @@ export class MyProjectsService { // ? environment.apiUrl + '/' + endpoint // : environment.apiUrl + '/users/me/' + endpoint; - return this.#jsonApiService - .get(url, params) - .pipe( - map((response: MyProjectsJsonApiResponse) => ({ - data: response.data.map((item: MyProjectsItemGetResponse) => - MyProjectsMapper.fromResponse(item), - ), - links: response.links, - })), - ); + return this.#jsonApiService.get(url, params).pipe( + map((response: MyProjectsJsonApiResponse) => ({ + data: response.data.map((item: MyProjectsItemGetResponse) => MyProjectsMapper.fromResponse(item)), + links: response.links, + })) + ); } getMyProjects( filters?: MyProjectsSearchFilters, pageNumber?: number, - pageSize?: number, + pageSize?: number ): Observable { return this.#getMyItems('nodes', filters, pageNumber, pageSize); } @@ -92,27 +87,20 @@ export class MyProjectsService { 'fields[collections]': 'title,bookmarks', }; - return this.#jsonApiService - .get( - environment.apiUrl + '/collections/', - params, - ) - .pipe( - map((response) => { - const bookmarksCollection = response.data.find( - (collection) => - collection.attributes.title === 'Bookmarks' && - collection.attributes.bookmarks, - ); - return bookmarksCollection?.id ?? ''; - }), - ); + return this.#jsonApiService.get(environment.apiUrl + '/collections/', params).pipe( + map((response) => { + const bookmarksCollection = response.data.find( + (collection) => collection.attributes.title === 'Bookmarks' && collection.attributes.bookmarks + ); + return bookmarksCollection?.id ?? ''; + }) + ); } getMyRegistrations( filters?: MyProjectsSearchFilters, pageNumber?: number, - pageSize?: number, + pageSize?: number ): Observable { return this.#getMyItems('registrations', filters, pageNumber, pageSize); } @@ -120,7 +108,7 @@ export class MyProjectsService { getMyPreprints( filters?: MyProjectsSearchFilters, pageNumber?: number, - pageSize?: number, + pageSize?: number ): Observable { return this.#getMyItems('preprints', filters, pageNumber, pageSize); } @@ -129,14 +117,9 @@ export class MyProjectsService { collectionId: string, filters?: MyProjectsSearchFilters, pageNumber?: number, - pageSize?: number, + pageSize?: number ): Observable { - return this.#getMyItems( - `collections/${collectionId}/linked_nodes/`, - filters, - pageNumber, - pageSize, - ); + return this.#getMyItems(`collections/${collectionId}/linked_nodes/`, filters, pageNumber, pageSize); } createProject( @@ -144,7 +127,7 @@ export class MyProjectsService { description: string, templateFrom: string, region: string, - affiliations: string[], + affiliations: string[] ): Observable { const payload: CreateProjectPayload = { data: { @@ -181,11 +164,7 @@ export class MyProjectsService { }; return this.#jsonApiService - .post( - `${environment.apiUrl}/nodes/`, - payload, - params, - ) + .post(`${environment.apiUrl}/nodes/`, payload, params) .pipe(map((response) => MyProjectsMapper.fromResponse(response))); } } diff --git a/src/app/features/my-projects/store/my-projects.actions.ts b/src/app/features/my-projects/store/my-projects.actions.ts index 1773823fa..5c84bd819 100644 --- a/src/app/features/my-projects/store/my-projects.actions.ts +++ b/src/app/features/my-projects/store/my-projects.actions.ts @@ -6,7 +6,7 @@ export class GetMyProjects { constructor( public pageNumber: number, public pageSize: number, - public filters: MyProjectsSearchFilters, + public filters: MyProjectsSearchFilters ) {} } @@ -16,7 +16,7 @@ export class GetMyRegistrations { constructor( public pageNumber: number, public pageSize: number, - public filters: MyProjectsSearchFilters, + public filters: MyProjectsSearchFilters ) {} } @@ -26,7 +26,7 @@ export class GetMyPreprints { constructor( public pageNumber: number, public pageSize: number, - public filters: MyProjectsSearchFilters, + public filters: MyProjectsSearchFilters ) {} } @@ -36,7 +36,7 @@ export class GetMyBookmarks { public bookmarksId: string, public pageNumber: number, public pageSize: number, - public filters: MyProjectsSearchFilters, + public filters: MyProjectsSearchFilters ) {} } @@ -56,6 +56,6 @@ export class CreateProject { public description: string, public templateFrom: string, public region: string, - public affiliations: string[], + public affiliations: string[] ) {} } diff --git a/src/app/features/my-projects/store/my-projects.state.ts b/src/app/features/my-projects/store/my-projects.state.ts index dc218e3a5..37789a431 100644 --- a/src/app/features/my-projects/store/my-projects.state.ts +++ b/src/app/features/my-projects/store/my-projects.state.ts @@ -37,71 +37,51 @@ export class MyProjectsState { @Action(GetMyProjects) getProjects(ctx: StateContext, action: GetMyProjects) { - return this.myProjectsService - .getMyProjects(action.filters, action.pageNumber, action.pageSize) - .pipe( - tap((res) => { - ctx.patchState({ - projects: res.data, - totalProjects: res.links.meta.total, - }); - }), - ); + return this.myProjectsService.getMyProjects(action.filters, action.pageNumber, action.pageSize).pipe( + tap((res) => { + ctx.patchState({ + projects: res.data, + totalProjects: res.links.meta.total, + }); + }) + ); } @Action(GetMyRegistrations) - getRegistrations( - ctx: StateContext, - action: GetMyRegistrations, - ) { - return this.myProjectsService - .getMyRegistrations(action.filters, action.pageNumber, action.pageSize) - .pipe( - tap((res) => { - ctx.patchState({ - registrations: res.data, - totalRegistrations: res.links.meta.total, - }); - }), - ); + getRegistrations(ctx: StateContext, action: GetMyRegistrations) { + return this.myProjectsService.getMyRegistrations(action.filters, action.pageNumber, action.pageSize).pipe( + tap((res) => { + ctx.patchState({ + registrations: res.data, + totalRegistrations: res.links.meta.total, + }); + }) + ); } @Action(GetMyPreprints) - getPreprints( - ctx: StateContext, - action: GetMyPreprints, - ) { - return this.myProjectsService - .getMyPreprints(action.filters, action.pageNumber, action.pageSize) - .pipe( - tap((res) => { - ctx.patchState({ - preprints: res.data, - totalPreprints: res.links.meta.total, - }); - }), - ); + getPreprints(ctx: StateContext, action: GetMyPreprints) { + return this.myProjectsService.getMyPreprints(action.filters, action.pageNumber, action.pageSize).pipe( + tap((res) => { + ctx.patchState({ + preprints: res.data, + totalPreprints: res.links.meta.total, + }); + }) + ); } @Action(GetMyBookmarks) - getBookmarks( - ctx: StateContext, - action: GetMyBookmarks, - ) { + getBookmarks(ctx: StateContext, action: GetMyBookmarks) { return this.myProjectsService - .getMyBookmarks( - action.bookmarksId, - action.filters, - action.pageNumber, - action.pageSize, - ) + .getMyBookmarks(action.bookmarksId, action.filters, action.pageNumber, action.pageSize) .pipe( tap((res) => { ctx.patchState({ bookmarks: res.data, totalBookmarks: res.links.meta.total, }); - }), + }) ); } @@ -112,7 +92,7 @@ export class MyProjectsState { ctx.patchState({ bookmarksId: res, }); - }), + }) ); } @@ -131,18 +111,9 @@ export class MyProjectsState { } @Action(CreateProject) - createProject( - ctx: StateContext, - action: CreateProject, - ) { + createProject(ctx: StateContext, action: CreateProject) { return this.myProjectsService - .createProject( - action.title, - action.description, - action.templateFrom, - action.region, - action.affiliations, - ) + .createProject(action.title, action.description, action.templateFrom, action.region, action.affiliations) .pipe( tap((project) => { const state = ctx.getState(); @@ -150,7 +121,7 @@ export class MyProjectsState { projects: [project, ...state.projects], totalProjects: state.totalProjects + 1, }); - }), + }) ); } } diff --git a/src/app/features/privacy-policy/privacy-policy.component.html b/src/app/features/privacy-policy/privacy-policy.component.html index aac14dfad..a3eeda1dd 100644 --- a/src/app/features/privacy-policy/privacy-policy.component.html +++ b/src/app/features/privacy-policy/privacy-policy.component.html @@ -7,172 +7,132 @@

1. INTRODUCTION

- Center for Open Science, Inc. (referred to as "COS", "OSF", "us" "our" and - "we") is a nonprofit culture change organization that aims to align - scholarly practices with scholarly values. It does so by developing and - advancing a systems strategy for changing culture and behavior toward - greater rigor, transparency, and sharing of research process, outputs, and - outcomes. COS fosters an open and interactive community among open source - developers, open science researchers, and the broader scientific community - through our in-person and virtual events; runs programs, certifications, - and fellowships with communities and related affiliates; conducts research - on scientific practices and provides grants for relevant projects; and - improves the research workflow by connecting technologies that researchers - use of our development and maintenance of OSF. -

-

- Our mission is to increase the openness, integrity, and reproducibility of - scientific research and scholarly communication by creating and operating - an open-source infrastructure (referred to as "OSF") to support the entire - research lifecycle from planning, collaborating, conducting, reporting, - publishing, archiving and discovery. This Privacy Policy applies to - contributors of content to, and users of, our Websites and Services. -

-

- In this document, we use "you" to refer to researchers and other Active - Users of our Websites and Services. We do not collect any personally - identifiable information about you when you visit our Websites unless you - choose to provide us with that information. We do not collect information - from you for commercial marketing or any other purpose unrelated to our - purpose. Our goal is to provide you with a personalized online experience - that provides you with the information, resources, and services that are - most relevant and helpful to you. This Privacy Policy has been written to - describe the conditions under which our Websites and Services are made - available to you. Our Privacy Policy discusses, among other things, how - data obtained during your visits to our Websites may be collected and - used. Our Privacy Policy also discusses important limitations to the way - you may use materials and services you find on the site. Read the Privacy - Policy carefully. By providing affirmative consent, you have accepted the - terms of this Policy. If you do not agree to accept the terms of the - Privacy Policy, you are directed to discontinue accessing or otherwise - using the site or any materials obtained from it. -

-

- We protect your personal information using industry-standard safeguards. - As described in this Privacy Policy, we may share your information with - your consent or as required by law as detailed in this policy, and we will - let you know when we make changes to this Privacy Policy by posting - changes to the site. + Center for Open Science, Inc. (referred to as "COS", "OSF", "us" "our" and "we") is a nonprofit culture change + organization that aims to align scholarly practices with scholarly values. It does so by developing and advancing + a systems strategy for changing culture and behavior toward greater rigor, transparency, and sharing of research + process, outputs, and outcomes. COS fosters an open and interactive community among open source developers, open + science researchers, and the broader scientific community through our in-person and virtual events; runs programs, + certifications, and fellowships with communities and related affiliates; conducts research on scientific practices + and provides grants for relevant projects; and improves the research workflow by connecting technologies that + researchers use of our development and maintenance of OSF. +

+

+ Our mission is to increase the openness, integrity, and reproducibility of scientific research and scholarly + communication by creating and operating an open-source infrastructure (referred to as "OSF") to support the entire + research lifecycle from planning, collaborating, conducting, reporting, publishing, archiving and discovery. This + Privacy Policy applies to contributors of content to, and users of, our Websites and Services. +

+

+ In this document, we use "you" to refer to researchers and other Active Users of our Websites and Services. We do + not collect any personally identifiable information about you when you visit our Websites unless you choose to + provide us with that information. We do not collect information from you for commercial marketing or any other + purpose unrelated to our purpose. Our goal is to provide you with a personalized online experience that provides + you with the information, resources, and services that are most relevant and helpful to you. This Privacy Policy + has been written to describe the conditions under which our Websites and Services are made available to you. Our + Privacy Policy discusses, among other things, how data obtained during your visits to our Websites may be + collected and used. Our Privacy Policy also discusses important limitations to the way you may use materials and + services you find on the site. Read the Privacy Policy carefully. By providing affirmative consent, you have + accepted the terms of this Policy. If you do not agree to accept the terms of the Privacy Policy, you are directed + to discontinue accessing or otherwise using the site or any materials obtained from it. +

+

+ We protect your personal information using industry-standard safeguards. As described in this Privacy Policy, we + may share your information with your consent or as required by law as detailed in this policy, and we will let you + know when we make changes to this Privacy Policy by posting changes to the site.

2. CONSENT

- You may not use COS Websites or Services if you do not accept the COS - Terms and Conditions of Use. By using the Website and Services, you - further represent that you have all necessary authority and consents to - post any content to upload to the Websites or use in conjunction with the - Services. Your use of COS Websites and Services Terms of Use describe the - conditions under which the COS allows the public to use the Websites and - Services. This related Privacy Policy is a notice to our users about how - we manage your data. + You may not use COS Websites or Services if you do not accept the COS Terms and Conditions of Use. By using the + Website and Services, you further represent that you have all necessary authority and consents to post any content + to upload to the Websites or use in conjunction with the Services. Your use of COS Websites and Services Terms of + Use describe the conditions under which the COS allows the public to use the Websites and Services. This related + Privacy Policy is a notice to our users about how we manage your data.

- Prior to collecting personal information of external users, a privacy - policy is provided that may include the purpose and use of the personal - information, including detailed use, ability to opt-out, enhancement - (enrichment), sharing, disclosure, access, security, retention, breach - notification requirements, and disposal of personal information. More - information on specific privacy settings for Projects on osf.io is - provided in Section 12. + Prior to collecting personal information of external users, a privacy policy is provided that may include the + purpose and use of the personal information, including detailed use, ability to opt-out, enhancement (enrichment), + sharing, disclosure, access, security, retention, breach notification requirements, and disposal of personal + information. More information on specific privacy settings for Projects on osf.io is provided in Section 12.

3. SITES COVERED BY THIS PRIVACY POLICY

- This Privacy Policy applies to the COS Websites located at cos.io and - osf.io, and COS-operated Websites and URLs, and Services provided by COS - through them, including services hosted on osf.io, even if operated or - moderated by other communities or entities such as universities or - scholarly societies. For OSF, our privacy practices are based on three - levels of openness and privacy, which are set by the Administrator of each - Project, namely, public, limited access, and private access. These levels - of privacy are described in Section 12 of this Policy. + This Privacy Policy applies to the COS Websites located at cos.io and osf.io, and COS-operated Websites and URLs, + and Services provided by COS through them, including services hosted on osf.io, even if operated or moderated by + other communities or entities such as universities or scholarly societies. For OSF, our privacy practices are + based on three levels of openness and privacy, which are set by the Administrator of each Project, namely, public, + limited access, and private access. These levels of privacy are described in Section 12 of this Policy.

4. CHANGES TO THIS PRIVACY POLICY

- The process of maintaining a website is an evolving one, and COS may - modify and amend this Privacy Policy by posting a new Policy on our - Websites. Please carefully review any posted changes to our Privacy - Policy. Continued use of our Websites and Services after we have posted a - notice of changes to the Privacy Policy shall constitute your consent to - the changed terms or practices. Note that any personal data we collect - about you is subject to the privacy policy in effect at the time of its - collection. And, further, you may have certain rights with respect to that - personal data, as described in this Privacy Policy. + The process of maintaining a website is an evolving one, and COS may modify and amend this Privacy Policy by + posting a new Policy on our Websites. Please carefully review any posted changes to our Privacy Policy. Continued + use of our Websites and Services after we have posted a notice of changes to the Privacy Policy shall constitute + your consent to the changed terms or practices. Note that any personal data we collect about you is subject to the + privacy policy in effect at the time of its collection. And, further, you may have certain rights with respect to + that personal data, as described in this Privacy Policy.

5. CHILDREN'S PRIVACY

- COS is committed to protecting the privacy needs of children. COS does not - intentionally collect information from children under the age of 16, and - COS does not target its sites to children. Only persons who are more than - 18 years-old may use our Websites and Services. By accessing our Websites - and Services, you are legally acknowledging that you are over the age of - 18 . If you are under the age of 18, you don't have the legal right to - access our Websites and Services. + COS is committed to protecting the privacy needs of children. COS does not intentionally collect information from + children under the age of 16, and COS does not target its sites to children. Only persons who are more than 18 + years-old may use our Websites and Services. By accessing our Websites and Services, you are legally acknowledging + that you are over the age of 18 . If you are under the age of 18, you don't have the legal right to access our + Websites and Services.

6. CALIFORNIA SHINE THE LIGHT LAW

- California residents who provide personal information in obtaining - products or services for personal, family or household use are entitled to - request and obtain from us, once per calendar year, information about the - customer information we shared, if any, with other businesses for their - own direct marketing uses. If applicable, this information would include - the categories of customer information and the names and addresses of - those businesses with which we shared customer information for the - immediately prior calendar year. To obtain this information, please email - us at contact@cos.io with the - subject line "Request for California Privacy Information", we will send - you a reply e-mail containing the requested information. Not all - information sharing is covered by the "Shine the Light" requirements and - only information on covered sharing will be included in our response. + California residents who provide personal information in obtaining products or services for personal, family or + household use are entitled to request and obtain from us, once per calendar year, information about the customer + information we shared, if any, with other businesses for their own direct marketing uses. If applicable, this + information would include the categories of customer information and the names and addresses of those businesses + with which we shared customer information for the immediately prior calendar year. To obtain this information, + please email us at contact@cos.io with the subject line "Request for + California Privacy Information", we will send you a reply e-mail containing the requested information. Not all + information sharing is covered by the "Shine the Light" requirements and only information on covered sharing will + be included in our response.

7. SECURITY

- We have implemented industry-standard security safeguards designed to - protect the personal information that you may provide. We also - periodically monitor our system for possible vulnerabilities and attacks, - consistent with industry standards. You should be aware, however, that - since the Internet is not a 100% secure environment, we cannot ensure or - warrant the security of any information that you submit to the site. - There's also no guarantee that information may not be accessed, disclosed, - altered, or destroyed by breach of any of our physical, technical, or - managerial safeguards. It is your responsibility to protect the security - and integrity of your account details, including your username and - password. To maintain the security of your information (or another user's - personal information that you are authorized to manage as an - Administrator), you must keep your username(s) and password(s) strictly - confidential and not disclose them to anyone. You will be solely - responsible for any action, activities, and access to our Websites and - Services that are taken using your username and password and that occurred - before you notified us of their loss. If you become aware of any security - breach of your password or of the security of the Websites or Services, - you must contact us as soon as possible at + We have implemented industry-standard security safeguards designed to protect the personal information that you + may provide. We also periodically monitor our system for possible vulnerabilities and attacks, consistent with + industry standards. You should be aware, however, that since the Internet is not a 100% secure environment, we + cannot ensure or warrant the security of any information that you submit to the site. There's also no guarantee + that information may not be accessed, disclosed, altered, or destroyed by breach of any of our physical, + technical, or managerial safeguards. It is your responsibility to protect the security and integrity of your + account details, including your username and password. To maintain the security of your information (or another + user's personal information that you are authorized to manage as an Administrator), you must keep your username(s) + and password(s) strictly confidential and not disclose them to anyone. You will be solely responsible for any + action, activities, and access to our Websites and Services that are taken using your username and password and + that occurred before you notified us of their loss. If you become aware of any security breach of your password or + of the security of the Websites or Services, you must contact us as soon as possible at security@osf.io.

- In the event COS becomes aware of a security incident, such an event may - be a malicious code attack, unauthorized access to information or systems, - the unauthorized use of services, a denial-of-service attack, or a hoax, - COS has an incident response plan, available at + In the event COS becomes aware of a security incident, such an event may be a malicious code attack, unauthorized + access to information or systems, the unauthorized use of services, a denial-of-service attack, or a hoax, COS has + an incident response plan, available at https://help.osf.io/article/228-cos-data-breach-response-plan, designed to facilitate quick and efficient response to incidents, and - to limit their impact while protecting information assets and user data. + >, designed to facilitate quick and efficient response to incidents, and to limit their impact while protecting + information assets and user data.

@@ -180,329 +140,258 @@

7. SECURITY

8. TYPES OF INFORMATION WE COLLECT

(a) OSF Account Enrollment

- Unless you are a member of the general public with limited viewing rights, - in order to fully use the COS Websites and Services, you will need to - create an account by providing us with at least your name, email address, - and password. You can choose to provide other information about yourself - in your account profile during the enrollment process (for example, your - organizational or company affiliation, your level of education, location, - your job title, professional experience, professional affiliations and - memberships, etc.). This information that you voluntarily provide may be - seen by other users who view your profile. We collect this information - only with your consent. -

-

- We use this additional information to customize your experience on this - website, and this information may be viewable by others. You understand - that, by creating or claiming an OSF account, COS and others within your - Project's level of access will be able to identify you by your profile, - and you agree to allow COS to use this information in accordance with this - Privacy Policy. You must follow this link to our - Terms of Use - in order to understand the terms of your relationship with COS. On some - pages of our Websites, you may be able to request information, subscribe - to mailing lists, participate in online discussions, collaborate on - documents, provide feedback, submit information into registries, register - for events, apply for membership, or join committees or working groups. - The types of personal information you provide to us on these pages may - include your name, address, phone number, e-mail address, user IDs, - passwords, or other information that relates to you personally. + Unless you are a member of the general public with limited viewing rights, in order to fully use the COS Websites + and Services, you will need to create an account by providing us with at least your name, email address, and + password. You can choose to provide other information about yourself in your account profile during the enrollment + process (for example, your organizational or company affiliation, your level of education, location, your job + title, professional experience, professional affiliations and memberships, etc.). This information that you + voluntarily provide may be seen by other users who view your profile. We collect this information only with your + consent. +

+

+ We use this additional information to customize your experience on this website, and this information may be + viewable by others. You understand that, by creating or claiming an OSF account, COS and others within your + Project's level of access will be able to identify you by your profile, and you agree to allow COS to use this + information in accordance with this Privacy Policy. You must follow this link to our + Terms of Use + in order to understand the terms of your relationship with COS. On some pages of our Websites, you may be able to + request information, subscribe to mailing lists, participate in online discussions, collaborate on documents, + provide feedback, submit information into registries, register for events, apply for membership, or join + committees or working groups. The types of personal information you provide to us on these pages may include your + name, address, phone number, e-mail address, user IDs, passwords, or other information that relates to you + personally.

(b) Group Participation

- We may collect information when you use our Websites, such as when you - join and participate in any group, participate in any polls or surveys, or - otherwise interact with other users within the community. + We may collect information when you use our Websites, such as when you join and participate in any group, + participate in any polls or surveys, or otherwise interact with other users within the community.

(c) Non-Personal Information

- Non-personal information is data about usage and service operation that is - not directly associated with a specific personal identity COS may collect, - analyze, and share aggregated non-personal information to evaluate how - visitors use our Websites and Services. + Non-personal information is data about usage and service operation that is not directly associated with a specific + personal identity COS may collect, analyze, and share aggregated non-personal information to evaluate how visitors + use our Websites and Services.

(d) Aggregate Information

- COS may collect aggregate information, which refers to information your - computer automatically provides us and that cannot be tied back to you as - a specific individual. This information can be shared with third parties - without restriction. Examples include referral data (the sites you visited - just before and just after our site), the pages viewed, the date of your - visit, and time spent at our Websites. + COS may collect aggregate information, which refers to information your computer automatically provides us and + that cannot be tied back to you as a specific individual. This information can be shared with third parties + without restriction. Examples include referral data (the sites you visited just before and just after our site), + the pages viewed, the date of your visit, and time spent at our Websites.

(e) Log Files and IP Addresses

- We may collect information from the devices and networks that you use to - visit the Websites in order to help improve the services we provide, - including your Internet Protocol Address (IP Address). An IP address is a - number that is automatically assigned to your computer whenever you access - the Internet. For example, when you request a page from one of our sites, - our servers log your IP address to create aggregate reports on user - demographics, traffic patterns, metascience, and for purposes of system - administration. Every time you request or download a file from the site, - COS may store data about these events and your IP address in a log file. - We may use this information to analyze trends, administer the site, track - users' movements, and gather broad demographic information for aggregate - use or for other business purposes. When you access or leave our Websites - by clicking on a hyperlink, we receive the URL from the site from which - you last visited or the one to which you're directed. We may receive the - Internet Protocol ("IP") address of your computer or proxy server used to - access the site, your operating system, the type of browser you used, and - the type of device you use, the Application Programming Interface ("API") - you use, or your mobile device carrier or your ISP. We also may receive - location data passed to us from third-party services or GPS-enabled - devices that you have set up in order to customize your experience based - on location information. + We may collect information from the devices and networks that you use to visit the Websites in order to help + improve the services we provide, including your Internet Protocol Address (IP Address). An IP address is a number + that is automatically assigned to your computer whenever you access the Internet. For example, when you request a + page from one of our sites, our servers log your IP address to create aggregate reports on user demographics, + traffic patterns, metascience, and for purposes of system administration. Every time you request or download a + file from the site, COS may store data about these events and your IP address in a log file. We may use this + information to analyze trends, administer the site, track users' movements, and gather broad demographic + information for aggregate use or for other business purposes. When you access or leave our Websites by clicking on + a hyperlink, we receive the URL from the site from which you last visited or the one to which you're directed. We + may receive the Internet Protocol ("IP") address of your computer or proxy server used to access the site, your + operating system, the type of browser you used, and the type of device you use, the Application Programming + Interface ("API") you use, or your mobile device carrier or your ISP. We also may receive location data passed to + us from third-party services or GPS-enabled devices that you have set up in order to customize your experience + based on location information.

(f) Cookies

- We use cookies and similar technologies, including mobile device - identifiers, to help us recognize you when you log into our Websites and - Services. By accessing our Websites, you are consenting to the placement - of cookies and other similar technologies in your browser in accordance - with this Privacy Policy.
- Cookies are small packets of information that a site's computer stores on - your computer. COS can then read the cookies whenever you visit our - Websites. We may use cookies in a number of ways, such as to save the fact - that you are logged into the system so you don't have to relogin each time - you visit our Websites, to deliver content specific to your interests, and - to track the pages you've visited. These cookies allow us to use the - information we collect to customize your experience so that your visit to - our Websites and your use of our Services are as relevant and as valuable - to you as possible. You may modify and control how and when cookies are - set through your browser settings. Most browsers offer instructions on how - to reset the browser to control or reject cookies in the "Help" section of - the toolbar. We do not link non-personal information from cookies to - personally identifiable information without your permission. + We use cookies and similar technologies, including mobile device identifiers, to help us recognize you when you + log into our Websites and Services. By accessing our Websites, you are consenting to the placement of cookies and + other similar technologies in your browser in accordance with this Privacy Policy.
+ Cookies are small packets of information that a site's computer stores on your computer. COS can then read the + cookies whenever you visit our Websites. We may use cookies in a number of ways, such as to save the fact that you + are logged into the system so you don't have to relogin each time you visit our Websites, to deliver content + specific to your interests, and to track the pages you've visited. These cookies allow us to use the information + we collect to customize your experience so that your visit to our Websites and your use of our Services are as + relevant and as valuable to you as possible. You may modify and control how and when cookies are set through your + browser settings. Most browsers offer instructions on how to reset the browser to control or reject cookies in the + "Help" section of the toolbar. We do not link non-personal information from cookies to personally identifiable + information without your permission.

(g) Web Beacons

- Our Websites also may use web beacons and other technologies, such as - pixels and javascript tags, to collect non-personal information about your - use of our site and the sites you visit, your use of special announcements - or newsletters, and other activities. The information collected by web - beacons allows us, for example, to statistically monitor how many people - are using our Websites; how many people open our emails; and for what - purposes these actions are being taken. We do not share personally - identifiable information with any third-party advertisers, but we may show - you sponsored content from our members and affiliates. + Our Websites also may use web beacons and other technologies, such as pixels and javascript tags, to collect + non-personal information about your use of our site and the sites you visit, your use of special announcements or + newsletters, and other activities. The information collected by web beacons allows us, for example, to + statistically monitor how many people are using our Websites; how many people open our emails; and for what + purposes these actions are being taken. We do not share personally identifiable information with any third-party + advertisers, but we may show you sponsored content from our members and affiliates.

(h) New Technologies

- As new technologies emerge, COS may be able to improve our services or - provide you with new ones, which means that COS may create new ways to - collect information on our Websites. If we offer a new service or new - features to our existing Websites, for example, these changes may result - in our collecting new information in order to improve your user - experience. + As new technologies emerge, COS may be able to improve our services or provide you with new ones, which means that + COS may create new ways to collect information on our Websites. If we offer a new service or new features to our + existing Websites, for example, these changes may result in our collecting new information in order to improve + your user experience.

9. COS ADMINISTRATORS AND MODERATORS

- If you contact COS, we collect information that helps us categorize your - question or report, respond to it, and, if applicable, investigate any - potential breach of this Privacy Policy. We also may use this information - to track potential problems and trends in order to improve our services to - you and to the community as a whole. + If you contact COS, we collect information that helps us categorize your question or report, respond to it, and, + if applicable, investigate any potential breach of this Privacy Policy. We also may use this information to track + potential problems and trends in order to improve our services to you and to the community as a whole.

10. LINKS TO THIRD-PARTY SITES AND SERVICES

- Our Websites and Services may provide links to third-party sites for the - convenience of our users. If you access those links or third-party - add-ons, you will leave our Websites or use the services of another - Website. COS does not control these third-party sites and cannot represent - that their policies and practices will be consistent with this Privacy - Policy. For example, other sites may collect or use personal information - about you in a manner different from that described in this document. You - should be aware that materials available through third-party sites may be - protected from unauthorized copying and dissemination by U.S. copyright - law, trademark law, international conventions, and other intellectual - property laws, and the usage of such materials may be subject to - limitations that are more or less restrictive than those expressed herein. - Therefore, you should use other sites with caution, and you do so at your - own risk. We encourage you to review the privacy policy of any site before + Our Websites and Services may provide links to third-party sites for the convenience of our users. If you access + those links or third-party add-ons, you will leave our Websites or use the services of another Website. COS does + not control these third-party sites and cannot represent that their policies and practices will be consistent with + this Privacy Policy. For example, other sites may collect or use personal information about you in a manner + different from that described in this document. You should be aware that materials available through third-party + sites may be protected from unauthorized copying and dissemination by U.S. copyright law, trademark law, + international conventions, and other intellectual property laws, and the usage of such materials may be subject to + limitations that are more or less restrictive than those expressed herein. Therefore, you should use other sites + with caution, and you do so at your own risk. We encourage you to review the privacy policy of any site before submitting personal information.

- We may receive information when you use your account to log into a - third-party site or application in order to recommend tailored information - to you and to improve your user experience on our Websites. We may provide - reports containing aggregated impression information to third parties to - measure Internet traffic and usage patterns. + We may receive information when you use your account to log into a third-party site or application in order to + recommend tailored information to you and to improve your user experience on our Websites. We may provide reports + containing aggregated impression information to third parties to measure Internet traffic and usage patterns.

11. DEFINITIONS

- In this document, we use "you" to refer to researchers and other users of - the Websites and Services, including OSF. We also use the following - defined terms: + In this document, we use "you" to refer to researchers and other users of the Websites and Services, including + OSF. We also use the following defined terms:

Project.
- A "Project" is used on OSF to describe an individual or collaborative - enterprise that also may have embedded within its subproject(s) or - "Project components" or "component(s)" of the Project. + A "Project" is used on OSF to describe an individual or collaborative enterprise that also may have embedded + within its subproject(s) or "Project components" or "component(s)" of the Project.

Preprint.
- A “Preprint” is used on OSF to describe a publicly shared document and - associated metadata. Preprints cannot be deleted, but can be withdrawn, - leaving behind metadata about the resource. + A “Preprint” is used on OSF to describe a publicly shared document and associated metadata. Preprints cannot be + deleted, but can be withdrawn, leaving behind metadata about the resource.

Registration.
- A “Registration” is used on OSF to describe a public, timestamped - Object, which is referenced by a DOI and descriptive metadata. - Registrations cannot be deleted, but can be withdrawn, leaving behind - basic metadata about the resource. + A “Registration” is used on OSF to describe a public, timestamped Object, which is referenced by a DOI and + descriptive metadata. Registrations cannot be deleted, but can be withdrawn, leaving behind basic metadata about + the resource.

Content.
- As used in this Privacy Policy, "content" means, but is not limited to, - any research, data, text, images, software and software code, data sets, - information, or other materials. Content can be shared on OSF, in a COS + As used in this Privacy Policy, "content" means, but is not limited to, any research, data, text, images, + software and software code, data sets, information, or other materials. Content can be shared on OSF, in a COS blog post, through interacting in a COS-hosted webinar or workshop, etc.

Collection.
- A “Collection” is a group of content hosted on OSF. Examples include OSF - Preprints, OSF Registries, OSF Meetings, and branded community-organized - services utilizing OSF infrastructure. + A “Collection” is a group of content hosted on OSF. Examples include OSF Preprints, OSF Registries, OSF + Meetings, and branded community-organized services utilizing OSF infrastructure.

Users.
- All Users must accept the COS Terms of Use and Privacy Policy. A user is - a registered account owner on OSF, anyone visiting OSF, and users and - visitors of COS Websites and Services and websites. For example, an - attendee of a COS-hosted webinar is a user of the COS webinar service. + All Users must accept the COS Terms of Use and Privacy Policy. A user is a registered account owner on OSF, + anyone visiting OSF, and users and visitors of COS Websites and Services and websites. For example, an attendee + of a COS-hosted webinar is a user of the COS webinar service.

Administrator.
- An administrator is used on OSF to describe a role and permission level - for a user account on a Project or a component is an individual who has - full rights to control all aspects of a Project, Preprint, or - Registration. An Administrator may create a Project, components of a - Project, or Preprint, create and change contributor permissions, - identify the legal terms that govern the ownership of the intellectual - property in Content deposited into a Project, a Project component, or - Preprint or identify the license restrictions governing the use of the - intellectual property incorporated into the Project, Project component, - or Preprint, control and modify access and privacy settings for the - Project and its components, modify license terms for the use of Content, - invite other users to contribute to a Project, component of a project, - or Preprint, authorize add-ons, namely, software designed to increase - the capability of OSF, remove Projects or Project Components from the - Websites and Services, create Registrations (i.e. freeze and uniquely - identify) of Projects or Project components, submit content to a third - party for review or moderation, and register DOIs (share persistent + An administrator is used on OSF to describe a role and permission level for a user account on a Project or a + component is an individual who has full rights to control all aspects of a Project, Preprint, or Registration. + An Administrator may create a Project, components of a Project, or Preprint, create and change contributor + permissions, identify the legal terms that govern the ownership of the intellectual property in Content + deposited into a Project, a Project component, or Preprint or identify the license restrictions governing the + use of the intellectual property incorporated into the Project, Project component, or Preprint, control and + modify access and privacy settings for the Project and its components, modify license terms for the use of + Content, invite other users to contribute to a Project, component of a project, or Preprint, authorize add-ons, + namely, software designed to increase the capability of OSF, remove Projects or Project Components from the + Websites and Services, create Registrations (i.e. freeze and uniquely identify) of Projects or Project + components, submit content to a third party for review or moderation, and register DOIs (share persistent metadata with a third party).

Proxy.
- A Proxy is a person to whom the Administrator has granted the authority - to manage a Project or Project component on his or her behalf, which may - include setting and modifying user access, privacy settings, license - terms, and editing and depositing Content. + A Proxy is a person to whom the Administrator has granted the authority to manage a Project or Project component + on his or her behalf, which may include setting and modifying user access, privacy settings, license terms, and + editing and depositing Content.

Contributing User.
- A Contributing User is used on OSF to describe a user who may access, - deposit, and edit Content to a Project, Project component, or Preprint. + A Contributing User is used on OSF to describe a user who may access, deposit, and edit Content to a Project, + Project component, or Preprint.

Active User.
- Active User. An Active User may have select interactive use of the - Websites and Services, subject to restrictions imposed by the - Administrator. + Active User. An Active User may have select interactive use of the Websites and Services, subject to + restrictions imposed by the Administrator.

Passive User.
- A passive user, including journal editors/reviewers, other scientists, - and members of the general public, may use the Websites and Services - solely as an information resource without any ability to change or - modify any Project content. Still, a Passive User is bound to this - Privacy Policy. + A passive user, including journal editors/reviewers, other scientists, and members of the general public, may + use the Websites and Services solely as an information resource without any ability to change or modify any + Project content. Still, a Passive User is bound to this Privacy Policy.

Collection Administrator.
- A Collection Administrator is an individual who determines content - requirements and moderation settings for a Collection and assigns - Reviewers. + A Collection Administrator is an individual who determines content requirements and moderation settings for a + Collection and assigns Reviewers.

Moderator.
- A moderator may use the Website and Services to review content submitted - to a Collection, provide comment on it, accept or reject its submission - to the Collection, and update its metadata as it relates to the - Collection. + A moderator may use the Website and Services to review content submitted to a Collection, provide comment on it, + accept or reject its submission to the Collection, and update its metadata as it relates to the Collection.

Public API.
- An application program interface (API) is available to the public to - facilitate computer communication with the OSF. Parts or all of the - Websites and Services are accessible via various Public APIs, including - but not limited to, GitHub, Twitter, Facebook, YouTube, Google Scholar - and Google Groups, and LinkedIn. + An application program interface (API) is available to the public to facilitate computer communication with the + OSF. Parts or all of the Websites and Services are accessible via various Public APIs, including but not limited + to, GitHub, Twitter, Facebook, YouTube, Google Scholar and Google Groups, and LinkedIn.

Account Creation.
- Register a user account on the OSF, creating a user account and profile. - Privacy Settings define whether Project Content may be publicly - displayed, displayed with restricted access to a limited group, or - private. + Register a user account on the OSF, creating a user account and profile. Privacy Settings define whether Project + Content may be publicly displayed, displayed with restricted access to a limited group, or private.

OSFI/Institutional Administrator.
An active user, designated by an - OSF Institutional member, who can access an insights dashboard for their institution, as well - as request access to affiliated content in order to assist with metadata - comprehensiveness. Administrators adhere to both the service agreement - between COS and the Administrator's business, organization, or - institution and to the COS's Terms of Use and Privacy Policy. + OSF Institutional member, who can access an insights + dashboard for their institution, as well as request access to affiliated content in order to assist with + metadata comprehensiveness. Administrators adhere to both the service agreement between COS and the + Administrator's business, organization, or institution and to the COS's Terms of Use and Privacy Policy.

Affiliated User.
An active user who has a verified affiliation with an - OSF Institutional member. + OSF Institutional member.

Affiliated Content.
- A project, registration, or preprint with a contributor that is an - affiliated user, and has chosen to include their affiliation on this - content. The user maintains ownership of this content, and can grant - further rights by applying a license to it. + A project, registration, or preprint with a contributor that is an affiliated user, and has chosen to include + their affiliation on this content. The user maintains ownership of this content, and can grant further rights by + applying a license to it.
@@ -510,278 +399,215 @@

11. DEFINITIONS

12. PRIVACY SETTINGS

- Projects, Project components, Preprints, and Registrations can be created - by an Administrator. The Administrator may choose whether to designate and - make Content public, limited access or private. If an Administrator wishes - to send you an invitation to participate in a Project, Project component, - Preprint, or Registration, the Administrator or COS will send you an - email. Once you accept the invitation, your personal profile information - may be made available to others collaborating on the Project, Preprint, or - Registration, subject to the specific privacy access restrictions imposed - by the Administrator of your Project, Preprint, or Registration. + Projects, Project components, Preprints, and Registrations can be created by an Administrator. The Administrator + may choose whether to designate and make Content public, limited access or private. If an Administrator wishes to + send you an invitation to participate in a Project, Project component, Preprint, or Registration, the + Administrator or COS will send you an email. Once you accept the invitation, your personal profile information may + be made available to others collaborating on the Project, Preprint, or Registration, subject to the specific + privacy access restrictions imposed by the Administrator of your Project, Preprint, or Registration.

Public.
- Content marked as "Public" will be available to the public for viewing - and commercial and non-commercial use under the terms of the license - identified by the Administrator. + Content marked as "Public" will be available to the public for viewing and commercial and non-commercial use + under the terms of the license identified by the Administrator.

Private.
- Content marked as "Private" may be viewed through the OSF or Public API - only by the Administrator(s), a Contributing User of that Project or - Component, anyone with a view-only link created by an Administrator, or - any designated Proxy. Private data are not shared with the public, - Trusted Parties, or other members of the COS. Only the COS employees and - our authorized agents' or contractors' staff, with a "need to know" - access to manage the Websites and Services and process data for the COS - are able to view Private Access Data. + Content marked as "Private" may be viewed through the OSF or Public API only by the Administrator(s), a + Contributing User of that Project or Component, anyone with a view-only link created by an Administrator, or any + designated Proxy. Private data are not shared with the public, Trusted Parties, or other members of the COS. + Only the COS employees and our authorized agents' or contractors' staff, with a "need to know" access to manage + the Websites and Services and process data for the COS are able to view Private Access Data.

Embargoed.
- Content marked as “Embargoed” may be viewed through the OSF or Public - API only by the Administrator(s), a Contributing User of that Project or - Component, anyone with a view-only link created by an Administrator, or - any designated Proxy ("Private"), until the Embargo date has passed, at - which time the content will be made Public automatically. + Content marked as “Embargoed” may be viewed through the OSF or Public API only by the Administrator(s), a + Contributing User of that Project or Component, anyone with a view-only link created by an Administrator, or any + designated Proxy ("Private"), until the Embargo date has passed, at which time the content will be made Public + automatically.

Limited Access.
- Content marked as "Limited Access" may be viewed through our Websites - and Services by the Project Administrator, a Proxy, a Contributing User, - an Active or Passive User, and a Trusted Party, subject to the - restrictions imposed by the Administrator. + Content marked as "Limited Access" may be viewed through our Websites and Services by the Project Administrator, + a Proxy, a Contributing User, an Active or Passive User, and a Trusted Party, subject to the restrictions + imposed by the Administrator.

Under Review.
- Content submitted to services using OSF Reviews may be “Private,” yet - available to designated Reviewers of the service for viewing and - accepting or rejecting. + Content submitted to services using OSF Reviews may be “Private,” yet available to designated Reviewers of the + service for viewing and accepting or rejecting.

- If an Administrator changes the privacy settings of a Project, those - changes will be applied prospectively. For example, if an Administrator - changes a privacy setting from "Public" to "Private" or "Limited Access", - there is no way for COS to restrict people who have previously viewed or - downloaded the previously publicly accessible Content from using it. + If an Administrator changes the privacy settings of a Project, those changes will be applied prospectively. For + example, if an Administrator changes a privacy setting from "Public" to "Private" or "Limited Access", there is no + way for COS to restrict people who have previously viewed or downloaded the previously publicly accessible Content + from using it.

13. HOW WE USE YOUR PERSONAL INFORMATION

- When you register for an account on COS Services, you acknowledge that the - information you provide on your profile may be seen by others and used by - COS as described in this Privacy Policy and our Terms of Use. When using - COS services and websites you acknowledge that information you provide or - consume may be seen by others and used by COS as described in this Privacy - Policy and our Terms of Use. + When you register for an account on COS Services, you acknowledge that the information you provide on your profile + may be seen by others and used by COS as described in this Privacy Policy and our Terms of Use. When using COS + services and websites you acknowledge that information you provide or consume may be seen by others and used by + COS as described in this Privacy Policy and our Terms of Use.

(a) Consent to COS to Use Personal Information

- COS may use personal information you supply to provide services that - support the activities of the organization, its members, and their - collaboration on Projects: contacting users, understanding aggregate usage - of the site, and tailoring services. When accessing the Websites, your - personal user information may be tracked by COS in order to support - collaboration, ensure authorized access, and enable communication between - collaborators.
- The personal information you may provide to COS may reveal or allow others - to discern aspects of your life that are not expressly stated in your - profile (for example, your picture or your name may reveal your gender). - By consenting to provide personal information to us when you create or - update your account and profile, you accept and agree to our processing of - your personal information in ways set out by this Privacy Policy. - Supplying information to us, including any information deemed "sensitive" - by applicable law, is entirely voluntary on your part. You may withdraw - your consent to COS's collection and processing of your information by - changing or closing your account, as more fully described in this Privacy - Policy. + COS may use personal information you supply to provide services that support the activities of the organization, + its members, and their collaboration on Projects: contacting users, understanding aggregate usage of the site, and + tailoring services. When accessing the Websites, your personal user information may be tracked by COS in order to + support collaboration, ensure authorized access, and enable communication between collaborators.
+ The personal information you may provide to COS may reveal or allow others to discern aspects of your life that + are not expressly stated in your profile (for example, your picture or your name may reveal your gender). By + consenting to provide personal information to us when you create or update your account and profile, you accept + and agree to our processing of your personal information in ways set out by this Privacy Policy. Supplying + information to us, including any information deemed "sensitive" by applicable law, is entirely voluntary on your + part. You may withdraw your consent to COS's collection and processing of your information by changing or closing + your account, as more fully described in this Privacy Policy.

(b) Communications from COS

- We use the information you provide to customize your experience on the - site. We may communicate with you using email or other means available to - us regarding the availability of services, service-related issues, or - announcements that we believe may be of interest to you. We may, for - example, send you welcome messages and emails regarding new features or - services, and promotional information from COS. You may opt out of - receiving promotional messages from COS by following the instructions - contained in the email. As long as you're a registered user, however, you - can't opt out of receiving service messages from us. COS may also use - personal information in order to customize content on the site to you, - such as news relevant to you or to your industry or company. + We use the information you provide to customize your experience on the site. We may communicate with you using + email or other means available to us regarding the availability of services, service-related issues, or + announcements that we believe may be of interest to you. We may, for example, send you welcome messages and emails + regarding new features or services, and promotional information from COS. You may opt out of receiving promotional + messages from COS by following the instructions contained in the email. As long as you're a registered user, + however, you can't opt out of receiving service messages from us. COS may also use personal information in order + to customize content on the site to you, such as news relevant to you or to your industry or company.

(c) Communications from Others

- Personal contact information may be provided to other members of a Project - on a secure site to encourage and facilitate collaboration, research, and - the free exchange of information. Please remember that any information - (including personal information) that you disclose on the public sections - of our Websites, such as forums, message boards, and news groups, becomes - public information that others may collect, circulate, and use. Because we - cannot and do not control the acts of others, you should exercise caution - when deciding to disclose information about yourself or others in public - forums such as these. + Personal contact information may be provided to other members of a Project on a secure site to encourage and + facilitate collaboration, research, and the free exchange of information. Please remember that any information + (including personal information) that you disclose on the public sections of our Websites, such as forums, message + boards, and news groups, becomes public information that others may collect, circulate, and use. Because we cannot + and do not control the acts of others, you should exercise caution when deciding to disclose information about + yourself or others in public forums such as these.

(d) Sharing Information with Third Parties

- COS may share your personal information with our vendors, agents or - contractors, such as a vendor that may host COS's servers to help us - operate our Websites and Services. You can read a list of these third - parties - here. - Additionally, we may utilize certain platforms for event management or - automated workflows, which may collect and pass information between - systems we ultimately use for data storage and management. By providing us - with your personal information during the user registration process and by - agreeing to the terms of this Privacy Policy, you expressly consent to our - storing, processing, and distributing your information for these purposes. -

-

- COS may reach out to users to conduct research - whether that is internal - user research to improve services or generalizable and externally - shareable research on open practices. In doing so we will adhere to - ethical guidelines when conducting generalizable and externally shareable - research. -

-

- Information you put on your profile and any messages or comments you post - on the public areas of our Websites may be seen by others. In keeping with - our open process, COS may maintain publicly accessible archives of - Projects for which the privacy level is designated as or amended to - "Public" by the Administrator. In addition, should you post a comment or - send an email to any of COS's hosted mail lists or discussion forums, - subscribe to one of our newsletters or register for one of our public - meetings, your email address may become part of the publicly accessible - archives. -

-

- Information on our Websites may result in display of some of your personal - information outside of COS. For example, when you post messages or - comments that are open for public review and/or discussion, your profile - information, including your name as the contributor and your email - address, may be displayed in public search-engine results. Similarly, if - you post to public areas of our Websites using a Public API such as - Twitter, Facebook, or Google Groups, your account profiles associated with - these third-party products may be displayed to the public. Your public - profile also may be indexed and displayed through public search engines - when someone searches for your name on our Websites. -

-

- You are responsible for any information you post on our Websites, and, - subject to our Terms of Use and Privacy Policy, this information may be - accessible to others. Accordingly, you should be aware that any - information you choose to disclose on our Websites or Services may be - read, collected, and used by other users within COS, and in the case of - Projects and forums open to the public, by third parties. COS is not - responsible for the information you choose to submit on our Websites. -

-

- COS does not rent or sell or otherwise distribute personal information - that you have shared with us, except as permitted in this Privacy Policy. - We will not disclose personal information that is associated with your - profile unless COS has a good-faith belief that disclosure is permitted by - law or is reasonably necessary to: (1) comply with a legal requirement or - process, including, but not limited to, civil and criminal subpoenas, - court orders or other compulsory disclosures; (2) investigate and enforce - this Privacy Policy or our Terms of Use; (3) respond to claims of a - violation of the rights of third parties; (4) respond to member service - inquiries; (5) protect the rights, property, or safety of COS, our users, - or the public; or (6) as part of the sale of the assets of COS or as a - change in control of the organization or one of its affiliates or in - preparation for any of these events. COS reserves the right to supply any - such information to any organization into which COS may merge in the - future or to which it may make any transfer in order to enable a third - party to continue part or all of the organization's mission. Any third - party to which COS transfers or sells its assets will have the right to - use the personal and other information that you provide in the manner set - out in this Privacy Policy. + COS may share your personal information with our vendors, agents or contractors, such as a vendor that may host + COS's servers to help us operate our Websites and Services. You can read a list of these third parties + here. Additionally, we may utilize certain + platforms for event management or automated workflows, which may collect and pass information between systems we + ultimately use for data storage and management. By providing us with your personal information during the user + registration process and by agreeing to the terms of this Privacy Policy, you expressly consent to our storing, + processing, and distributing your information for these purposes. +

+

+ COS may reach out to users to conduct research - whether that is internal user research to improve services or + generalizable and externally shareable research on open practices. In doing so we will adhere to ethical + guidelines when conducting generalizable and externally shareable research. +

+

+ Information you put on your profile and any messages or comments you post on the public areas of our Websites may + be seen by others. In keeping with our open process, COS may maintain publicly accessible archives of Projects for + which the privacy level is designated as or amended to "Public" by the Administrator. In addition, should you post + a comment or send an email to any of COS's hosted mail lists or discussion forums, subscribe to one of our + newsletters or register for one of our public meetings, your email address may become part of the publicly + accessible archives. +

+

+ Information on our Websites may result in display of some of your personal information outside of COS. For + example, when you post messages or comments that are open for public review and/or discussion, your profile + information, including your name as the contributor and your email address, may be displayed in public + search-engine results. Similarly, if you post to public areas of our Websites using a Public API such as Twitter, + Facebook, or Google Groups, your account profiles associated with these third-party products may be displayed to + the public. Your public profile also may be indexed and displayed through public search engines when someone + searches for your name on our Websites. +

+

+ You are responsible for any information you post on our Websites, and, subject to our Terms of Use and Privacy + Policy, this information may be accessible to others. Accordingly, you should be aware that any information you + choose to disclose on our Websites or Services may be read, collected, and used by other users within COS, and in + the case of Projects and forums open to the public, by third parties. COS is not responsible for the information + you choose to submit on our Websites. +

+

+ COS does not rent or sell or otherwise distribute personal information that you have shared with us, except as + permitted in this Privacy Policy. We will not disclose personal information that is associated with your profile + unless COS has a good-faith belief that disclosure is permitted by law or is reasonably necessary to: (1) comply + with a legal requirement or process, including, but not limited to, civil and criminal subpoenas, court orders or + other compulsory disclosures; (2) investigate and enforce this Privacy Policy or our Terms of Use; (3) respond to + claims of a violation of the rights of third parties; (4) respond to member service inquiries; (5) protect the + rights, property, or safety of COS, our users, or the public; or (6) as part of the sale of the assets of COS or + as a change in control of the organization or one of its affiliates or in preparation for any of these events. COS + reserves the right to supply any such information to any organization into which COS may merge in the future or to + which it may make any transfer in order to enable a third party to continue part or all of the organization's + mission. Any third party to which COS transfers or sells its assets will have the right to use the personal and + other information that you provide in the manner set out in this Privacy Policy.

14. THIRD PARTY SERVICE DATA

- This Privacy Policy outlines how the OSF accesses, uses, stores, and - shares data obtained from third party services via OSF add-on - integrations, including Google Drive, ensuring compliance with industry - policies and standards. + This Privacy Policy outlines how the OSF accesses, uses, stores, and shares data obtained from third party + services via OSF add-on integrations, including Google Drive, ensuring compliance with industry policies and + standards.

(a) Access to Google User Data

- The OSF may access Google user data only as and when authorized by the - user. This includes only the Google Drive account and root folder chosen - by the user and is limited to information necessary to complete the - function. The user is presented with the scopes and permissions that OSF - requests each time the user attempts to connect Drive to their OSF content - or reauthorizing their connection. + The OSF may access Google user data only as and when authorized by the user. This includes only the Google Drive + account and root folder chosen by the user and is limited to information necessary to complete the function. The + user is presented with the scopes and permissions that OSF requests each time the user attempts to connect Drive + to their OSF content or reauthorizing their connection.

(b) Use of Google User Data

- We use Google user data solely to provide and improve the services offered - by the OSF platform. Specifically, this data is used for providing access - to Google Drive content via the OSF interface. This access is based on the - viewer’s permissions on specific OSF content, ranging from read-only - viewing of files to administrative management including adding, deleting, - or replacing files. Users always determine the appropriate permissions for - their content. Data is never used for any unrelated purposes, such as - advertising or profiling. + We use Google user data solely to provide and improve the services offered by the OSF platform. Specifically, this + data is used for providing access to Google Drive content via the OSF interface. This access is based on the + viewer’s permissions on specific OSF content, ranging from read-only viewing of files to administrative management + including adding, deleting, or replacing files. Users always determine the appropriate permissions for their + content. Data is never used for any unrelated purposes, such as advertising or profiling.

(c) Storage of Google User Data

- Google user credentials are stored securely using industry-standard - encryption and are retained only for as long as necessary to fulfill the - intended purpose. File metadata for public content is also made - discoverable via the OSF interface. + Google user credentials are stored securely using industry-standard encryption and are retained only for as long + as necessary to fulfill the intended purpose. File metadata for public content is also made discoverable via the + OSF interface.

(D) Sharing of Google User Data

- We do not share Google user data with third parties except as required by - law or to fulfill a user-requested service. In such cases, we ensure that - any data shared is limited, anonymized when possible, and compliant with + We do not share Google user data with third parties except as required by law or to fulfill a user-requested + service. In such cases, we ensure that any data shared is limited, anonymized when possible, and compliant with applicable privacy laws.

(E) User Controls and Data Deletion

- Users retain full control over their Google data. You can revoke access to - your Google account at any time via your Google Account or OSF add-ons - settings. Additionally, you may request deletion of all your data stored - by the OSF by contacting + Users retain full control over their Google data. You can revoke access to your Google account at any time via + your Google Account or OSF add-ons settings. Additionally, you may request deletion of all your data stored by the + OSF by contacting support@cos.io.

(F) Compliance and Updates

- We adhere to Google API Services User Data Policy, including the Limited - Use requirements. This Privacy Policy is reviewed and updated regularly to - ensure continued compliance with legal and regulatory changes. + We adhere to Google API Services User Data Policy, including the Limited Use requirements. This Privacy Policy is + reviewed and updated regularly to ensure continued compliance with legal and regulatory changes.

15. DATA TRANSFER

- COS may store and process personal information on servers or on a cloud - located outside of the country where you originally deposited data. The - data-protection laws of the country or countries where this personal - information will be stored or processed might not be as comprehensive as - those in your country. If you are unsure whether this Privacy Policy is in - conflict with applicable local rules, you should not submit your - information. If you are located within the European Union, you should note - that your information will be transferred to the United States, which is - deemed by the European Union to have inadequate data protection. By using - our Websites and/or directly providing personal information to us, you - hereby agree to and acknowledge your understanding of the terms of this - Privacy Policy, and consent to have your personal data transferred to and - processed in the United States and/or in other jurisdictions as determined - by COS, notwithstanding your country of origin, or country, state, and/or + COS may store and process personal information on servers or on a cloud located outside of the country where you + originally deposited data. The data-protection laws of the country or countries where this personal information + will be stored or processed might not be as comprehensive as those in your country. If you are unsure whether this + Privacy Policy is in conflict with applicable local rules, you should not submit your information. If you are + located within the European Union, you should note that your information will be transferred to the United States, + which is deemed by the European Union to have inadequate data protection. By using our Websites and/or directly + providing personal information to us, you hereby agree to and acknowledge your understanding of the terms of this + Privacy Policy, and consent to have your personal data transferred to and processed in the United States and/or in + other jurisdictions as determined by COS, notwithstanding your country of origin, or country, state, and/or province of residence.

@@ -789,125 +615,94 @@

15. DATA TRANSFER

16. GOVERNING LAW

- This Privacy Policy is governed in all respects by the laws of the - Commonwealth of Virginia, excluding that state's conflicts of laws - provisions. Any action or proceeding arising out of or related to this - Policy or your use of the Websites or Services must be brought in the - state or federal courts of the Commonwealth of Virginia, and you consent - to the exclusive personal jurisdiction and venue of such courts. Any cause - of action you may have with respect to this Policy or your use of the - Websites or Services must be commenced within one (1) year after the claim - or cause of action arises. + This Privacy Policy is governed in all respects by the laws of the Commonwealth of Virginia, excluding that + state's conflicts of laws provisions. Any action or proceeding arising out of or related to this Policy or your + use of the Websites or Services must be brought in the state or federal courts of the Commonwealth of Virginia, + and you consent to the exclusive personal jurisdiction and venue of such courts. Any cause of action you may have + with respect to this Policy or your use of the Websites or Services must be commenced within one (1) year after + the claim or cause of action arises.

17. YOUR OPT-OUT OPTIONS

- You may access, modify, correct, or delete your personal information - controlled by COS regarding your profile, and you may close your account. - You can also contact us for any account information which is not on your - profile or readily accessible to you. If you close your account, some or - all of your profile information may continue to remain visible on the - Websites. -

-

- You should be aware that information that you've shared with others or - that others have copied may also remain visible after you have closed your - account or deleted the information from your own profile. In addition, you - may not be able to access, correct, or eliminate any information about you - that other users have copied or exported out of the Websites, because this - information may not be in our organization's control. Your public profile - may be displayed in search engine results.
- From time to time COS may email you electronic newsletters, announcements, - surveys, research studies (see section 13), or other information unrelated - to any Project. If you prefer not to receive any or all of these - communications, you may opt out by following the directions provided - within the electronic newsletters and announcements. COS also may conduct - polls and surveys of our users, and your participation in this type of - research is at your sole discretion. COS may follow up with you regarding - your participation in this research. You may at any time opt out of - participating in these polls and surveys. -

-

- Further, COS may send you occasional Service-related emails that you may - not opt-out of (e.g. changes or updates to features of our Services that - have security or privacy implications, technical and security notices, - account verification). + You may access, modify, correct, or delete your personal information controlled by COS regarding your profile, and + you may close your account. You can also contact us for any account information which is not on your profile or + readily accessible to you. If you close your account, some or all of your profile information may continue to + remain visible on the Websites. +

+

+ You should be aware that information that you've shared with others or that others have copied may also remain + visible after you have closed your account or deleted the information from your own profile. In addition, you may + not be able to access, correct, or eliminate any information about you that other users have copied or exported + out of the Websites, because this information may not be in our organization's control. Your public profile may be + displayed in search engine results.
+ From time to time COS may email you electronic newsletters, announcements, surveys, research studies (see section + 13), or other information unrelated to any Project. If you prefer not to receive any or all of these + communications, you may opt out by following the directions provided within the electronic newsletters and + announcements. COS also may conduct polls and surveys of our users, and your participation in this type of + research is at your sole discretion. COS may follow up with you regarding your participation in this research. You + may at any time opt out of participating in these polls and surveys. +

+

+ Further, COS may send you occasional Service-related emails that you may not opt-out of (e.g. changes or updates + to features of our Services that have security or privacy implications, technical and security notices, account + verification).

18. DATA RETENTION

- We will keep your personal information for as long as your account is - active or as needed to comply with our legal obligations, even after - you've closed your account, such as to meet regulatory requirements, - resolve disputes between users, to prevent fraud and abuse, or to enforce - this Privacy Policy and our Terms of Use. We may be required to retain - personal information for a limited period of time if requested by law - enforcement. We also may retain indefinitely non-personally identifiable, - aggregate data to facilitate our ongoing operations. + We will keep your personal information for as long as your account is active or as needed to comply with our legal + obligations, even after you've closed your account, such as to meet regulatory requirements, resolve disputes + between users, to prevent fraud and abuse, or to enforce this Privacy Policy and our Terms of Use. We may be + required to retain personal information for a limited period of time if requested by law enforcement. We also may + retain indefinitely non-personally identifiable, aggregate data to facilitate our ongoing operations.

19. GENERAL DATA PROTECTION REGULATION

- If you are a resident of or are located in the European Economic Area - (“EEA”), you may have certain rights under the General Data Protection - Regulation (“GDPR”). Personal data you provide is only collected with your - consent, and may be transmitted outside of the EEA to COS (or computer - servers maintained for the benefit of COS) pursuant to that consent. + If you are a resident of or are located in the European Economic Area (“EEA”), you may have certain rights under + the General Data Protection Regulation (“GDPR”). Personal data you provide is only collected with your consent, + and may be transmitted outside of the EEA to COS (or computer servers maintained for the benefit of COS) pursuant + to that consent.

In general, under the GDPR you may:

  • request access to your personal data
  • have incomplete or incorrect data corrected
  • have your personal data deleted
    • -
  • - suspend or restrict our use of your personal data, or withdraw your - consent -
    • +
  • suspend or restrict our use of your personal data, or withdraw your consent
  • request a copy of your personal data
    • -
  • - complain to a supervisory authority if you believe your rights under the - GDPR are not being respected -
    • +
  • complain to a supervisory authority if you believe your rights under the GDPR are not being respected

- Should you request a copy of your personal data, we will supply to you a - copy of your personal data. The first copy will be provided free of - charge, but additional copies may be subject to a reasonable fee. Should - you request the deletion of your personal data, COS will generally do so - as soon as practicable, although your right to have your personal data - deleted is subject to exceptions, such as, for example, compliance with a - legal obligation or for the establishment, exercise or defense of legal - claims. + Should you request a copy of your personal data, we will supply to you a copy of your personal data. The first + copy will be provided free of charge, but additional copies may be subject to a reasonable fee. Should you request + the deletion of your personal data, COS will generally do so as soon as practicable, although your right to have + your personal data deleted is subject to exceptions, such as, for example, compliance with a legal obligation or + for the establishment, exercise or defense of legal claims.

- If you consider that our processing of your personal information infringes - data-protection laws, you have a legal right to lodge a complaint with a - supervisory authority responsible for data protection. You may do so in - the EU member state of your habitual residence, your place of work or the - place of the alleged infringement. + If you consider that our processing of your personal information infringes data-protection laws, you have a legal + right to lodge a complaint with a supervisory authority responsible for data protection. You may do so in the EU + member state of your habitual residence, your place of work or the place of the alleged infringement.

- Contact COS at support@osf.io if - you have concerns regarding your personal data, or wish to exercise any of - these listed rights. + Contact COS at support@osf.io if you have concerns regarding your personal + data, or wish to exercise any of these listed rights.

- Note that, if you are in the EEA, we may transfer your personal data - outside of the EEA, including to the United States. By way of example, - this may happen if your personal data is transferred to our servers - located in a country outside of the EEA. These countries may not have - similar data-protection laws to the EEA. By submitting your personal data, - you’re agreeing to this transfer, storing, or processing. If we transfer - your information outside of the EEA in this way, we will take steps to - ensure that appropriate security measures are taken with the aim of - ensuring that your privacy rights continue to be protected as outlined in - this policy. + Note that, if you are in the EEA, we may transfer your personal data outside of the EEA, including to the United + States. By way of example, this may happen if your personal data is transferred to our servers located in a + country outside of the EEA. These countries may not have similar data-protection laws to the EEA. By submitting + your personal data, you’re agreeing to this transfer, storing, or processing. If we transfer your information + outside of the EEA in this way, we will take steps to ensure that appropriate security measures are taken with the + aim of ensuring that your privacy rights continue to be protected as outlined in this policy.

@@ -915,16 +710,12 @@

19. GENERAL DATA PROTECTION REGULATION

20. CONTACTING US

Questions about this Privacy Policy can be directed to - support@osf.io. Support is - provided in English only.
+ support@osf.io. Support is provided in English only.
This Privacy Policy was last updated on January 10, 2025.

Version history for this policy is available - here + here

diff --git a/src/app/features/project/files/file-detail/file-detail.component.html b/src/app/features/project/files/file-detail/file-detail.component.html index a800862fd..17ce84c89 100644 --- a/src/app/features/project/files/file-detail/file-detail.component.html +++ b/src/app/features/project/files/file-detail/file-detail.component.html @@ -1,10 +1,7 @@
- + Back to list of files @@ -29,8 +26,8 @@

Title

Description

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempor incididunt ut labore et dolore magna aliqua + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et + dolore magna aliqua
@@ -66,8 +63,8 @@

Contributors

Description

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempor incididunt ut labore et dolore magna aliqua + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et + dolore magna aliqua
diff --git a/src/app/features/project/files/project-files.component.html b/src/app/features/project/files/project-files.component.html index 3e05b4369..791aea45c 100644 --- a/src/app/features/project/files/project-files.component.html +++ b/src/app/features/project/files/project-files.component.html @@ -23,11 +23,7 @@
- +
@@ -55,8 +51,8 @@ @for (file of files(); track file.downloads) {
- @if (file.downloadType && file.type !== "folder") { - @if (file.downloadType === "doc") { + @if (file.downloadType && file.type !== 'folder') { + @if (file.downloadType === 'doc') { } @else { @@ -75,7 +71,7 @@ {{ file.size }}
- {{ file.modifiedAt | date: "MMM d, y hh:mm a" }} + {{ file.modifiedAt | date: 'MMM d, y hh:mm a' }}
diff --git a/src/app/features/project/files/project-files.component.ts b/src/app/features/project/files/project-files.component.ts index 6ec17d2c9..45c30c606 100644 --- a/src/app/features/project/files/project-files.component.ts +++ b/src/app/features/project/files/project-files.component.ts @@ -5,19 +5,10 @@ import { Select } from 'primeng/select'; import { TableModule } from 'primeng/table'; import { DatePipe } from '@angular/common'; -import { - ChangeDetectionStrategy, - Component, - HostBinding, - inject, - signal, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, HostBinding, inject, signal } from '@angular/core'; import { Router } from '@angular/router'; -import { - FileItem, - FILES, -} from '@osf/features/project/files/project-files.entities'; +import { FileItem, FILES } from '@osf/features/project/files/project-files.entities'; import { SearchInputComponent } from '@shared/components/search-input/search-input.component'; import { SubHeaderComponent } from '@shared/components/sub-header/sub-header.component'; diff --git a/src/app/features/project/metadata/metadata.ts b/src/app/features/project/metadata/metadata.ts index 3caf33f60..65e860187 100644 --- a/src/app/features/project/metadata/metadata.ts +++ b/src/app/features/project/metadata/metadata.ts @@ -6,27 +6,22 @@ export interface MetadataTemplate { export const metadataTemplates: MetadataTemplate[] = [ { title: 'OSF Enhanced Metadata', - description: - 'Additional metadata for OSF records, derived from the DataCite 4.4 Schema', + description: 'Additional metadata for OSF records, derived from the DataCite 4.4 Schema', }, { title: 'Human Cognitive Neuroscience Data', - description: - 'This is a template to describe human cognitive neuroscience data.', + description: 'This is a template to describe human cognitive neuroscience data.', }, { title: 'Psych-DS Official Template', - description: - 'A community standard providing a systematic way of formatting and documenting datasets', + description: 'A community standard providing a systematic way of formatting and documenting datasets', }, { title: 'mateBUS', - description: - 'A metadata template for applied psychology and organizational research
', + description: 'A metadata template for applied psychology and organizational research
', }, { title: 'LDbase Project Metadata Form ver. 2', - description: - 'The LDbase template is for projects in the fields of education, learning, and human development.', + description: 'The LDbase template is for projects in the fields of education, learning, and human development.', }, ]; diff --git a/src/app/features/project/metadata/project-metadata.component.html b/src/app/features/project/metadata/project-metadata.component.html index ea547b7c3..f19d3c730 100644 --- a/src/app/features/project/metadata/project-metadata.component.html +++ b/src/app/features/project/metadata/project-metadata.component.html @@ -5,10 +5,9 @@

Select a Metadata Template

- OSF has partnered with CEDAR to provide more ways - to annotate your research with domain or community-specific metadata - records. If you would like to request the addition of a new metadata - template, contact us at support@osf.io. + OSF has partnered with CEDAR to provide more ways to annotate your research with domain + or community-specific metadata records. If you would like to request the addition of a new metadata template, + contact us at support@osf.io.
@@ -29,12 +28,7 @@

{{ meta.title }}

- +
diff --git a/src/app/features/project/overview/project-overview.component.html b/src/app/features/project/overview/project-overview.component.html index 9d198dc7c..a88e29527 100644 --- a/src/app/features/project/overview/project-overview.component.html +++ b/src/app/features/project/overview/project-overview.component.html @@ -2,20 +2,16 @@
-
+

Wiki

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim - veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea - commodo consequat. Duis aute irure dolor in reprehenderit in voluptate - velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint - occaecat cupidatat non proident, sunt in culpa qui officia deserunt .... + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt ....
Read more @@ -35,11 +31,9 @@

Michael Pasek
- Description: Lorem ipsum dolor sit amet, consectetur adipiscing - elit, sed do eiusmod tempor incididunt ut labore et dolore magna - aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco - laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure - dolor in eprehenderit i... + Description: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in eprehenderit i...

@@ -54,11 +48,9 @@

Michael Pasek
- Description: Lorem ipsum dolor sit amet, consectetur adipiscing - elit, sed do eiusmod tempor incididunt ut labore et dolore magna - aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco - laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure - dolor in eprehenderit i... + Description: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in eprehenderit i...

@@ -76,11 +68,9 @@

Name Example

- Description: Lorem ipsum dolor sit amet, consectetur adipiscing elit, - sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut - enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi - ut aliquip ex ea commodo consequat. Duis aute irure dolor in - eprehenderit i... + Description: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. Duis aute irure dolor in eprehenderit i...
@@ -88,36 +78,27 @@

Name Example

Recent Activity

-
+
- Jeremy Wolfe removed - tag example from + Jeremy Wolfe removed tag example from Project name example
Feb 5, 2025 04:37 AM
-
+
- Jeremy Wolfe removed - tag example from + Jeremy Wolfe removed tag example from Project name example
Feb 5, 2025 04:37 AM
-
+
@@ -148,13 +129,11 @@

Contributors

Description

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad - minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. Duis aute irure dolor in - reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla - pariatur. Excepteur sint occaecat cupidatat non proident, sunt in - culpa qui officia deserunt mollit anim id est laborum. + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore + magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla + pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id + est laborum.
Read More @@ -165,10 +144,7 @@

Supplements

diff --git a/src/app/features/project/project.component.ts b/src/app/features/project/project.component.ts index 371f7a85a..882f9a017 100644 --- a/src/app/features/project/project.component.ts +++ b/src/app/features/project/project.component.ts @@ -1,10 +1,5 @@ import { CommonModule } from '@angular/common'; -import { - ChangeDetectionStrategy, - Component, - HostBinding, - inject, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, HostBinding, inject } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { RouterOutlet } from '@angular/router'; diff --git a/src/app/features/project/registrations/registration-card/registration-card.component.html b/src/app/features/project/registrations/registration-card/registration-card.component.html index 8c4c43e12..3a37e3e94 100644 --- a/src/app/features/project/registrations/registration-card/registration-card.component.html +++ b/src/app/features/project/registrations/registration-card/registration-card.component.html @@ -3,29 +3,26 @@
- @if (registrationData()?.status === "withdrawn") { + @if (registrationData()?.status === 'withdrawn') { } - @if (registrationData()?.status === "in_progress") { + @if (registrationData()?.status === 'in_progress') { }

{{ registrationData()?.title }}

- @if (registrationData()?.status === "in_progress") { + @if (registrationData()?.status === 'in_progress') { } - @if (registrationData()?.status === "withdrawn") { + @if (registrationData()?.status === 'withdrawn') { }
-
+
Registration template: @@ -50,10 +47,7 @@

{{ registrationData()?.title }}

Contributors: - @for ( - contributor of registrationData()?.contributors; - track contributor.name - ) { + @for (contributor of registrationData()?.contributors; track contributor.name) { {{ contributor.name }} @if (!$last) { , @@ -68,17 +62,9 @@

{{ registrationData()?.title }}

- @if (registrationData()?.status === "draft") { - - + @if (registrationData()?.status === 'draft') { + + {{ registrationData()?.title }} > } @else { - @if (registrationData()?.status === "in_progress") { + @if (registrationData()?.status === 'in_progress') { } }
- @if (registrationData()?.status !== "draft") { + @if (registrationData()?.status !== 'draft') {

Open Resources

diff --git a/src/app/features/project/registrations/registration-card/registration-card.component.ts b/src/app/features/project/registrations/registration-card/registration-card.component.ts index 9cdc97def..07c9e6a15 100644 --- a/src/app/features/project/registrations/registration-card/registration-card.component.ts +++ b/src/app/features/project/registrations/registration-card/registration-card.component.ts @@ -2,12 +2,7 @@ import { Button } from 'primeng/button'; import { Card } from 'primeng/card'; import { Tag } from 'primeng/tag'; -import { - ChangeDetectionStrategy, - Component, - inject, - input, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, input } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { IS_XSMALL } from '@shared/utils/breakpoints.tokens'; diff --git a/src/app/features/project/registrations/registrations.component.html b/src/app/features/project/registrations/registrations.component.html index 73ebf39d1..4d83ff2fc 100644 --- a/src/app/features/project/registrations/registrations.component.html +++ b/src/app/features/project/registrations/registrations.component.html @@ -1,11 +1,7 @@
- + @if (!isMobile()) { Drafts @@ -27,20 +23,14 @@ } - @for ( - registration of draftRegistrations; - track registration.registry - ) { + @for (registration of draftRegistrations; track registration.registry) { } - @for ( - registration of submittedRegistrations; - track registration.registry - ) { + @for (registration of submittedRegistrations; track registration.registry) { } diff --git a/src/app/features/project/registrations/registrations.component.ts b/src/app/features/project/registrations/registrations.component.ts index db7f05216..27fd89fb2 100644 --- a/src/app/features/project/registrations/registrations.component.ts +++ b/src/app/features/project/registrations/registrations.component.ts @@ -2,12 +2,7 @@ import { DialogService } from 'primeng/dynamicdialog'; import { Select } from 'primeng/select'; import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs'; -import { - ChangeDetectionStrategy, - Component, - inject, - signal, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; @@ -58,8 +53,7 @@ export class RegistrationsComponent { { name: 'Crystal Shackleford', link: '#' }, { name: 'ALLON VISHKIN', link: '#' }, ], - description: - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt', + description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt', status: 'draft', }, { @@ -73,8 +67,7 @@ export class RegistrationsComponent { { name: 'Crystal Shackleford', link: '#' }, { name: 'ALLON VISHKIN', link: '#' }, ], - description: - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt', + description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt', status: 'draft', }, ]; @@ -104,8 +97,7 @@ export class RegistrationsComponent { { name: 'Crystal Shackleford', link: '#' }, { name: 'Michael Pasek', link: '#' }, ], - description: - 'Lorem consectetur adipiscing elit, sed do eiusmod tempor incididunt.', + description: 'Lorem consectetur adipiscing elit, sed do eiusmod tempor incididunt.', status: 'withdrawn', }, ]; diff --git a/src/app/features/search/mappers/search.mapper.ts b/src/app/features/search/mappers/search.mapper.ts index 32bdbe033..ea7488c8e 100644 --- a/src/app/features/search/mappers/search.mapper.ts +++ b/src/app/features/search/mappers/search.mapper.ts @@ -6,22 +6,15 @@ import { ResourceType } from '@osf/features/search/models/resource-type.enum'; export function MapResources(rawItem: ResourceItem): Resource { return { id: rawItem['@id'], - resourceType: - ResourceType[ - rawItem?.resourceType[0]['@id'] as keyof typeof ResourceType - ], - dateCreated: rawItem?.dateCreated?.[0]?.['@value'] - ? new Date(rawItem?.dateCreated?.[0]?.['@value']) - : undefined, - dateModified: rawItem?.dateModified?.[0]?.['@value'] - ? new Date(rawItem?.dateModified?.[0]?.['@value']) - : undefined, + resourceType: ResourceType[rawItem?.resourceType[0]['@id'] as keyof typeof ResourceType], + dateCreated: rawItem?.dateCreated?.[0]?.['@value'] ? new Date(rawItem?.dateCreated?.[0]?.['@value']) : undefined, + dateModified: rawItem?.dateModified?.[0]?.['@value'] ? new Date(rawItem?.dateModified?.[0]?.['@value']) : undefined, creators: (rawItem?.creator ?? []).map( (creator) => ({ id: creator?.['@id'], name: creator?.name?.[0]?.['@value'], - }) as LinkItem, + }) as LinkItem ), fileName: rawItem?.fileName?.[0]?.['@value'], title: rawItem?.title?.[0]?.['@value'] ?? rawItem?.name?.[0]?.['@value'], diff --git a/src/app/features/search/models/raw-models/index-card-search.model.ts b/src/app/features/search/models/raw-models/index-card-search.model.ts index fcc18ad48..843d1bb97 100644 --- a/src/app/features/search/models/raw-models/index-card-search.model.ts +++ b/src/app/features/search/models/raw-models/index-card-search.model.ts @@ -1,7 +1,4 @@ -import { - ApiData, - JsonApiResponse, -} from '@core/services/json-api/json-api.entity'; +import { ApiData, JsonApiResponse } from '@core/services/json-api/json-api.entity'; import { ResourceItem } from '@osf/features/search/models/raw-models/resource-response.model'; export type IndexCardSearch = JsonApiResponse< diff --git a/src/app/features/search/search.component.html b/src/app/features/search/search.component.html index 5845440d6..a0a936c36 100644 --- a/src/app/features/search/search.component.html +++ b/src/app/features/search/search.component.html @@ -1,7 +1,4 @@ -
+
better-research
- + @if (!isMobile()) { All @@ -40,26 +33,13 @@ } - - - - - - - - + + + + + @if (!isMyProfilePage()) { - - + } @@ -71,17 +51,13 @@

Improved OSF Search

- Enter any term in the search box and filter by specific object types. - More information is available on our help guides. + Enter any term in the search box and filter by specific object types. More information is available on our + help guides.

1 of 3

- + Next
@@ -92,17 +68,13 @@

Improved OSF Search

Refine Your Search

- Narrow the source, discipline, and more. For example, find content - supported by a specific funder or view only datasets. + Narrow the source, discipline, and more. For example, find content supported by a specific funder or view only + datasets.

2 of 3

- + Next
@@ -113,8 +85,8 @@

Refine Your Search

Add Metadata

- Remember to add metadata and resources to your own work on OSF to make - it more discoverable! Learn more in our help guides. + Remember to add metadata and resources to your own work on OSF to make it more discoverable! Learn more in our + help guides.

3 of 3

diff --git a/src/app/features/search/search.component.ts b/src/app/features/search/search.component.ts index 92f541fb2..a92c1d75a 100644 --- a/src/app/features/search/search.component.ts +++ b/src/app/features/search/search.component.ts @@ -11,15 +11,7 @@ import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs'; import { debounceTime } from 'rxjs'; import { NgOptimizedImage } from '@angular/common'; -import { - ChangeDetectionStrategy, - Component, - effect, - inject, - OnDestroy, - signal, - untracked, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, effect, inject, OnDestroy, signal, untracked } from '@angular/core'; import { toObservable, toSignal } from '@angular/core/rxjs-interop'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @@ -32,10 +24,7 @@ import { SetSearchText, } from '@osf/features/search/store'; import { GetAllOptions } from '@shared/components/resources/resource-filters/filters/store/resource-filters-options.actions'; -import { - ResetFiltersState, - ResourceFiltersSelectors, -} from '@shared/components/resources/resource-filters/store'; +import { ResetFiltersState, ResourceFiltersSelectors } from '@shared/components/resources/resource-filters/store'; import { ResourcesWrapperComponent } from '@shared/components/resources/resources-wrapper/resources-wrapper.component'; import { SearchInputComponent } from '@shared/components/search-input/search-input.component'; import { IS_XSMALL } from '@shared/utils/breakpoints.tokens'; @@ -70,45 +59,19 @@ export class SearchComponent implements OnDestroy { protected searchValue = signal(''); protected readonly isMobile = toSignal(inject(IS_XSMALL)); - protected readonly creatorsFilter = this.#store.selectSignal( - ResourceFiltersSelectors.getCreator, - ); - protected readonly dateCreatedFilter = this.#store.selectSignal( - ResourceFiltersSelectors.getDateCreated, - ); - protected readonly funderFilter = this.#store.selectSignal( - ResourceFiltersSelectors.getFunder, - ); - protected readonly subjectFilter = this.#store.selectSignal( - ResourceFiltersSelectors.getSubject, - ); - protected readonly licenseFilter = this.#store.selectSignal( - ResourceFiltersSelectors.getLicense, - ); - protected readonly resourceTypeFilter = this.#store.selectSignal( - ResourceFiltersSelectors.getResourceType, - ); - protected readonly institutionFilter = this.#store.selectSignal( - ResourceFiltersSelectors.getInstitution, - ); - protected readonly providerFilter = this.#store.selectSignal( - ResourceFiltersSelectors.getProvider, - ); - protected readonly partOfCollectionFilter = this.#store.selectSignal( - ResourceFiltersSelectors.getPartOfCollection, - ); - protected searchStoreValue = this.#store.selectSignal( - SearchSelectors.getSearchText, - ); - protected resourcesTabStoreValue = this.#store.selectSignal( - SearchSelectors.getResourceTab, - ); - protected sortByStoreValue = this.#store.selectSignal( - SearchSelectors.getSortBy, - ); - readonly isMyProfilePage = this.#store.selectSignal( - SearchSelectors.getIsMyProfile, - ); + protected readonly creatorsFilter = this.#store.selectSignal(ResourceFiltersSelectors.getCreator); + protected readonly dateCreatedFilter = this.#store.selectSignal(ResourceFiltersSelectors.getDateCreated); + protected readonly funderFilter = this.#store.selectSignal(ResourceFiltersSelectors.getFunder); + protected readonly subjectFilter = this.#store.selectSignal(ResourceFiltersSelectors.getSubject); + protected readonly licenseFilter = this.#store.selectSignal(ResourceFiltersSelectors.getLicense); + protected readonly resourceTypeFilter = this.#store.selectSignal(ResourceFiltersSelectors.getResourceType); + protected readonly institutionFilter = this.#store.selectSignal(ResourceFiltersSelectors.getInstitution); + protected readonly providerFilter = this.#store.selectSignal(ResourceFiltersSelectors.getProvider); + protected readonly partOfCollectionFilter = this.#store.selectSignal(ResourceFiltersSelectors.getPartOfCollection); + protected searchStoreValue = this.#store.selectSignal(SearchSelectors.getSearchText); + protected resourcesTabStoreValue = this.#store.selectSignal(SearchSelectors.getResourceTab); + protected sortByStoreValue = this.#store.selectSignal(SearchSelectors.getSortBy); + readonly isMyProfilePage = this.#store.selectSignal(SearchSelectors.getIsMyProfile); protected selectedTab: ResourceTab = ResourceTab.All; protected readonly ResourceTab = ResourceTab; diff --git a/src/app/features/search/search.service.ts b/src/app/features/search/search.service.ts index 2104ff424..68f638ec7 100644 --- a/src/app/features/search/search.service.ts +++ b/src/app/features/search/search.service.ts @@ -19,45 +19,34 @@ export class SearchService { filters: Record, searchText: string, sortBy: string, - resourceType: string, + resourceType: string ): Observable { const params: Record = { 'cardSearchFilter[resourceType]': resourceType ?? '', 'cardSearchFilter[accessService]': 'https://staging4.osf.io/', - 'cardSearchText[*,creator.name,isContainedBy.creator.name]': - searchText ?? '', + 'cardSearchText[*,creator.name,isContainedBy.creator.name]': searchText ?? '', 'page[size]': '10', sort: sortBy, ...filters, }; - return this.#jsonApiService - .get( - `${environment.shareDomainUrl}/index-card-search`, - params, - ) - .pipe( - map((response) => { - if (response?.included) { - return { - resources: response?.included - .filter((item) => item.type === 'index-card') - .map((item) => MapResources(item.attributes.resourceMetadata)), - count: response.data.attributes.totalResultCount, - first: - response.data?.relationships?.searchResultPage?.links?.first - ?.href, - next: response.data?.relationships?.searchResultPage?.links?.next - ?.href, - previous: - response.data?.relationships?.searchResultPage?.links?.prev - ?.href, - }; - } + return this.#jsonApiService.get(`${environment.shareDomainUrl}/index-card-search`, params).pipe( + map((response) => { + if (response?.included) { + return { + resources: response?.included + .filter((item) => item.type === 'index-card') + .map((item) => MapResources(item.attributes.resourceMetadata)), + count: response.data.attributes.totalResultCount, + first: response.data?.relationships?.searchResultPage?.links?.first?.href, + next: response.data?.relationships?.searchResultPage?.links?.next?.href, + previous: response.data?.relationships?.searchResultPage?.links?.prev?.href, + }; + } - return {} as ResourcesData; - }), - ); + return {} as ResourcesData; + }) + ); } getResourcesByLink(link: string): Observable { @@ -69,18 +58,14 @@ export class SearchService { .filter((item) => item.type === 'index-card') .map((item) => MapResources(item.attributes.resourceMetadata)), count: response.data.attributes.totalResultCount, - first: - response.data?.relationships?.searchResultPage?.links?.first - ?.href, - next: response.data?.relationships?.searchResultPage?.links?.next - ?.href, - previous: - response.data?.relationships?.searchResultPage?.links?.prev?.href, + first: response.data?.relationships?.searchResultPage?.links?.first?.href, + next: response.data?.relationships?.searchResultPage?.links?.next?.href, + previous: response.data?.relationships?.searchResultPage?.links?.prev?.href, }; } return {} as ResourcesData; - }), + }) ); } } diff --git a/src/app/features/search/store/search.state.ts b/src/app/features/search/store/search.state.ts index 08086f79a..c1663c094 100644 --- a/src/app/features/search/store/search.state.ts +++ b/src/app/features/search/store/search.state.ts @@ -32,35 +32,26 @@ export class SearchState { @Action(GetResources) getResources(ctx: StateContext) { - const filters = this.store.selectSnapshot( - ResourceFiltersSelectors.getAllFilters, - ); + const filters = this.store.selectSnapshot(ResourceFiltersSelectors.getAllFilters); const filtersParams = addFiltersParams(filters); const searchText = this.store.selectSnapshot(SearchSelectors.getSearchText); const sortBy = this.store.selectSnapshot(SearchSelectors.getSortBy); - const resourceTab = this.store.selectSnapshot( - SearchSelectors.getResourceTab, - ); + const resourceTab = this.store.selectSnapshot(SearchSelectors.getResourceTab); const resourceTypes = getResourceTypes(resourceTab); - return this.searchService - .getResources(filtersParams, searchText, sortBy, resourceTypes) - .pipe( - tap((response) => { - ctx.patchState({ resources: response.resources }); - ctx.patchState({ resourcesCount: response.count }); - ctx.patchState({ first: response.first }); - ctx.patchState({ next: response.next }); - ctx.patchState({ previous: response.previous }); - }), - ); + return this.searchService.getResources(filtersParams, searchText, sortBy, resourceTypes).pipe( + tap((response) => { + ctx.patchState({ resources: response.resources }); + ctx.patchState({ resourcesCount: response.count }); + ctx.patchState({ first: response.first }); + ctx.patchState({ next: response.next }); + ctx.patchState({ previous: response.previous }); + }) + ); } @Action(GetResourcesByLink) - getResourcesByLink( - ctx: StateContext, - action: GetResourcesByLink, - ) { + getResourcesByLink(ctx: StateContext, action: GetResourcesByLink) { return this.searchService.getResourcesByLink(action.link).pipe( tap((response) => { ctx.patchState({ resources: response.resources }); @@ -68,7 +59,7 @@ export class SearchState { ctx.patchState({ first: response.first }); ctx.patchState({ next: response.next }); ctx.patchState({ previous: response.previous }); - }), + }) ); } diff --git a/src/app/features/settings/account-settings/account-settings.component.html b/src/app/features/settings/account-settings/account-settings.component.html index a07c9063d..3876b9ede 100644 --- a/src/app/features/settings/account-settings/account-settings.component.html +++ b/src/app/features/settings/account-settings/account-settings.component.html @@ -1,17 +1,12 @@ - +
@@ -99,8 +84,8 @@
@@ -167,9 +148,7 @@ aria-describedby="username-help" [formControlName]="AccountSettingsPasswordFormControls.NewPassword" /> - Enter your username to reset your password. + Enter your username to reset your password.
@@ -179,13 +158,9 @@ pInputText id="confirm-password" aria-describedby="username-help" - [formControlName]=" - AccountSettingsPasswordFormControls.ConfirmPassword - " + [formControlName]="AccountSettingsPasswordFormControls.ConfirmPassword" /> - Enter your username to reset your password. + Enter your username to reset your password.
@@ -195,8 +170,7 @@
diff --git a/src/app/features/settings/account-settings/account-settings.component.ts b/src/app/features/settings/account-settings/account-settings.component.ts index 5b53a2b00..fa895f8c6 100644 --- a/src/app/features/settings/account-settings/account-settings.component.ts +++ b/src/app/features/settings/account-settings/account-settings.component.ts @@ -21,15 +21,7 @@ import { IS_XSMALL } from '@shared/utils/breakpoints.tokens'; @Component({ selector: 'osf-account-settings', - imports: [ - Button, - Select, - RadioButton, - ReactiveFormsModule, - InputText, - Message, - SubHeaderComponent, - ], + imports: [Button, Select, RadioButton, ReactiveFormsModule, InputText, Message, SubHeaderComponent], providers: [DialogService], templateUrl: './account-settings.component.html', styleUrl: './account-settings.component.scss', @@ -50,8 +42,7 @@ export class AccountSettingsComponent { }); protected readonly optControl = new FormControl(false); protected readonly MOCK_COUNTRIES = MOCK_COUNTRIES; - protected readonly AccountSettingsPasswordFormControls = - AccountSettingsPasswordFormControls; + protected readonly AccountSettingsPasswordFormControls = AccountSettingsPasswordFormControls; private readonly dialogService = inject(DialogService); private dialogRef: DynamicDialogRef | null = null; diff --git a/src/app/features/settings/account-settings/add-email/add-email.component.html b/src/app/features/settings/account-settings/add-email/add-email.component.html index ffa64fc01..688a68d0e 100644 --- a/src/app/features/settings/account-settings/add-email/add-email.component.html +++ b/src/app/features/settings/account-settings/add-email/add-email.component.html @@ -1,32 +1,14 @@
- +
- + Cancel - - Add Email - + Add Email
diff --git a/src/app/features/settings/account-settings/add-email/add-email.component.ts b/src/app/features/settings/account-settings/add-email/add-email.component.ts index 061492f3f..4483daaf9 100644 --- a/src/app/features/settings/account-settings/add-email/add-email.component.ts +++ b/src/app/features/settings/account-settings/add-email/add-email.component.ts @@ -15,8 +15,5 @@ import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms'; export class AddEmailComponent { readonly dialogRef = inject(DynamicDialogRef); - protected readonly emailControl = new FormControl('', [ - Validators.email, - Validators.required, - ]); + protected readonly emailControl = new FormControl('', [Validators.email, Validators.required]); } diff --git a/src/app/features/settings/account-settings/deactivate-account/deactivate-account/deactivate-account.component.html b/src/app/features/settings/account-settings/deactivate-account/deactivate-account/deactivate-account.component.html index 0a7fc0f86..eb014acc5 100644 --- a/src/app/features/settings/account-settings/deactivate-account/deactivate-account/deactivate-account.component.html +++ b/src/app/features/settings/account-settings/deactivate-account/deactivate-account/deactivate-account.component.html @@ -2,17 +2,8 @@

Are you sure you want to to deactivate your account?

- - + - - Deactivate - + Deactivate
diff --git a/src/app/features/settings/addons/addon-card-list/addon-card-list.component.html b/src/app/features/settings/addons/addon-card-list/addon-card-list.component.html index 76c0f3ad7..80578f42a 100644 --- a/src/app/features/settings/addons/addon-card-list/addon-card-list.component.html +++ b/src/app/features/settings/addons/addon-card-list/addon-card-list.component.html @@ -2,11 +2,7 @@ @if (cards().length) { @for (card of cards(); track card.id) {
- +
} } diff --git a/src/app/features/settings/addons/addon-card-list/addon-card-list.component.ts b/src/app/features/settings/addons/addon-card-list/addon-card-list.component.ts index 710cd8786..fc59f9a11 100644 --- a/src/app/features/settings/addons/addon-card-list/addon-card-list.component.ts +++ b/src/app/features/settings/addons/addon-card-list/addon-card-list.component.ts @@ -1,10 +1,7 @@ import { Component, input } from '@angular/core'; import { AddonCardComponent } from '@osf/features/settings/addons/addon-card/addon-card.component'; -import { - Addon, - AuthorizedAddon, -} from '@osf/features/settings/addons/entities/addons.entities'; +import { Addon, AuthorizedAddon } from '@osf/features/settings/addons/entities/addons.entities'; @Component({ selector: 'osf-addon-card-list', diff --git a/src/app/features/settings/addons/addon-card/addon-card.component.html b/src/app/features/settings/addons/addon-card/addon-card.component.html index 8a19c2623..41bb42f55 100644 --- a/src/app/features/settings/addons/addon-card/addon-card.component.html +++ b/src/app/features/settings/addons/addon-card/addon-card.component.html @@ -1,22 +1,14 @@ -
+
@if (card()!.externalServiceName) { - Addon card image + Addon card image }

{{ card()?.displayName }}

-
+
@if (showDangerButton()) { {{ card()?.displayName }} } {{ card()?.displayName }}
- {{ "settings.addons.messages.deleteConfirmation.title" | translate }} + {{ 'settings.addons.messages.deleteConfirmation.title' | translate }} -

- {{ "settings.addons.messages.deleteConfirmation.message" | translate }} + {{ 'settings.addons.messages.deleteConfirmation.message' | translate }}

{ const addon = this.card(); if (addon) { - return addon.type === 'authorized-storage-accounts' - ? 'storage' - : 'citation'; + return addon.type === 'authorized-storage-accounts' ? 'storage' : 'citation'; } return ''; }); @@ -66,17 +61,15 @@ export class AddonCardComponent { const addonId = this.card()?.id; if (addonId) { this.isDisabling.set(true); - this.#store - .dispatch(new DeleteAuthorizedAddon(addonId, this.addonTypeString())) - .subscribe({ - complete: () => { - this.isDisabling.set(false); - this.isDialogVisible.set(false); - }, - error: () => { - this.isDisabling.set(false); - }, - }); + this.#store.dispatch(new DeleteAuthorizedAddon(addonId, this.addonTypeString())).subscribe({ + complete: () => { + this.isDisabling.set(false); + this.isDialogVisible.set(false); + }, + error: () => { + this.isDisabling.set(false); + }, + }); } } } diff --git a/src/app/features/settings/addons/addon.mapper.ts b/src/app/features/settings/addons/addon.mapper.ts index 8c6af83d7..6086b4d41 100644 --- a/src/app/features/settings/addons/addon.mapper.ts +++ b/src/app/features/settings/addons/addon.mapper.ts @@ -22,31 +22,26 @@ export class AddonMapper { static fromAuthorizedAddonResponse( response: AuthorizedAddonGetResponse, - included?: IncludedAddonData[], + included?: IncludedAddonData[] ): AuthorizedAddon { // Handle both storage and citation service relationships const externalServiceData = - response.relationships?.external_storage_service?.data || - response.relationships?.external_citation_service?.data; + response.relationships?.external_storage_service?.data || response.relationships?.external_citation_service?.data; const externalServiceId = externalServiceData?.id; // Find the matching service in the included data const matchingService = included?.find( (item) => - (item.type === 'external-storage-services' || - item.type === 'external-citation-services') && - item.id === externalServiceId, + (item.type === 'external-storage-services' || item.type === 'external-citation-services') && + item.id === externalServiceId )?.attributes; // Extract the relevant properties from the matching service - const externalServiceName = - (matchingService?.['external_service_name'] as string) || ''; + const externalServiceName = (matchingService?.['external_service_name'] as string) || ''; const displayName = (matchingService?.['display_name'] as string) || ''; - const credentialsFormat = - (matchingService?.['credentials_format'] as string) || ''; - const supportedFeatures = - (matchingService?.['supported_features'] as string[]) || []; + const credentialsFormat = (matchingService?.['credentials_format'] as string) || ''; + const supportedFeatures = (matchingService?.['supported_features'] as string[]) || []; return { type: response.type, diff --git a/src/app/features/settings/addons/addons.component.html b/src/app/features/settings/addons/addons.component.html index d21d40d76..8311510c6 100644 --- a/src/app/features/settings/addons/addons.component.html +++ b/src/app/features/settings/addons/addons.component.html @@ -1,17 +1,13 @@ - +
@if (!isMobile()) { - {{ "settings.addons.tabs.allAddons" | translate }} + {{ 'settings.addons.tabs.allAddons' | translate }} - {{ "settings.addons.tabs.connectedAddons" | translate }} + {{ 'settings.addons.tabs.connectedAddons' | translate }} } @@ -35,7 +31,7 @@ }

- {{ "settings.addons.description" | translate }} + {{ 'settings.addons.description' | translate }}

@@ -65,10 +61,7 @@
- + diff --git a/src/app/features/settings/addons/addons.component.ts b/src/app/features/settings/addons/addons.component.ts index aa17680a7..4e942cd9f 100644 --- a/src/app/features/settings/addons/addons.component.ts +++ b/src/app/features/settings/addons/addons.component.ts @@ -6,14 +6,7 @@ import { AutoCompleteModule } from 'primeng/autocomplete'; import { SelectModule } from 'primeng/select'; import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs'; -import { - ChangeDetectionStrategy, - Component, - computed, - effect, - inject, - signal, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, effect, inject, signal } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule } from '@angular/forms'; @@ -58,38 +51,19 @@ export class AddonsComponent { protected readonly defaultTabValue = 0; protected readonly isMobile = toSignal(inject(IS_XSMALL)); protected readonly searchValue = signal(''); - protected readonly selectedCategory = signal( - 'external-storage-services', - ); + protected readonly selectedCategory = signal('external-storage-services'); protected readonly selectedTab = signal(this.defaultTabValue); - protected readonly currentUser = this.#store.selectSignal( - UserSelectors.getCurrentUser, - ); - protected readonly addonsUserReference = this.#store.selectSignal( - AddonsSelectors.getAddonUserReference, - ); - protected readonly storageAddons = this.#store.selectSignal( - AddonsSelectors.getStorageAddons, - ); - protected readonly citationAddons = this.#store.selectSignal( - AddonsSelectors.getCitationAddons, - ); - protected readonly authorizedStorageAddons = this.#store.selectSignal( - AddonsSelectors.getAuthorizedStorageAddons, - ); - protected readonly authorizedCitationAddons = this.#store.selectSignal( - AddonsSelectors.getAuthorizedCitationAddons, - ); + protected readonly currentUser = this.#store.selectSignal(UserSelectors.getCurrentUser); + protected readonly addonsUserReference = this.#store.selectSignal(AddonsSelectors.getAddonUserReference); + protected readonly storageAddons = this.#store.selectSignal(AddonsSelectors.getStorageAddons); + protected readonly citationAddons = this.#store.selectSignal(AddonsSelectors.getCitationAddons); + protected readonly authorizedStorageAddons = this.#store.selectSignal(AddonsSelectors.getAuthorizedStorageAddons); + protected readonly authorizedCitationAddons = this.#store.selectSignal(AddonsSelectors.getAuthorizedCitationAddons); protected readonly allAuthorizedAddons = computed(() => { - const authorizedAddons = [ - ...this.authorizedStorageAddons(), - ...this.authorizedCitationAddons(), - ]; + const authorizedAddons = [...this.authorizedStorageAddons(), ...this.authorizedCitationAddons()]; const searchValue = this.searchValue().toLowerCase(); - return authorizedAddons.filter((card) => - card.displayName.includes(searchValue), - ); + return authorizedAddons.filter((card) => card.displayName.includes(searchValue)); }); protected readonly userReferenceId = computed(() => { @@ -97,22 +71,16 @@ export class AddonsComponent { }); protected readonly currentAction = computed(() => - this.selectedCategory() === 'external-storage-services' - ? GetStorageAddons - : GetCitationAddons, + this.selectedCategory() === 'external-storage-services' ? GetStorageAddons : GetCitationAddons ); protected readonly currentAddonsState = computed(() => - this.selectedCategory() === 'external-storage-services' - ? this.storageAddons() - : this.citationAddons(), + this.selectedCategory() === 'external-storage-services' ? this.storageAddons() : this.citationAddons() ); protected readonly filteredAddonCards = computed(() => { const searchValue = this.searchValue().toLowerCase(); - return this.currentAddonsState().filter((card) => - card.externalServiceName.includes(searchValue), - ); + return this.currentAddonsState().filter((card) => card.externalServiceName.includes(searchValue)); }); protected readonly tabOptions: SelectOption[] = [ diff --git a/src/app/features/settings/addons/addons.service.ts b/src/app/features/settings/addons/addons.service.ts index ffc6b895b..6858c1109 100644 --- a/src/app/features/settings/addons/addons.service.ts +++ b/src/app/features/settings/addons/addons.service.ts @@ -31,13 +31,11 @@ export class AddonsService { getAddons(addonType: string): Observable { return this.#jsonApiService - .get< - JsonApiResponse - >(`${environment.addonsApiUrl}/external-${addonType}-services`) + .get>(`${environment.addonsApiUrl}/external-${addonType}-services`) .pipe( map((response) => { return response.data.map((item) => AddonMapper.fromResponse(item)); - }), + }) ); } @@ -51,16 +49,11 @@ export class AddonsService { }; return this.#jsonApiService - .get< - JsonApiResponse - >(environment.addonsApiUrl + '/user-references/', params) + .get>(environment.addonsApiUrl + '/user-references/', params) .pipe(map((response) => response.data)); } - getAuthorizedAddons( - addonType: string, - referenceId: string, - ): Observable { + getAuthorizedAddons(addonType: string, referenceId: string): Observable { const params = { [`fields[external-${addonType}-services]`]: 'external_service_name', }; @@ -70,37 +63,30 @@ export class AddonsService { >(`${environment.addonsApiUrl}/user-references/${referenceId}/authorized_${addonType}_accounts/?include=external-${addonType}-service`, params) .pipe( map((response) => { - return response.data.map((item) => - AddonMapper.fromAuthorizedAddonResponse(item, response.included), - ); - }), + return response.data.map((item) => AddonMapper.fromAuthorizedAddonResponse(item, response.included)); + }) ); } - createAuthorizedAddon( - addonRequestPayload: AddonRequest, - addonType: string, - ): Observable { + createAuthorizedAddon(addonRequestPayload: AddonRequest, addonType: string): Observable { return this.#jsonApiService.post( `${environment.addonsApiUrl}/authorized-${addonType}-accounts/`, - addonRequestPayload, + addonRequestPayload ); } updateAuthorizedAddon( addonRequestPayload: AddonRequest, addonType: string, - addonId: string, + addonId: string ): Observable { return this.#jsonApiService.patch( `${environment.addonsApiUrl}/authorized-${addonType}-accounts/${addonId}/`, - addonRequestPayload, + addonRequestPayload ); } deleteAuthorizedAddon(id: string, addonType: string): Observable { - return this.#jsonApiService.delete( - `${environment.addonsApiUrl}/authorized-${addonType}-accounts/${id}/`, - ); + return this.#jsonApiService.delete(`${environment.addonsApiUrl}/authorized-${addonType}-accounts/${id}/`); } } diff --git a/src/app/features/settings/addons/connect-addon/connect-addon.component.html b/src/app/features/settings/addons/connect-addon/connect-addon.component.html index 88eed5dd6..cbfdb4603 100644 --- a/src/app/features/settings/addons/connect-addon/connect-addon.component.html +++ b/src/app/features/settings/addons/connect-addon/connect-addon.component.html @@ -1,7 +1,4 @@ - +
@@ -10,21 +7,17 @@

{{ addon()?.providerName }} - {{ "settings.addons.connectAddon.terms" | translate }} + {{ 'settings.addons.connectAddon.terms' | translate }}

- {{ - "settings.addons.connectAddon.table.function" | translate - }} + {{ 'settings.addons.connectAddon.table.function' | translate }} - {{ - "settings.addons.connectAddon.table.status" | translate - }} + {{ 'settings.addons.connectAddon.table.status' | translate }} @@ -44,14 +37,10 @@

- {{ - "settings.addons.connectAddon.termsDescription" | translate - }} + {{ 'settings.addons.connectAddon.termsDescription' | translate }}

- {{ - "settings.addons.connectAddon.storageDescription" | translate - }} + {{ 'settings.addons.connectAddon.storageDescription' | translate }}

@@ -74,163 +63,109 @@

-
+

{{ isAuthorized() - ? ("settings.addons.connectAddon.reconnectAccount" - | translate) - : ("settings.addons.connectAddon.setupNewAccount" | translate) + ? ('settings.addons.connectAddon.reconnectAccount' | translate) + : ('settings.addons.connectAddon.setupNewAccount' | translate) }}

- @if ( - addon()?.credentialsFormat === - credentialsFormat.ACCESS_SECRET_KEYS - ) { + @if (addon()?.credentialsFormat === credentialsFormat.ACCESS_SECRET_KEYS) {

- {{ "settings.addons.form.fields.accessKey" | translate }} + {{ 'settings.addons.form.fields.accessKey' | translate }}

- {{ "settings.addons.form.fields.secretKey" | translate }} + {{ 'settings.addons.form.fields.secretKey' | translate }}

} - @if ( - addon()?.credentialsFormat === - credentialsFormat.DATAVERSE_API_TOKEN - ) { + @if (addon()?.credentialsFormat === credentialsFormat.DATAVERSE_API_TOKEN) {

- {{ "settings.addons.form.fields.hostUrl" | translate }} + {{ 'settings.addons.form.fields.hostUrl' | translate }}

- {{ - "settings.addons.form.fields.hostUrlDescription" | translate - }} + {{ 'settings.addons.form.fields.hostUrlDescription' | translate }}

- +

- {{ - "settings.addons.form.fields.personalAccessToken" - | translate - }} + {{ 'settings.addons.form.fields.personalAccessToken' | translate }}

} - @if ( - addon()?.credentialsFormat === - credentialsFormat.USERNAME_PASSWORD - ) { + @if (addon()?.credentialsFormat === credentialsFormat.USERNAME_PASSWORD) {

- {{ "settings.addons.form.fields.hostUrl" | translate }} + {{ 'settings.addons.form.fields.hostUrl' | translate }}

- {{ - "settings.addons.form.fields.hostUrlDescription" | translate - }} + {{ 'settings.addons.form.fields.hostUrlDescription' | translate }}

- +

- {{ "settings.addons.form.fields.username" | translate }} + {{ 'settings.addons.form.fields.username' | translate }}

- {{ "settings.addons.form.fields.password" | translate }} + {{ 'settings.addons.form.fields.password' | translate }}

- {{ - "settings.addons.form.fields.passwordDescription" - | translate - }} + {{ 'settings.addons.form.fields.passwordDescription' | translate }}

- +
} - @if ( - addon()?.credentialsFormat === credentialsFormat.REPO_TOKEN - ) { + @if (addon()?.credentialsFormat === credentialsFormat.REPO_TOKEN) {

- {{ "settings.addons.form.fields.accessKey" | translate }} + {{ 'settings.addons.form.fields.accessKey' | translate }}

- {{ "settings.addons.form.fields.secretKey" | translate }} + {{ 'settings.addons.form.fields.secretKey' | translate }}

}

- {{ "settings.addons.form.fields.accountName" | translate }} + {{ 'settings.addons.form.fields.accountName' | translate }}

- {{ - "settings.addons.form.fields.accountNameDescription" - | translate - }} + {{ 'settings.addons.form.fields.accountNameDescription' | translate }}

@@ -249,11 +184,7 @@

class="w-10rem btn-full-width" [label]="'settings.addons.form.buttons.authorize' | translate" type="submit" - [disabled]=" - !addonForm.valid || - !this.userReference().length || - isConnecting() - " + [disabled]="!addonForm.valid || !this.userReference().length || isConnecting()" > } @else { [label]="'settings.addons.form.buttons.reconnect' | translate" [link]="true" (onClick)="handleConnectStorageAddon()" - [disabled]=" - !addonForm.valid || - !this.userReference().length || - isConnecting() - " + [disabled]="!addonForm.valid || !this.userReference().length || isConnecting()" > }

@@ -286,7 +213,7 @@

- {{ "settings.addons.connectAddon.setupNewAccount" | translate }} + {{ 'settings.addons.connectAddon.setupNewAccount' | translate }}

- {{ "settings.addons.connectAddon.oauthDescription" | translate }} + {{ 'settings.addons.connectAddon.oauthDescription' | translate }}

- - {{ "settings.addons.connectAddon.startOauth" | translate }} + + {{ 'settings.addons.connectAddon.startOauth' | translate }}
diff --git a/src/app/features/settings/addons/connect-addon/connect-addon.component.ts b/src/app/features/settings/addons/connect-addon/connect-addon.component.ts index bced3de4a..31954e60a 100644 --- a/src/app/features/settings/addons/connect-addon/connect-addon.component.ts +++ b/src/app/features/settings/addons/connect-addon/connect-addon.component.ts @@ -10,39 +10,15 @@ import { StepPanel, StepPanels, Stepper } from 'primeng/stepper'; import { TableModule } from 'primeng/table'; import { NgClass } from '@angular/common'; -import { - Component, - computed, - effect, - inject, - signal, - viewChild, -} from '@angular/core'; -import { - FormBuilder, - FormGroup, - FormsModule, - ReactiveFormsModule, - Validators, -} from '@angular/forms'; +import { Component, computed, effect, inject, signal, viewChild } from '@angular/core'; +import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms'; import { Router, RouterLink } from '@angular/router'; -import { - AddonForm, - AddonFormControls, -} from '@osf/features/settings/addons/entities/addon-form.entities'; +import { AddonForm, AddonFormControls } from '@osf/features/settings/addons/entities/addon-form.entities'; import { AddonTerm } from '@osf/features/settings/addons/entities/addon-terms.interface'; -import { - Addon, - AddonRequest, - AuthorizedAddon, -} from '@osf/features/settings/addons/entities/addons.entities'; +import { Addon, AddonRequest, AuthorizedAddon } from '@osf/features/settings/addons/entities/addons.entities'; import { CredentialsFormat } from '@osf/features/settings/addons/entities/credentials-format.enum'; -import { - AddonsSelectors, - CreateAuthorizedAddon, - UpdateAuthorizedAddon, -} from '@osf/features/settings/addons/store'; +import { AddonsSelectors, CreateAuthorizedAddon, UpdateAuthorizedAddon } from '@osf/features/settings/addons/store'; import { SubHeaderComponent } from '@shared/components/sub-header/sub-header.component'; import { ADDON_TERMS as addonTerms } from '../utils/addon-terms.const'; @@ -87,21 +63,14 @@ export class ConnectAddonComponent { protected readonly addon = signal(null); protected readonly addonAuthUrl = signal('/settings/addons'); protected readonly formControls = AddonFormControls; - protected readonly userReference = this.#store.selectSignal( - AddonsSelectors.getAddonUserReference, - ); - protected createdAddon = this.#store.selectSignal( - AddonsSelectors.getCreatedOrUpdatedStorageAddon, - ); + protected readonly userReference = this.#store.selectSignal(AddonsSelectors.getAddonUserReference); + protected createdAddon = this.#store.selectSignal(AddonsSelectors.getCreatedOrUpdatedStorageAddon); protected readonly isConnecting = signal(false); protected isAuthorized = computed(() => { //check if the addon is already authorized const addon = this.addon(); if (addon) { - return ( - addon.type === 'authorized-storage-accounts' || - addon.type === 'authorized-citation-accounts' - ); + return addon.type === 'authorized-storage-accounts' || addon.type === 'authorized-citation-accounts'; } return false; }); @@ -109,8 +78,7 @@ export class ConnectAddonComponent { //get the addon type string based on the addon type property const addon = this.addon(); if (addon) { - return addon.type === 'external-storage-services' || - addon.type === 'authorized-storage-accounts' + return addon.type === 'external-storage-services' || addon.type === 'authorized-storage-accounts' ? 'storage' : 'citation'; } @@ -147,11 +115,7 @@ export class ConnectAddonComponent { .dispatch( !this.isAuthorized() ? new CreateAuthorizedAddon(request, this.addonTypeString()) - : new UpdateAuthorizedAddon( - request, - this.addonTypeString(), - this.addon()!.id, - ), + : new UpdateAuthorizedAddon(request, this.addonTypeString(), this.addon()!.id) ) .subscribe({ complete: () => { @@ -174,54 +138,26 @@ export class ConnectAddonComponent { if (addon) { const formControls: Partial = { - [AddonFormControls.AccountName]: this.#fb.control( - addon.displayName || '', - Validators.required, - ), + [AddonFormControls.AccountName]: this.#fb.control(addon.displayName || '', Validators.required), }; switch (addon.credentialsFormat) { case CredentialsFormat.ACCESS_SECRET_KEYS: - formControls[AddonFormControls.AccessKey] = this.#fb.control( - '', - Validators.required, - ); - formControls[AddonFormControls.SecretKey] = this.#fb.control( - '', - Validators.required, - ); + formControls[AddonFormControls.AccessKey] = this.#fb.control('', Validators.required); + formControls[AddonFormControls.SecretKey] = this.#fb.control('', Validators.required); break; case CredentialsFormat.DATAVERSE_API_TOKEN: - formControls[AddonFormControls.HostUrl] = this.#fb.control( - '', - Validators.required, - ); - formControls[AddonFormControls.PersonalAccessToken] = - this.#fb.control('', Validators.required); + formControls[AddonFormControls.HostUrl] = this.#fb.control('', Validators.required); + formControls[AddonFormControls.PersonalAccessToken] = this.#fb.control('', Validators.required); break; case CredentialsFormat.USERNAME_PASSWORD: - formControls[AddonFormControls.HostUrl] = this.#fb.control( - '', - Validators.required, - ); - formControls[AddonFormControls.Username] = this.#fb.control( - '', - Validators.required, - ); - formControls[AddonFormControls.Password] = this.#fb.control( - '', - Validators.required, - ); + formControls[AddonFormControls.HostUrl] = this.#fb.control('', Validators.required); + formControls[AddonFormControls.Username] = this.#fb.control('', Validators.required); + formControls[AddonFormControls.Password] = this.#fb.control('', Validators.required); break; case CredentialsFormat.REPO_TOKEN: - formControls[AddonFormControls.AccessKey] = this.#fb.control( - '', - Validators.required, - ); - formControls[AddonFormControls.SecretKey] = this.#fb.control( - '', - Validators.required, - ); + formControls[AddonFormControls.AccessKey] = this.#fb.control('', Validators.required); + formControls[AddonFormControls.SecretKey] = this.#fb.control('', Validators.required); break; } return this.#fb.group(formControls as AddonForm); @@ -235,8 +171,7 @@ export class ConnectAddonComponent { const addon = this.addon()!; const credentials: Record = {}; const initiateOAuth = - addon.credentialsFormat === CredentialsFormat.OAUTH2 || - addon.credentialsFormat === CredentialsFormat.OAUTH; + addon.credentialsFormat === CredentialsFormat.OAUTH2 || addon.credentialsFormat === CredentialsFormat.OAUTH; switch (addon.credentialsFormat) { case CredentialsFormat.ACCESS_SECRET_KEYS: @@ -244,8 +179,7 @@ export class ConnectAddonComponent { credentials['secret_key'] = formValue[AddonFormControls.SecretKey]; break; case CredentialsFormat.DATAVERSE_API_TOKEN: - credentials['personal_access_token'] = - formValue[AddonFormControls.PersonalAccessToken]; + credentials['personal_access_token'] = formValue[AddonFormControls.PersonalAccessToken]; break; case CredentialsFormat.USERNAME_PASSWORD: credentials['username'] = formValue[AddonFormControls.Username]; @@ -290,18 +224,14 @@ export class ConnectAddonComponent { [`external_${this.addonTypeString()}_service`]: { data: { type: `external-${this.addonTypeString()}-services`, - id: this.isAuthorized() - ? (addon as AuthorizedAddon).externalStorageServiceId - : (addon as Addon).id, //check if addon is already authorized and set relationship ID accordingly + id: this.isAuthorized() ? (addon as AuthorizedAddon).externalStorageServiceId : (addon as Addon).id, //check if addon is already authorized and set relationship ID accordingly }, }, }; } #getTerms(): AddonTerm[] { - const addon = this.#router.getCurrentNavigation()?.extras.state?.[ - 'addon' - ] as Addon | AuthorizedAddon; + const addon = this.#router.getCurrentNavigation()?.extras.state?.['addon'] as Addon | AuthorizedAddon; if (!addon) { this.#router.navigate(['/settings/addons']); } @@ -311,16 +241,12 @@ export class ConnectAddonComponent { const provider = addon.providerName; const isCitationService = addon.type === 'external-citation-services'; - const relevantTerms = isCitationService - ? addonTerms.filter((term) => term.citation) - : addonTerms; + const relevantTerms = isCitationService ? addonTerms.filter((term) => term.citation) : addonTerms; return relevantTerms.map((term) => { const feature = term.supportedFeature; const hasFeature = supportedFeatures.includes(feature); - const hasPartialFeature = supportedFeatures.includes( - `${feature}_PARTIAL`, - ); + const hasPartialFeature = supportedFeatures.includes(`${feature}_PARTIAL`); let message: string; let type: 'warning' | 'info' | 'danger'; diff --git a/src/app/features/settings/addons/store/addons.actions.ts b/src/app/features/settings/addons/store/addons.actions.ts index 6cb8d4a41..999a18004 100644 --- a/src/app/features/settings/addons/store/addons.actions.ts +++ b/src/app/features/settings/addons/store/addons.actions.ts @@ -25,7 +25,7 @@ export class CreateAuthorizedAddon { constructor( public payload: AddonRequest, - public addonType: string, + public addonType: string ) {} } @@ -35,7 +35,7 @@ export class UpdateAuthorizedAddon { constructor( public payload: AddonRequest, public addonType: string, - public addonId: string, + public addonId: string ) {} } @@ -48,6 +48,6 @@ export class DeleteAuthorizedAddon { constructor( public payload: string, - public addonType: string, + public addonType: string ) {} } diff --git a/src/app/features/settings/addons/store/addons.state.ts b/src/app/features/settings/addons/store/addons.state.ts index 4424ba867..dec02f371 100644 --- a/src/app/features/settings/addons/store/addons.state.ts +++ b/src/app/features/settings/addons/store/addons.state.ts @@ -39,7 +39,7 @@ export class AddonsState { return this.addonsService.getAddons('storage').pipe( tap((addons) => { ctx.patchState({ storageAddons: addons }); - }), + }) ); } @@ -48,72 +48,52 @@ export class AddonsState { return this.addonsService.getAddons('citation').pipe( tap((addons) => { ctx.patchState({ citationAddons: addons }); - }), + }) ); } @Action(GetAuthorizedStorageAddons) - getAuthorizedStorageAddons( - ctx: StateContext, - action: GetAuthorizedStorageAddons, - ) { - return this.addonsService - .getAuthorizedAddons('storage', action.referenceId) - .pipe( - tap((addons) => { - ctx.patchState({ authorizedStorageAddons: addons }); - }), - ); + getAuthorizedStorageAddons(ctx: StateContext, action: GetAuthorizedStorageAddons) { + return this.addonsService.getAuthorizedAddons('storage', action.referenceId).pipe( + tap((addons) => { + ctx.patchState({ authorizedStorageAddons: addons }); + }) + ); } @Action(GetAuthorizedCitationAddons) - getAuthorizedCitationAddons( - ctx: StateContext, - action: GetAuthorizedCitationAddons, - ) { - return this.addonsService - .getAuthorizedAddons('citation', action.referenceId) - .pipe( - tap((addons) => { - ctx.patchState({ authorizedCitationAddons: addons }); - }), - ); + getAuthorizedCitationAddons(ctx: StateContext, action: GetAuthorizedCitationAddons) { + return this.addonsService.getAuthorizedAddons('citation', action.referenceId).pipe( + tap((addons) => { + ctx.patchState({ authorizedCitationAddons: addons }); + }) + ); } @Action(CreateAuthorizedAddon) - createAuthorizedAddon( - ctx: StateContext, - action: CreateAuthorizedAddon, - ): Observable { - return this.addonsService - .createAuthorizedAddon(action.payload, action.addonType) - .pipe( - tap((addon) => { - ctx.patchState({ createdUpdatedAuthorizedAddon: addon }); - const referenceId = ctx.getState().addonsUserReference[0].id; - return action.addonType === 'storage' - ? ctx.dispatch(new GetAuthorizedStorageAddons(referenceId)) - : ctx.dispatch(new GetAuthorizedCitationAddons(referenceId)); - }), - ); + createAuthorizedAddon(ctx: StateContext, action: CreateAuthorizedAddon): Observable { + return this.addonsService.createAuthorizedAddon(action.payload, action.addonType).pipe( + tap((addon) => { + ctx.patchState({ createdUpdatedAuthorizedAddon: addon }); + const referenceId = ctx.getState().addonsUserReference[0].id; + return action.addonType === 'storage' + ? ctx.dispatch(new GetAuthorizedStorageAddons(referenceId)) + : ctx.dispatch(new GetAuthorizedCitationAddons(referenceId)); + }) + ); } @Action(UpdateAuthorizedAddon) - updateAuthorizedAddon( - ctx: StateContext, - action: UpdateAuthorizedAddon, - ): Observable { - return this.addonsService - .updateAuthorizedAddon(action.payload, action.addonType, action.addonId) - .pipe( - tap((addon) => { - ctx.patchState({ createdUpdatedAuthorizedAddon: addon }); - const referenceId = ctx.getState().addonsUserReference[0].id; - return action.addonType === 'storage' - ? ctx.dispatch(new GetAuthorizedStorageAddons(referenceId)) - : ctx.dispatch(new GetAuthorizedCitationAddons(referenceId)); - }), - ); + updateAuthorizedAddon(ctx: StateContext, action: UpdateAuthorizedAddon): Observable { + return this.addonsService.updateAuthorizedAddon(action.payload, action.addonType, action.addonId).pipe( + tap((addon) => { + ctx.patchState({ createdUpdatedAuthorizedAddon: addon }); + const referenceId = ctx.getState().addonsUserReference[0].id; + return action.addonType === 'storage' + ? ctx.dispatch(new GetAuthorizedStorageAddons(referenceId)) + : ctx.dispatch(new GetAuthorizedCitationAddons(referenceId)); + }) + ); } @Action(GetAddonsUserReference) @@ -121,24 +101,19 @@ export class AddonsState { return this.addonsService.getAddonsUserReference().pipe( tap((userReference) => { ctx.patchState({ addonsUserReference: userReference }); - }), + }) ); } @Action(DeleteAuthorizedAddon) - deleteAuthorizedAddon( - ctx: StateContext, - action: DeleteAuthorizedAddon, - ) { - return this.addonsService - .deleteAuthorizedAddon(action.payload, action.addonType) - .pipe( - switchMap(() => { - const referenceId = ctx.getState().addonsUserReference[0].id; - return action.addonType === 'storage' - ? ctx.dispatch(new GetAuthorizedStorageAddons(referenceId)) - : ctx.dispatch(new GetAuthorizedCitationAddons(referenceId)); - }), - ); + deleteAuthorizedAddon(ctx: StateContext, action: DeleteAuthorizedAddon) { + return this.addonsService.deleteAuthorizedAddon(action.payload, action.addonType).pipe( + switchMap(() => { + const referenceId = ctx.getState().addonsUserReference[0].id; + return action.addonType === 'storage' + ? ctx.dispatch(new GetAuthorizedStorageAddons(referenceId)) + : ctx.dispatch(new GetAuthorizedCitationAddons(referenceId)); + }) + ); } } diff --git a/src/app/features/settings/addons/utils/addon-terms.const.ts b/src/app/features/settings/addons/utils/addon-terms.const.ts index df1b9139e..ac16a705f 100644 --- a/src/app/features/settings/addons/utils/addon-terms.const.ts +++ b/src/app/features/settings/addons/utils/addon-terms.const.ts @@ -45,8 +45,7 @@ export const ADDON_TERMS: Term[] = [ supportedFeature: 'LOGS', storage: { true: 'OSF tracks changes you make to your {provider} content within OSF, but not changes made directly within {provider}.', - false: - 'OSF does not keep track of changes made using {provider} directly.', + false: 'OSF does not keep track of changes made using {provider} directly.', }, }, { @@ -77,8 +76,7 @@ export const ADDON_TERMS: Term[] = [ supportedFeature: 'FILE_VERSIONS', storage: { true: '{provider} files and their versions can be viewed/downloaded in OSF.', - false: - '{provider} files can be viewed/downloaded in OSF, but version history is not supported.', + false: '{provider} files can be viewed/downloaded in OSF, but version history is not supported.', }, }, ]; diff --git a/src/app/features/settings/developer-apps/developer-app-add-edit-form/developer-app-add-edit-form.component.html b/src/app/features/settings/developer-apps/developer-app-add-edit-form/developer-app-add-edit-form.component.html index 01855c30c..cb939f07e 100644 --- a/src/app/features/settings/developer-apps/developer-app-add-edit-form/developer-app-add-edit-form.component.html +++ b/src/app/features/settings/developer-apps/developer-app-add-edit-form/developer-app-add-edit-form.component.html @@ -1,11 +1,7 @@ - +
- control.markAsDirty(), - ); + Object.values(this.appForm.controls).forEach((control) => control.markAsDirty()); return; } @@ -104,7 +81,7 @@ export class DeveloperAppAddEditFormComponent implements OnInit { .dispatch( new CreateDeveloperApp({ ...this.appForm.value, - } as DeveloperAppCreateUpdate), + } as DeveloperAppCreateUpdate) ) .subscribe({ complete: () => { @@ -117,7 +94,7 @@ export class DeveloperAppAddEditFormComponent implements OnInit { new UpdateDeveloperApp(this.initialValues()!.clientId, { ...this.appForm.value, id: this.initialValues()!.id, - } as DeveloperAppCreateUpdate), + } as DeveloperAppCreateUpdate) ) .subscribe({ complete: () => { diff --git a/src/app/features/settings/developer-apps/developer-app-details/developer-app-details.component.html b/src/app/features/settings/developer-apps/developer-app-details/developer-app-details.component.html index 0eea8ad77..c771b81a8 100644 --- a/src/app/features/settings/developer-apps/developer-app-details/developer-app-details.component.html +++ b/src/app/features/settings/developer-apps/developer-app-details/developer-app-details.component.html @@ -2,7 +2,7 @@ @@ -21,28 +21,20 @@

{{ developerApp()?.name }}

- {{ "settings.developerApps.details.clientId.title" | translate }} + {{ 'settings.developerApps.details.clientId.title' | translate }}

- {{ - "settings.developerApps.details.clientId.description" | translate - }} + {{ 'settings.developerApps.details.clientId.description' | translate }}

- - {{ "settings.developerApps.messages.copied" | translate }} + + {{ 'settings.developerApps.messages.copied' | translate }} - + @@ -53,36 +45,20 @@

- {{ - "settings.developerApps.details.clientSecret.title" | translate - }} + {{ 'settings.developerApps.details.clientSecret.title' | translate }}

- {{ - "settings.developerApps.details.clientSecret.description" - | translate - }} + {{ 'settings.developerApps.details.clientSecret.description' | translate }}

- - {{ "settings.developerApps.messages.copied" | translate }} + + {{ 'settings.developerApps.messages.copied' | translate }} - +
@@ -120,11 +91,8 @@

-

{{ "settings.developerApps.form.editTitle" | translate }}

- +

{{ 'settings.developerApps.form.editTitle' | translate }}

+

diff --git a/src/app/features/settings/developer-apps/developer-app-details/developer-app-details.component.ts b/src/app/features/settings/developer-apps/developer-app-details/developer-app-details.component.ts index a9c0fea9c..1185dd183 100644 --- a/src/app/features/settings/developer-apps/developer-app-details/developer-app-details.component.ts +++ b/src/app/features/settings/developer-apps/developer-app-details/developer-app-details.component.ts @@ -13,14 +13,7 @@ import { InputText } from 'primeng/inputtext'; import { map, of, switchMap, timer } from 'rxjs'; import { CdkCopyToClipboard } from '@angular/cdk/clipboard'; -import { - ChangeDetectionStrategy, - Component, - computed, - DestroyRef, - inject, - signal, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, DestroyRef, inject, signal } from '@angular/core'; import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; @@ -69,62 +62,46 @@ export class DeveloperAppDetailsComponent { this.#activatedRoute.params.pipe( map((params) => params['id']), switchMap((clientId) => { - const app = this.#store.selectSnapshot( - DeveloperAppsSelectors.getDeveloperAppDetails, - )(clientId); + const app = this.#store.selectSnapshot(DeveloperAppsSelectors.getDeveloperAppDetails)(clientId); if (!app) { this.#store.dispatch(new GetDeveloperAppDetails(clientId)); } return of(clientId); - }), - ), + }) + ) ); readonly developerApp = computed(() => { const id = this.clientId(); if (!id) return null; - const app = this.#store.selectSignal( - DeveloperAppsSelectors.getDeveloperAppDetails, - )(); + const app = this.#store.selectSignal(DeveloperAppsSelectors.getDeveloperAppDetails)(); return app(id) ?? null; }); protected readonly isClientSecretVisible = signal(false); - protected readonly clientSecret = computed( - () => this.developerApp()?.clientSecret ?? '', - ); - protected readonly hiddenClientSecret = computed(() => - '*'.repeat(this.clientSecret().length), - ); - protected readonly clientSecretCopiedNotificationVisible = - signal(false); + protected readonly clientSecret = computed(() => this.developerApp()?.clientSecret ?? ''); + protected readonly hiddenClientSecret = computed(() => '*'.repeat(this.clientSecret().length)); + protected readonly clientSecretCopiedNotificationVisible = signal(false); protected readonly clientIdCopiedNotificationVisible = signal(false); deleteApp(): void { this.#confirmationService.confirm({ ...defaultConfirmationConfig, - message: this.#translateService.instant( - 'settings.developerApps.confirmation.delete.message', - ), - header: this.#translateService.instant( - 'settings.developerApps.confirmation.delete.title', - { name: this.developerApp()?.name }, - ), + message: this.#translateService.instant('settings.developerApps.confirmation.delete.message'), + header: this.#translateService.instant('settings.developerApps.confirmation.delete.title', { + name: this.developerApp()?.name, + }), acceptButtonProps: { ...defaultConfirmationConfig.acceptButtonProps, severity: 'danger', - label: this.#translateService.instant( - 'settings.developerApps.list.deleteButton', - ), + label: this.#translateService.instant('settings.developerApps.list.deleteButton'), }, accept: () => { - this.#store - .dispatch(new DeleteDeveloperApp(this.clientId())) - .subscribe({ - complete: () => { - this.#router.navigate(['settings/developer-apps']); - }, - }); + this.#store.dispatch(new DeleteDeveloperApp(this.clientId())).subscribe({ + complete: () => { + this.#router.navigate(['settings/developer-apps']); + }, + }); }, }); } @@ -132,18 +109,12 @@ export class DeveloperAppDetailsComponent { resetClientSecret(): void { this.#confirmationService.confirm({ ...defaultConfirmationConfig, - message: this.#translateService.instant( - 'settings.developerApps.confirmation.resetSecret.message', - ), - header: this.#translateService.instant( - 'settings.developerApps.confirmation.resetSecret.title', - ), + message: this.#translateService.instant('settings.developerApps.confirmation.resetSecret.message'), + header: this.#translateService.instant('settings.developerApps.confirmation.resetSecret.title'), acceptButtonProps: { ...defaultConfirmationConfig.acceptButtonProps, severity: 'danger', - label: this.#translateService.instant( - 'settings.developerApps.details.clientSecret.reset', - ), + label: this.#translateService.instant('settings.developerApps.details.clientSecret.reset'), }, accept: () => { this.#store.dispatch(new ResetClientSecret(this.clientId())); diff --git a/src/app/features/settings/developer-apps/developer-app.mapper.ts b/src/app/features/settings/developer-apps/developer-app.mapper.ts index bdd607772..ffc8c403d 100644 --- a/src/app/features/settings/developer-apps/developer-app.mapper.ts +++ b/src/app/features/settings/developer-apps/developer-app.mapper.ts @@ -7,9 +7,7 @@ import { } from '@osf/features/settings/developer-apps/entities/developer-apps.models'; export class DeveloperAppMapper { - static toCreateRequest( - developerCreate: DeveloperAppCreateUpdate, - ): DeveloperAppCreateRequest { + static toCreateRequest(developerCreate: DeveloperAppCreateUpdate): DeveloperAppCreateRequest { return { data: { attributes: { @@ -23,9 +21,7 @@ export class DeveloperAppMapper { }; } - static toUpdateRequest( - developerUpdate: DeveloperAppCreateUpdate, - ): DeveloperAppUpdateRequest { + static toUpdateRequest(developerUpdate: DeveloperAppCreateUpdate): DeveloperAppUpdateRequest { return { data: { id: developerUpdate.id!, diff --git a/src/app/features/settings/developer-apps/developer-apps-container.component.ts b/src/app/features/settings/developer-apps/developer-apps-container.component.ts index 018b053c5..24e95f444 100644 --- a/src/app/features/settings/developer-apps/developer-apps-container.component.ts +++ b/src/app/features/settings/developer-apps/developer-apps-container.component.ts @@ -28,10 +28,8 @@ export class DeveloperAppsContainerComponent { #translateService = inject(TranslateService); protected readonly isBaseRoute = toSignal( - this.#router.events.pipe( - map(() => this.#router.url === '/settings/developer-apps'), - ), - { initialValue: this.#router.url === '/settings/developer-apps' }, + this.#router.events.pipe(map(() => this.#router.url === '/settings/developer-apps')), + { initialValue: this.#router.url === '/settings/developer-apps' } ); createDeveloperApp(): void { @@ -45,9 +43,7 @@ export class DeveloperAppsContainerComponent { this.#dialogService.open(DeveloperAppAddEditFormComponent, { width: dialogWidth, focusOnShow: false, - header: this.#translateService.instant( - 'settings.developerApps.form.createTitle', - ), + header: this.#translateService.instant('settings.developerApps.form.createTitle'), closeOnEscape: true, modal: true, closable: true, diff --git a/src/app/features/settings/developer-apps/developer-apps-list/developer-apps-list.component.html b/src/app/features/settings/developer-apps/developer-apps-list/developer-apps-list.component.html index 2cf779ada..4d43c8cd8 100644 --- a/src/app/features/settings/developer-apps/developer-apps-list/developer-apps-list.component.html +++ b/src/app/features/settings/developer-apps/developer-apps-list/developer-apps-list.component.html @@ -1,6 +1,6 @@

- {{ "settings.developerApps.list.description" | translate }} + {{ 'settings.developerApps.list.description' | translate }}

diff --git a/src/app/features/settings/developer-apps/developer-apps-list/developer-apps-list.component.ts b/src/app/features/settings/developer-apps/developer-apps-list/developer-apps-list.component.ts index bc76e9aef..551d23154 100644 --- a/src/app/features/settings/developer-apps/developer-apps-list/developer-apps-list.component.ts +++ b/src/app/features/settings/developer-apps/developer-apps-list/developer-apps-list.component.ts @@ -7,13 +7,7 @@ import { Button } from 'primeng/button'; import { Card } from 'primeng/card'; import { Skeleton } from 'primeng/skeleton'; -import { - ChangeDetectionStrategy, - Component, - inject, - OnInit, - signal, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, OnInit, signal } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { RouterLink } from '@angular/router'; @@ -40,26 +34,19 @@ export class DeveloperAppsListComponent implements OnInit { protected readonly isLoading = signal(false); protected readonly isXSmall = toSignal(inject(IS_XSMALL)); - readonly developerApplications = this.#store.selectSignal( - DeveloperAppsSelectors.getDeveloperApps, - ); + readonly developerApplications = this.#store.selectSignal(DeveloperAppsSelectors.getDeveloperApps); deleteApp(developerApp: DeveloperApp): void { this.#confirmationService.confirm({ ...defaultConfirmationConfig, - message: this.#translateService.instant( - 'settings.developerApps.confirmation.delete.message', - ), - header: this.#translateService.instant( - 'settings.developerApps.confirmation.delete.title', - { name: developerApp.name }, - ), + message: this.#translateService.instant('settings.developerApps.confirmation.delete.message'), + header: this.#translateService.instant('settings.developerApps.confirmation.delete.title', { + name: developerApp.name, + }), acceptButtonProps: { ...defaultConfirmationConfig.acceptButtonProps, severity: 'danger', - label: this.#translateService.instant( - 'settings.developerApps.list.deleteButton', - ), + label: this.#translateService.instant('settings.developerApps.list.deleteButton'), }, accept: () => { this.#store.dispatch(new DeleteDeveloperApp(developerApp.clientId)); diff --git a/src/app/features/settings/developer-apps/developer-apps.route.ts b/src/app/features/settings/developer-apps/developer-apps.route.ts index b3e8f176f..bfc9a358a 100644 --- a/src/app/features/settings/developer-apps/developer-apps.route.ts +++ b/src/app/features/settings/developer-apps/developer-apps.route.ts @@ -9,16 +9,12 @@ export const developerAppsRoute: Route = { { path: '', loadComponent: () => - import('./developer-apps-list/developer-apps-list.component').then( - (c) => c.DeveloperAppsListComponent, - ), + import('./developer-apps-list/developer-apps-list.component').then((c) => c.DeveloperAppsListComponent), }, { path: ':id/details', loadComponent: () => - import('./developer-app-details/developer-app-details.component').then( - (c) => c.DeveloperAppDetailsComponent, - ), + import('./developer-app-details/developer-app-details.component').then((c) => c.DeveloperAppDetailsComponent), }, ], }; diff --git a/src/app/features/settings/developer-apps/developer-apps.service.ts b/src/app/features/settings/developer-apps/developer-apps.service.ts index fc51c4589..09f4b46ad 100644 --- a/src/app/features/settings/developer-apps/developer-apps.service.ts +++ b/src/app/features/settings/developer-apps/developer-apps.service.ts @@ -19,30 +19,20 @@ export class DeveloperApplicationsService { baseUrl = 'https://api.staging4.osf.io/v2/applications/'; getApplications(): Observable { - return this.jsonApiService - .get>(this.baseUrl) - .pipe( - map((responses) => { - return responses.data.map((response) => - DeveloperAppMapper.fromGetResponse(response), - ); - }), - ); + return this.jsonApiService.get>(this.baseUrl).pipe( + map((responses) => { + return responses.data.map((response) => DeveloperAppMapper.fromGetResponse(response)); + }) + ); } getApplicationDetails(clientId: string): Observable { return this.jsonApiService - .get< - JsonApiResponse - >(this.baseUrl + clientId + '/') - .pipe( - map((response) => DeveloperAppMapper.fromGetResponse(response.data)), - ); + .get>(this.baseUrl + clientId + '/') + .pipe(map((response) => DeveloperAppMapper.fromGetResponse(response.data))); } - createApplication( - developerAppCreate: DeveloperAppCreateUpdate, - ): Observable { + createApplication(developerAppCreate: DeveloperAppCreateUpdate): Observable { const request = DeveloperAppMapper.toCreateRequest(developerAppCreate); return this.jsonApiService @@ -50,10 +40,7 @@ export class DeveloperApplicationsService { .pipe(map((response) => DeveloperAppMapper.fromGetResponse(response))); } - updateApp( - clientId: string, - developerAppUpdate: DeveloperAppCreateUpdate, - ): Observable { + updateApp(clientId: string, developerAppUpdate: DeveloperAppCreateUpdate): Observable { const request = DeveloperAppMapper.toUpdateRequest(developerAppUpdate); return this.jsonApiService diff --git a/src/app/features/settings/developer-apps/store/developer-apps.actions.ts b/src/app/features/settings/developer-apps/store/developer-apps.actions.ts index 516ec75ae..d79174736 100644 --- a/src/app/features/settings/developer-apps/store/developer-apps.actions.ts +++ b/src/app/features/settings/developer-apps/store/developer-apps.actions.ts @@ -27,7 +27,7 @@ export class UpdateDeveloperApp { constructor( public clientId: string, - public developerAppUpdate: DeveloperAppCreateUpdate, + public developerAppUpdate: DeveloperAppCreateUpdate ) {} } diff --git a/src/app/features/settings/developer-apps/store/developer-apps.selectors.ts b/src/app/features/settings/developer-apps/store/developer-apps.selectors.ts index e458a4bba..589864332 100644 --- a/src/app/features/settings/developer-apps/store/developer-apps.selectors.ts +++ b/src/app/features/settings/developer-apps/store/developer-apps.selectors.ts @@ -11,10 +11,7 @@ export class DeveloperAppsSelectors { } @Selector([DeveloperAppsState]) - static getDeveloperAppDetails( - state: DeveloperAppsStateModel, - ): (clientId: string) => DeveloperApp | undefined { - return (clientId: string) => - state.developerApps.find((app) => app.clientId === clientId); + static getDeveloperAppDetails(state: DeveloperAppsStateModel): (clientId: string) => DeveloperApp | undefined { + return (clientId: string) => state.developerApps.find((app) => app.clientId === clientId); } } diff --git a/src/app/features/settings/developer-apps/store/developer-apps.state.ts b/src/app/features/settings/developer-apps/store/developer-apps.state.ts index 33c8b6763..6638da0e0 100644 --- a/src/app/features/settings/developer-apps/store/developer-apps.state.ts +++ b/src/app/features/settings/developer-apps/store/developer-apps.state.ts @@ -1,10 +1,5 @@ import { Action, State, StateContext } from '@ngxs/store'; -import { - insertItem, - patch, - removeItem, - updateItem, -} from '@ngxs/store/operators'; +import { insertItem, patch, removeItem, updateItem } from '@ngxs/store/operators'; import { of, tap } from 'rxjs'; @@ -38,110 +33,79 @@ export class DeveloperAppsState { return this.#developerAppsService.getApplications().pipe( tap((developerApps) => { ctx.setState(patch({ developerApps })); - }), + }) ); } @Action(GetDeveloperAppDetails) - getDeveloperAppDetails( - ctx: StateContext, - action: GetDeveloperAppDetails, - ) { + getDeveloperAppDetails(ctx: StateContext, action: GetDeveloperAppDetails) { const state = ctx.getState(); - const developerAppFromState = state.developerApps.find( - (app: DeveloperApp) => app.clientId === action.clientId, - ); + const developerAppFromState = state.developerApps.find((app: DeveloperApp) => app.clientId === action.clientId); if (developerAppFromState) { return of(developerAppFromState); } - return this.#developerAppsService - .getApplicationDetails(action.clientId) - .pipe( - tap((fetchedApp) => { - ctx.setState( - patch({ - developerApps: insertItem(fetchedApp), - }), - ); - }), - ); + return this.#developerAppsService.getApplicationDetails(action.clientId).pipe( + tap((fetchedApp) => { + ctx.setState( + patch({ + developerApps: insertItem(fetchedApp), + }) + ); + }) + ); } @Action(CreateDeveloperApp) - createDeveloperApp( - ctx: StateContext, - action: CreateDeveloperApp, - ) { - return this.#developerAppsService - .createApplication(action.developerAppCreate) - .pipe( - tap((newApp) => { - ctx.setState( - patch({ - developerApps: insertItem(newApp, 0), - }), - ); - }), - ); + createDeveloperApp(ctx: StateContext, action: CreateDeveloperApp) { + return this.#developerAppsService.createApplication(action.developerAppCreate).pipe( + tap((newApp) => { + ctx.setState( + patch({ + developerApps: insertItem(newApp, 0), + }) + ); + }) + ); } @Action(UpdateDeveloperApp) - updateDeveloperApp( - ctx: StateContext, - action: UpdateDeveloperApp, - ) { - return this.#developerAppsService - .updateApp(action.clientId, action.developerAppUpdate) - .pipe( - tap((updatedApp) => { - ctx.setState( - patch({ - developerApps: updateItem( - (app) => app.clientId === action.clientId, - updatedApp, - ), - }), - ); - }), - ); + updateDeveloperApp(ctx: StateContext, action: UpdateDeveloperApp) { + return this.#developerAppsService.updateApp(action.clientId, action.developerAppUpdate).pipe( + tap((updatedApp) => { + ctx.setState( + patch({ + developerApps: updateItem((app) => app.clientId === action.clientId, updatedApp), + }) + ); + }) + ); } @Action(ResetClientSecret) - resetClientSecret( - ctx: StateContext, - action: ResetClientSecret, - ) { + resetClientSecret(ctx: StateContext, action: ResetClientSecret) { return this.#developerAppsService.resetClientSecret(action.clientId).pipe( tap((updatedApp) => { ctx.setState( patch({ - developerApps: updateItem( - (app) => app.clientId === action.clientId, - updatedApp, - ), - }), + developerApps: updateItem((app) => app.clientId === action.clientId, updatedApp), + }) ); - }), + }) ); } @Action(DeleteDeveloperApp) - deleteDeveloperApp( - ctx: StateContext, - action: DeleteDeveloperApp, - ) { + deleteDeveloperApp(ctx: StateContext, action: DeleteDeveloperApp) { return this.#developerAppsService.deleteApplication(action.clientId).pipe( tap(() => { ctx.setState( patch({ - developerApps: removeItem( - (app) => app.clientId === action.clientId, - ), - }), + developerApps: removeItem((app) => app.clientId === action.clientId), + }) ); - }), + }) ); } } diff --git a/src/app/features/settings/notifications/notifications.component.html b/src/app/features/settings/notifications/notifications.component.html index 8fc3bc434..51fd53b2e 100644 --- a/src/app/features/settings/notifications/notifications.component.html +++ b/src/app/features/settings/notifications/notifications.component.html @@ -1,12 +1,8 @@ - +
-

{{ "settings.notifications.emailPreferences.title" | translate }}

+

{{ 'settings.notifications.emailPreferences.title' | translate }}

@@ -14,17 +10,11 @@

{{ "settings.notifications.emailPreferences.title" | translate }}

- {{ - "settings.notifications.emailPreferences.items.general.description" - | translate - }} + {{ 'settings.notifications.emailPreferences.items.general.description' | translate }}
@@ -34,17 +24,11 @@

{{ "settings.notifications.emailPreferences.title" | translate }}

- {{ - "settings.notifications.emailPreferences.items.help.description" - | translate - }} + {{ 'settings.notifications.emailPreferences.items.help.description' | translate }}
@@ -52,9 +36,7 @@

{{ "settings.notifications.emailPreferences.title" | translate }}

@@ -64,51 +46,36 @@

{{ "settings.notifications.emailPreferences.title" | translate }}

- {{ "settings.notifications.notificationPreferences.title" | translate }} + {{ 'settings.notifications.notificationPreferences.title' | translate }}

- {{ "settings.notifications.notificationPreferences.note" | translate }} + {{ 'settings.notifications.notificationPreferences.note' | translate }}
- {{ - "settings.notifications.notificationPreferences.items.replies" - | translate - }} + {{ 'settings.notifications.notificationPreferences.items.replies' | translate }}
- {{ - "settings.notifications.notificationPreferences.items.comments" - | translate - }} + {{ 'settings.notifications.notificationPreferences.items.comments' | translate }}
- {{ - "settings.notifications.notificationPreferences.items.files" - | translate - }} + {{ 'settings.notifications.notificationPreferences.items.files' | translate }}
- {{ - "settings.notifications.notificationPreferences.items.mentions" - | translate - }} + {{ 'settings.notifications.notificationPreferences.items.mentions' | translate }}
- {{ - "settings.notifications.notificationPreferences.items.preprints" - | translate - }} + {{ 'settings.notifications.notificationPreferences.items.preprints' | translate }}
diff --git a/src/app/features/settings/notifications/notifications.component.ts b/src/app/features/settings/notifications/notifications.component.ts index 558558aea..833acd2c1 100644 --- a/src/app/features/settings/notifications/notifications.component.ts +++ b/src/app/features/settings/notifications/notifications.component.ts @@ -11,13 +11,7 @@ import { SubHeaderComponent } from '@shared/components/sub-header/sub-header.com @Component({ selector: 'osf-notifications', standalone: true, - imports: [ - SubHeaderComponent, - Checkbox, - Button, - DropdownModule, - TranslatePipe, - ], + imports: [SubHeaderComponent, Checkbox, Button, DropdownModule, TranslatePipe], templateUrl: './notifications.component.html', styleUrl: './notifications.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/src/app/features/settings/profile-settings/education/education.component.html b/src/app/features/settings/profile-settings/education/education.component.html index 65d515ba6..e22707278 100644 --- a/src/app/features/settings/profile-settings/education/education.component.html +++ b/src/app/features/settings/profile-settings/education/education.component.html @@ -2,26 +2,16 @@
@if (haveEducations) { - @for ( - education of educations.controls; - track education.value; - let index = $index - ) { -
+ @for (education of educations.controls; track education.value; let index = $index) { +

- {{ - "settings.profileSettings.education.title" - | translate: { index: index + 1 } - }} + {{ 'settings.profileSettings.education.title' | translate: { index: index + 1 } }}

@if (index !== 0) {
- {{ "settings.profileSettings.education.remove" | translate }} + {{ 'settings.profileSettings.education.remove' | translate }}
} @@ -30,58 +20,33 @@

- +
-
+
- +
- +
-
+
-
+
-
@@ -138,9 +96,7 @@

(click)="addEducation()" /> -
+
disabled="true" />
- +
diff --git a/src/app/features/settings/profile-settings/education/education.component.ts b/src/app/features/settings/profile-settings/education/education.component.ts index c818a4df8..b1163a077 100644 --- a/src/app/features/settings/profile-settings/education/education.component.ts +++ b/src/app/features/settings/profile-settings/education/education.component.ts @@ -7,32 +7,16 @@ import { Checkbox } from 'primeng/checkbox'; import { DatePicker } from 'primeng/datepicker'; import { InputText } from 'primeng/inputtext'; -import { - ChangeDetectionStrategy, - Component, - effect, - HostBinding, - inject, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, effect, HostBinding, inject } from '@angular/core'; import { FormArray, FormBuilder, ReactiveFormsModule } from '@angular/forms'; -import { - Education, - EducationForm, -} from '@osf/features/settings/profile-settings/education/educations.entities'; +import { Education, EducationForm } from '@osf/features/settings/profile-settings/education/educations.entities'; import { UpdateProfileSettingsEducation } from '@osf/features/settings/profile-settings/profile-settings.actions'; import { ProfileSettingsSelectors } from '@osf/features/settings/profile-settings/profile-settings.selectors'; @Component({ selector: 'osf-education', - imports: [ - ReactiveFormsModule, - Button, - InputText, - DatePicker, - Checkbox, - TranslatePipe, - ], + imports: [ReactiveFormsModule, Button, InputText, DatePicker, Checkbox, TranslatePipe], templateUrl: './education.component.html', styleUrl: './education.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, @@ -44,9 +28,7 @@ export class EducationComponent { educations: this.#fb.array([]), }); readonly #store = inject(Store); - readonly educationItems = this.#store.selectSignal( - ProfileSettingsSelectors.educations, - ); + readonly educationItems = this.#store.selectSignal(ProfileSettingsSelectors.educations); constructor() { effect(() => { @@ -58,9 +40,7 @@ export class EducationComponent { institution: [education.institution], department: [education.department], degree: [education.degree], - startDate: [ - new Date(+education.startYear, education.startMonth - 1), - ], + startDate: [new Date(+education.startYear, education.startMonth - 1)], endDate: education.ongoing ? '' : education.endYear && education.endMonth @@ -103,23 +83,17 @@ export class EducationComponent { degree: education.degree, startYear: this.setupDates(education.startDate, null).startYear, startMonth: this.setupDates(education.startDate, null).startMonth, - endYear: education.ongoing - ? null - : this.setupDates('', education.endDate).endYear, - endMonth: education.ongoing - ? null - : this.setupDates('', education.endDate).endMonth, + endYear: education.ongoing ? null : this.setupDates('', education.endDate).endYear, + endMonth: education.ongoing ? null : this.setupDates('', education.endDate).endMonth, ongoing: education.ongoing, })) satisfies Education[]; - this.#store.dispatch( - new UpdateProfileSettingsEducation({ education: formattedEducation }), - ); + this.#store.dispatch(new UpdateProfileSettingsEducation({ education: formattedEducation })); } private setupDates( startDate: Date | string, - endDate: Date | null, + endDate: Date | null ): { startYear: number; startMonth: number; diff --git a/src/app/features/settings/profile-settings/employment/employment.component.html b/src/app/features/settings/profile-settings/employment/employment.component.html index 5849eda60..befa782a3 100644 --- a/src/app/features/settings/profile-settings/employment/employment.component.html +++ b/src/app/features/settings/profile-settings/employment/employment.component.html @@ -3,26 +3,16 @@
@if (havePositions) { - @for ( - position of positions.controls; - track position.value; - let index = $index - ) { -
+ @for (position of positions.controls; track position.value; let index = $index) { +

- {{ - "settings.profileSettings.employment.title" - | translate: { index: index + 1 } - }} + {{ 'settings.profileSettings.employment.title' | translate: { index: index + 1 } }}

@if (index !== 0) {
- {{ "settings.profileSettings.employment.remove" | translate }} + {{ 'settings.profileSettings.employment.remove' | translate }}
} @@ -31,60 +21,33 @@

- +
-
+
- +
- +
-
+
-
+
-
@@ -144,9 +97,7 @@

(click)="addPosition()" /> -
+
disabled="true" />
- +
diff --git a/src/app/features/settings/profile-settings/employment/employment.component.ts b/src/app/features/settings/profile-settings/employment/employment.component.ts index 380410776..a4cc3a49f 100644 --- a/src/app/features/settings/profile-settings/employment/employment.component.ts +++ b/src/app/features/settings/profile-settings/employment/employment.component.ts @@ -7,37 +7,16 @@ import { Checkbox } from 'primeng/checkbox'; import { DatePicker } from 'primeng/datepicker'; import { InputText } from 'primeng/inputtext'; -import { - ChangeDetectionStrategy, - Component, - effect, - HostBinding, - inject, -} from '@angular/core'; -import { - FormArray, - FormBuilder, - ReactiveFormsModule, - Validators, -} from '@angular/forms'; - -import { - Employment, - EmploymentForm, -} from '@osf/features/settings/profile-settings/employment/employment.entities'; +import { ChangeDetectionStrategy, Component, effect, HostBinding, inject } from '@angular/core'; +import { FormArray, FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms'; + +import { Employment, EmploymentForm } from '@osf/features/settings/profile-settings/employment/employment.entities'; import { UpdateProfileSettingsEmployment } from '@osf/features/settings/profile-settings/profile-settings.actions'; import { ProfileSettingsSelectors } from '@osf/features/settings/profile-settings/profile-settings.selectors'; @Component({ selector: 'osf-employment', - imports: [ - Button, - Checkbox, - DatePicker, - InputText, - ReactiveFormsModule, - TranslatePipe, - ], + imports: [Button, Checkbox, DatePicker, InputText, ReactiveFormsModule, TranslatePipe], templateUrl: './employment.component.html', styleUrl: './employment.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, @@ -45,9 +24,7 @@ import { ProfileSettingsSelectors } from '@osf/features/settings/profile-setting export class EmploymentComponent { @HostBinding('class') classes = 'flex flex-column gap-5'; readonly #store = inject(Store); - readonly employment = this.#store.selectSignal( - ProfileSettingsSelectors.employment, - ); + readonly employment = this.#store.selectSignal(ProfileSettingsSelectors.employment); readonly #fb = inject(FormBuilder); readonly employmentForm = this.#fb.group({ positions: this.#fb.array([]), @@ -111,23 +88,17 @@ export class EmploymentComponent { institution: employment.institution, startYear: this.setupDates(employment.startDate, null).startYear, startMonth: this.setupDates(employment.startDate, null).startMonth, - endYear: employment.ongoing - ? null - : this.setupDates('', employment.endDate).endYear, - endMonth: employment.ongoing - ? null - : this.setupDates('', employment.endDate).endMonth, + endYear: employment.ongoing ? null : this.setupDates('', employment.endDate).endYear, + endMonth: employment.ongoing ? null : this.setupDates('', employment.endDate).endMonth, ongoing: !employment.ongoing, })) satisfies Employment[]; - this.#store.dispatch( - new UpdateProfileSettingsEmployment({ employment: formattedEmployments }), - ); + this.#store.dispatch(new UpdateProfileSettingsEmployment({ employment: formattedEmployments })); } private setupDates( startDate: Date | string, - endDate: Date | string | null, + endDate: Date | string | null ): { startYear: string | number; startMonth: number; diff --git a/src/app/features/settings/profile-settings/name/name.component.html b/src/app/features/settings/profile-settings/name/name.component.html index 9bb548d04..f30e09bc6 100644 --- a/src/app/features/settings/profile-settings/name/name.component.html +++ b/src/app/features/settings/profile-settings/name/name.component.html @@ -1,86 +1,52 @@

- {{ "settings.profileSettings.name.description" | translate }} + {{ 'settings.profileSettings.name.description' | translate }}

-
+
- +
- +
-
+
- +
- +
-
+
- +
- +
@@ -88,21 +54,16 @@

- {{ "settings.profileSettings.name.citationPreview.title" | translate }} + {{ 'settings.profileSettings.name.citationPreview.title' | translate }}

- {{ - "settings.profileSettings.name.citationPreview.style" | translate - }} + {{ 'settings.profileSettings.name.citationPreview.style' | translate }}

- {{ - "settings.profileSettings.name.citationPreview.citationFormat" - | translate - }} + {{ 'settings.profileSettings.name.citationPreview.citationFormat' | translate }}

@@ -114,15 +75,10 @@

Doe, J. T.

- {{ - "settings.profileSettings.name.citationPreview.style" | translate - }} + {{ 'settings.profileSettings.name.citationPreview.style' | translate }}

- {{ - "settings.profileSettings.name.citationPreview.citationFormat" - | translate - }} + {{ 'settings.profileSettings.name.citationPreview.citationFormat' | translate }}

@@ -134,9 +90,7 @@

Doe, John T.

-
+
Doe, John T.

severity="info" />
- +
diff --git a/src/app/features/settings/profile-settings/name/name.component.ts b/src/app/features/settings/profile-settings/name/name.component.ts index 1723ac6a6..382f19d7b 100644 --- a/src/app/features/settings/profile-settings/name/name.component.ts +++ b/src/app/features/settings/profile-settings/name/name.component.ts @@ -5,13 +5,7 @@ import { TranslatePipe } from '@ngx-translate/core'; import { Button } from 'primeng/button'; import { InputText } from 'primeng/inputtext'; -import { - ChangeDetectionStrategy, - Component, - effect, - HostBinding, - inject, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, effect, HostBinding, inject } from '@angular/core'; import { FormBuilder, ReactiveFormsModule } from '@angular/forms'; import { NameForm } from '@osf/features/settings/profile-settings/name/name.entities'; @@ -53,8 +47,7 @@ export class NameComponent { } saveChanges() { - const { fullName, givenName, middleNames, familyName, suffix } = - this.form.getRawValue(); + const { fullName, givenName, middleNames, familyName, suffix } = this.form.getRawValue(); this.#store.dispatch( new UpdateProfileSettingsUser({ user: { @@ -64,7 +57,7 @@ export class NameComponent { familyName, suffix, }, - }), + }) ); } } diff --git a/src/app/features/settings/profile-settings/profile-settings.api.service.ts b/src/app/features/settings/profile-settings/profile-settings.api.service.ts index 57947e7ba..eef651d26 100644 --- a/src/app/features/settings/profile-settings/profile-settings.api.service.ts +++ b/src/app/features/settings/profile-settings/profile-settings.api.service.ts @@ -15,15 +15,10 @@ export class ProfileSettingsApiService { readonly #baseUrl = 'https://api.staging4.osf.io/v2/'; readonly #jsonApiService = inject(JsonApiService); - patchUserSettings( - userId: string, - key: keyof ProfileSettingsStateModel, - data: ProfileSettingsUpdate, - ) { + patchUserSettings(userId: string, key: keyof ProfileSettingsStateModel, data: ProfileSettingsUpdate) { const patchedData = { [key]: data }; - return this.#jsonApiService.patch>( - `${this.#baseUrl}users/${userId}/`, - { data: { type: 'users', id: userId, attributes: patchedData } }, - ); + return this.#jsonApiService.patch>(`${this.#baseUrl}users/${userId}/`, { + data: { type: 'users', id: userId, attributes: patchedData }, + }); } } diff --git a/src/app/features/settings/profile-settings/profile-settings.component.html b/src/app/features/settings/profile-settings/profile-settings.component.html index d06e33503..8da7cb27e 100644 --- a/src/app/features/settings/profile-settings/profile-settings.component.html +++ b/src/app/features/settings/profile-settings/profile-settings.component.html @@ -1,29 +1,13 @@ - +
- + @if (!isMobile()) { - {{ - "settings.profileSettings.tabs.name" | translate - }} - {{ - "settings.profileSettings.tabs.social" | translate - }} - {{ - "settings.profileSettings.tabs.employment" | translate - }} - {{ - "settings.profileSettings.tabs.education" | translate - }} + {{ 'settings.profileSettings.tabs.name' | translate }} + {{ 'settings.profileSettings.tabs.social' | translate }} + {{ 'settings.profileSettings.tabs.employment' | translate }} + {{ 'settings.profileSettings.tabs.education' | translate }} } diff --git a/src/app/features/settings/profile-settings/profile-settings.entities.ts b/src/app/features/settings/profile-settings/profile-settings.entities.ts index f20b16ff3..b24371ec5 100644 --- a/src/app/features/settings/profile-settings/profile-settings.entities.ts +++ b/src/app/features/settings/profile-settings/profile-settings.entities.ts @@ -12,11 +12,7 @@ export interface ProfileSettingsStateModel { user: Partial; } -export type ProfileSettingsUpdate = - | Partial[] - | Partial[] - | Partial - | Partial; +export type ProfileSettingsUpdate = Partial[] | Partial[] | Partial | Partial; export const PROFILE_SETTINGS_INITIAL_STATE: ProfileSettingsStateModel = { employment: [], diff --git a/src/app/features/settings/profile-settings/profile-settings.state.ts b/src/app/features/settings/profile-settings/profile-settings.state.ts index f68e70ef9..dce8fabfa 100644 --- a/src/app/features/settings/profile-settings/profile-settings.state.ts +++ b/src/app/features/settings/profile-settings/profile-settings.state.ts @@ -34,9 +34,7 @@ export class ProfileSettingsState { @Action(SetupProfileSettings) setupProfileSettings(ctx: StateContext): void { const state = ctx.getState(); - const profileSettings = this.#store.selectSnapshot( - UserSelectors.getProfileSettings, - ); + const profileSettings = this.#store.selectSnapshot(UserSelectors.getProfileSettings); ctx.patchState({ ...state, @@ -47,7 +45,7 @@ export class ProfileSettingsState { @Action(UpdateProfileSettingsEmployment) updateProfileSettingsEmployment( ctx: StateContext, - { payload }: UpdateProfileSettingsEmployment, + { payload }: UpdateProfileSettingsEmployment ) { const state = ctx.getState(); const userId = state.user.id; @@ -60,22 +58,20 @@ export class ProfileSettingsState { return removeNullable(item); }); - return this.#profileSettingsService - .patchUserSettings(userId, 'employment', withoutNulls) - .pipe( - tap((response) => { - ctx.patchState({ - ...state, - employment: response.data.attributes.employment, - }); - }), - ); + return this.#profileSettingsService.patchUserSettings(userId, 'employment', withoutNulls).pipe( + tap((response) => { + ctx.patchState({ + ...state, + employment: response.data.attributes.employment, + }); + }) + ); } @Action(UpdateProfileSettingsEducation) updateProfileSettingsEducation( ctx: StateContext, - { payload }: UpdateProfileSettingsEducation, + { payload }: UpdateProfileSettingsEducation ) { const state = ctx.getState(); const userId = state.user.id; @@ -88,23 +84,18 @@ export class ProfileSettingsState { return removeNullable(item); }); - return this.#profileSettingsService - .patchUserSettings(userId, 'education', withoutNulls) - .pipe( - tap((response) => { - ctx.patchState({ - ...state, - education: response.data.attributes.education, - }); - }), - ); + return this.#profileSettingsService.patchUserSettings(userId, 'education', withoutNulls).pipe( + tap((response) => { + ctx.patchState({ + ...state, + education: response.data.attributes.education, + }); + }) + ); } @Action(UpdateProfileSettingsUser) - updateProfileSettingsUser( - ctx: StateContext, - { payload }: UpdateProfileSettingsUser, - ) { + updateProfileSettingsUser(ctx: StateContext, { payload }: UpdateProfileSettingsUser) { const state = ctx.getState(); const userId = state.user.id; @@ -114,22 +105,20 @@ export class ProfileSettingsState { const withoutNulls = mapNameToDto(removeNullable(payload.user)); - return this.#profileSettingsService - .patchUserSettings(userId, 'user', withoutNulls) - .pipe( - tap((response) => { - ctx.patchState({ - ...state, - user: response.data.attributes, - }); - }), - ); + return this.#profileSettingsService.patchUserSettings(userId, 'user', withoutNulls).pipe( + tap((response) => { + ctx.patchState({ + ...state, + user: response.data.attributes, + }); + }) + ); } @Action(UpdateProfileSettingsSocialLinks) updateProfileSettingsSocialLinks( ctx: StateContext, - { payload }: UpdateProfileSettingsSocialLinks, + { payload }: UpdateProfileSettingsSocialLinks ) { const state = ctx.getState(); const userId = state.user.id; @@ -147,15 +136,13 @@ export class ProfileSettingsState { }; }); - return this.#profileSettingsService - .patchUserSettings(userId, 'social', social) - .pipe( - tap((response) => { - ctx.patchState({ - ...state, - social: response.data.attributes.social, - }); - }), - ); + return this.#profileSettingsService.patchUserSettings(userId, 'social', social).pipe( + tap((response) => { + ctx.patchState({ + ...state, + social: response.data.attributes.social, + }); + }) + ); } } diff --git a/src/app/features/settings/profile-settings/social/social.component.html b/src/app/features/settings/profile-settings/social/social.component.html index 13dde1c38..11f5d1d82 100644 --- a/src/app/features/settings/profile-settings/social/social.component.html +++ b/src/app/features/settings/profile-settings/social/social.component.html @@ -8,26 +8,21 @@ >

- {{ - "settings.profileSettings.social.title" - | translate: { index: index + 1 } - }} + {{ 'settings.profileSettings.social.title' | translate: { index: index + 1 } }}

@if (index !== 0) {
- {{ "settings.profileSettings.social.remove" | translate }} + {{ 'settings.profileSettings.social.remove' | translate }}
}
-
+

- {{ "settings.profileSettings.social.socialOutput" | translate }} + {{ 'settings.profileSettings.social.socialOutput' | translate }}

- {{ "settings.profileSettings.social.webAddress" | translate }} + {{ 'settings.profileSettings.social.webAddress' | translate }}

{{ getDomain(index) }} - +
@@ -64,9 +55,7 @@

(click)="addLink()" /> -
+
disabled="true" />
- +
diff --git a/src/app/features/settings/profile-settings/social/social.component.ts b/src/app/features/settings/profile-settings/social/social.component.ts index 04c9889df..cfcc2bd14 100644 --- a/src/app/features/settings/profile-settings/social/social.component.ts +++ b/src/app/features/settings/profile-settings/social/social.component.ts @@ -8,19 +8,8 @@ import { InputGroup } from 'primeng/inputgroup'; import { InputGroupAddon } from 'primeng/inputgroupaddon'; import { InputText } from 'primeng/inputtext'; -import { - ChangeDetectionStrategy, - Component, - effect, - HostBinding, - inject, -} from '@angular/core'; -import { - FormArray, - FormBuilder, - ReactiveFormsModule, - Validators, -} from '@angular/forms'; +import { ChangeDetectionStrategy, Component, effect, HostBinding, inject } from '@angular/core'; +import { FormArray, FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms'; import { socials } from '@osf/features/settings/profile-settings/data'; import { UserSocialLink } from '@osf/features/settings/profile-settings/entities/user-social-link.entity'; @@ -35,15 +24,7 @@ import { @Component({ selector: 'osf-social', - imports: [ - Button, - DropdownModule, - InputGroup, - InputGroupAddon, - InputText, - ReactiveFormsModule, - TranslatePipe, - ], + imports: [Button, DropdownModule, InputGroup, InputGroupAddon, InputText, ReactiveFormsModule, TranslatePipe], templateUrl: './social.component.html', styleUrl: './social.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, @@ -53,9 +34,7 @@ export class SocialComponent { readonly userSocialLinks: UserSocialLink[] = []; protected readonly socials = socials; readonly #store = inject(Store); - readonly socialLinks = this.#store.selectSignal( - ProfileSettingsSelectors.socialLinks, - ); + readonly socialLinks = this.#store.selectSignal(ProfileSettingsSelectors.socialLinks); readonly #fb = inject(FormBuilder); readonly socialLinksForm = this.#fb.group({ links: this.#fb.array([]), @@ -71,10 +50,7 @@ export class SocialComponent { console.log(socialLink); const socialLinkGroup = this.#fb.group({ - socialOutput: [ - this.socials.find((social) => social.key === socialLinksKey), - Validators.required, - ], + socialOutput: [this.socials.find((social) => social.key === socialLinksKey), Validators.required], webAddress: [socialLink, Validators.required], }); @@ -114,17 +90,13 @@ 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) ? [link.webAddress] : link.webAddress; return { [key]: value, }; }) satisfies Partial[]; - this.#store.dispatch( - new UpdateProfileSettingsSocialLinks({ socialLinks: mappedLinks }), - ); + this.#store.dispatch(new UpdateProfileSettingsSocialLinks({ socialLinks: mappedLinks })); } } diff --git a/src/app/features/settings/profile-settings/social/social.entities.ts b/src/app/features/settings/profile-settings/social/social.entities.ts index ce9cc5739..8ddae61d2 100644 --- a/src/app/features/settings/profile-settings/social/social.entities.ts +++ b/src/app/features/settings/profile-settings/social/social.entities.ts @@ -16,12 +16,7 @@ export interface Social { export type SocialLinksKeys = keyof Social; -export const SOCIAL_KEYS: SocialLinksKeys[] = [ - 'github', - 'twitter', - 'linkedIn', - 'profileWebsites', -]; +export const SOCIAL_KEYS: SocialLinksKeys[] = ['github', 'twitter', 'linkedIn', 'profileWebsites']; export interface SocialLinksEntity { id: number; diff --git a/src/app/features/settings/settings.routes.ts b/src/app/features/settings/settings.routes.ts index cc01e4ac0..b2394e10c 100644 --- a/src/app/features/settings/settings.routes.ts +++ b/src/app/features/settings/settings.routes.ts @@ -12,16 +12,12 @@ export const settingsRoutes: Routes = [ { path: 'profile-settings', loadComponent: () => - import('./profile-settings/profile-settings.component').then( - (c) => c.ProfileSettingsComponent, - ), + import('./profile-settings/profile-settings.component').then((c) => c.ProfileSettingsComponent), }, { path: 'account-settings', loadComponent: () => - import('./account-settings/account-settings.component').then( - (c) => c.AccountSettingsComponent, - ), + import('./account-settings/account-settings.component').then((c) => c.AccountSettingsComponent), }, developerAppsRoute, { @@ -29,17 +25,12 @@ export const settingsRoutes: Routes = [ children: [ { path: '', - loadComponent: () => - import('./addons/addons.component').then( - (mod) => mod.AddonsComponent, - ), + loadComponent: () => import('./addons/addons.component').then((mod) => mod.AddonsComponent), }, { path: 'connect-addon', loadComponent: () => - import('./addons/connect-addon/connect-addon.component').then( - (mod) => mod.ConnectAddonComponent, - ), + import('./addons/connect-addon/connect-addon.component').then((mod) => mod.ConnectAddonComponent), }, ], }, @@ -47,9 +38,7 @@ export const settingsRoutes: Routes = [ { path: 'notifications', loadComponent: () => - import('./notifications/notifications.component').then( - (mod) => mod.NotificationsComponent, - ), + import('./notifications/notifications.component').then((mod) => mod.NotificationsComponent), }, ], }, diff --git a/src/app/features/settings/tokens/store/tokens.actions.ts b/src/app/features/settings/tokens/store/tokens.actions.ts index 54a657610..a71e493af 100644 --- a/src/app/features/settings/tokens/store/tokens.actions.ts +++ b/src/app/features/settings/tokens/store/tokens.actions.ts @@ -16,7 +16,7 @@ export class UpdateToken { constructor( public tokenId: string, public name: string, - public scopes: string[], + public scopes: string[] ) {} } @@ -29,6 +29,6 @@ export class CreateToken { static readonly type = '[Tokens] Create Token'; constructor( public name: string, - public scopes: string[], + public scopes: string[] ) {} } diff --git a/src/app/features/settings/tokens/store/tokens.selectors.ts b/src/app/features/settings/tokens/store/tokens.selectors.ts index 1f4c08167..57075af2b 100644 --- a/src/app/features/settings/tokens/store/tokens.selectors.ts +++ b/src/app/features/settings/tokens/store/tokens.selectors.ts @@ -18,9 +18,7 @@ export class TokensSelectors { } @Selector([TokensState]) - static getTokenById( - state: TokensStateModel, - ): (id: string) => Token | undefined { + static getTokenById(state: TokensStateModel): (id: string) => Token | undefined { return (id: string) => state.tokens.find((token) => token.id === id); } } diff --git a/src/app/features/settings/tokens/store/tokens.state.ts b/src/app/features/settings/tokens/store/tokens.state.ts index 140ce00ac..c33f600ca 100644 --- a/src/app/features/settings/tokens/store/tokens.state.ts +++ b/src/app/features/settings/tokens/store/tokens.state.ts @@ -7,14 +7,7 @@ import { inject, Injectable } from '@angular/core'; import { Token } from '@osf/features/settings/tokens/entities/tokens.models'; import { TokensService } from '@osf/features/settings/tokens/tokens.service'; -import { - CreateToken, - DeleteToken, - GetScopes, - GetTokenById, - GetTokens, - UpdateToken, -} from './tokens.actions'; +import { CreateToken, DeleteToken, GetScopes, GetTokenById, GetTokens, UpdateToken } from './tokens.actions'; import { TokensStateModel } from './tokens.models'; @State({ @@ -34,7 +27,7 @@ export class TokensState { return this.tokensService.getScopes().pipe( tap((scopes) => { ctx.patchState({ scopes }); - }), + }) ); } @@ -43,16 +36,14 @@ export class TokensState { return this.tokensService.getTokens().pipe( tap((tokens) => { ctx.patchState({ tokens }); - }), + }) ); } @Action(GetTokenById) getTokenById(ctx: StateContext, action: GetTokenById) { const state = ctx.getState(); - const tokenFromState = state.tokens.find( - (token: Token) => token.id === action.tokenId, - ); + const tokenFromState = state.tokens.find((token: Token) => token.id === action.tokenId); if (tokenFromState) { return of(tokenFromState); @@ -62,23 +53,19 @@ export class TokensState { tap((token) => { const updatedTokens = [...state.tokens, token]; ctx.patchState({ tokens: updatedTokens }); - }), + }) ); } @Action(UpdateToken) updateToken(ctx: StateContext, action: UpdateToken) { - return this.tokensService - .updateToken(action.tokenId, action.name, action.scopes) - .pipe( - tap((updatedToken) => { - const state = ctx.getState(); - const updatedTokens = state.tokens.map((token: Token) => - token.id === action.tokenId ? updatedToken : token, - ); - ctx.patchState({ tokens: updatedTokens }); - }), - ); + return this.tokensService.updateToken(action.tokenId, action.name, action.scopes).pipe( + tap((updatedToken) => { + const state = ctx.getState(); + const updatedTokens = state.tokens.map((token: Token) => (token.id === action.tokenId ? updatedToken : token)); + ctx.patchState({ tokens: updatedTokens }); + }) + ); } @Action(DeleteToken) @@ -86,11 +73,9 @@ export class TokensState { return this.tokensService.deleteToken(action.tokenId).pipe( tap(() => { const state = ctx.getState(); - const updatedTokens = state.tokens.filter( - (token: Token) => token.id !== action.tokenId, - ); + const updatedTokens = state.tokens.filter((token: Token) => token.id !== action.tokenId); ctx.patchState({ tokens: updatedTokens }); - }), + }) ); } @@ -103,7 +88,7 @@ export class TokensState { ctx.patchState({ tokens: updatedTokens }); return newToken; - }), + }) ); } } diff --git a/src/app/features/settings/tokens/token-add-edit-form/token-add-edit-form.component.html b/src/app/features/settings/tokens/token-add-edit-form/token-add-edit-form.component.html index a0199a5c1..f6a2a10f3 100644 --- a/src/app/features/settings/tokens/token-add-edit-form/token-add-edit-form.component.html +++ b/src/app/features/settings/tokens/token-add-edit-form/token-add-edit-form.component.html @@ -1,39 +1,23 @@ -
+
- - + +

- {{ "settings.tokens.form.scopes.title" | translate }} + {{ 'settings.tokens.form.scopes.title' | translate }}

- {{ "settings.tokens.form.scopes.description" | translate }} + {{ 'settings.tokens.form.scopes.description' | translate }}

@for (scope of tokenScopes(); track scope.id) {
- +
@@ -81,28 +67,21 @@

- +
{ return this.projects().map((project) => ({ @@ -103,26 +83,20 @@ export class AddProjectFormComponent implements OnInit { }); constructor() { - this.projectForm - .get(ProjectFormControls.Template) - ?.valueChanges.subscribe((value) => { - this.hasTemplateSelected.set(!!value); - }); + this.projectForm.get(ProjectFormControls.Template)?.valueChanges.subscribe((value) => { + this.hasTemplateSelected.set(!!value); + }); } ngOnInit(): void { - this.#store.dispatch( - new GetMyProjects(1, MY_PROJECTS_TABLE_PARAMS.rows, {}), - ); + this.#store.dispatch(new GetMyProjects(1, MY_PROJECTS_TABLE_PARAMS.rows, {})); this.selectAllAffiliations(); } selectAllAffiliations(): void { const allAffiliationValues = this.affiliations().map((aff) => aff.id); - this.projectForm - .get(ProjectFormControls.Affiliations) - ?.setValue(allAffiliationValues); + this.projectForm.get(ProjectFormControls.Affiliations)?.setValue(allAffiliationValues); } removeAllAffiliations(): void { @@ -145,14 +119,12 @@ export class AddProjectFormComponent implements OnInit { formValue.description, formValue.template, formValue.storageLocation, - formValue.affiliations, - ), + formValue.affiliations + ) ) .subscribe({ next: () => { - this.#store.dispatch( - new GetMyProjects(1, MY_PROJECTS_TABLE_PARAMS.rows, {}), - ); + this.#store.dispatch(new GetMyProjects(1, MY_PROJECTS_TABLE_PARAMS.rows, {})); this.dialogRef.close(); }, error: (error) => { diff --git a/src/app/shared/components/my-projects-table/my-projects-table.component.html b/src/app/shared/components/my-projects-table/my-projects-table.component.html index cacd769fe..406b6807e 100644 --- a/src/app/shared/components/my-projects-table/my-projects-table.component.html +++ b/src/app/shared/components/my-projects-table/my-projects-table.component.html @@ -9,12 +9,12 @@ - {{ "myProjects.table.columns.title" | translate }} + {{ 'myProjects.table.columns.title' | translate }} - {{ "myProjects.table.columns.contributors" | translate }} + {{ 'myProjects.table.columns.contributors' | translate }} - {{ "myProjects.table.columns.modified" | translate }} + {{ 'myProjects.table.columns.modified' | translate }} @@ -51,12 +51,12 @@ - {{ "myProjects.table.columns.title" | translate }} + {{ 'myProjects.table.columns.title' | translate }} - {{ "myProjects.table.columns.contributors" | translate }} + {{ 'myProjects.table.columns.contributors' | translate }} - {{ "myProjects.table.columns.modified" | translate }} + {{ 'myProjects.table.columns.modified' | translate }} @@ -65,20 +65,16 @@

- + {{ item.title }}

@for (contributor of item.contributors; track contributor) { - {{ contributor.fullName }}{{ $last ? "" : ", " }} + {{ contributor.fullName }}{{ $last ? '' : ', ' }} } - {{ item.dateModified | date: "MMM d, y, h:mm a" }} + {{ item.dateModified | date: 'MMM d, y, h:mm a' }} diff --git a/src/app/shared/components/my-projects-table/my-projects-table.component.ts b/src/app/shared/components/my-projects-table/my-projects-table.component.ts index 1970db99d..8694647eb 100644 --- a/src/app/shared/components/my-projects-table/my-projects-table.component.ts +++ b/src/app/shared/components/my-projects-table/my-projects-table.component.ts @@ -5,12 +5,7 @@ import { Skeleton } from 'primeng/skeleton'; import { TableModule, TablePageEvent } from 'primeng/table'; import { CommonModule } from '@angular/common'; -import { - ChangeDetectionStrategy, - Component, - input, - output, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; import { MyProjectsItem } from '@osf/features/my-projects/entities/my-projects.entities'; import { SearchInputComponent } from '@shared/components/search-input/search-input.component'; @@ -20,13 +15,7 @@ import { SortOrder } from '@shared/utils/sort-order.enum'; @Component({ selector: 'osf-my-projects-table', standalone: true, - imports: [ - CommonModule, - TableModule, - SearchInputComponent, - Skeleton, - TranslatePipe, - ], + imports: [CommonModule, TableModule, SearchInputComponent, Skeleton, TranslatePipe], templateUrl: './my-projects-table.component.html', styleUrl: './my-projects-table.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/src/app/shared/components/password-input-hint/password-input-hint.component.html b/src/app/shared/components/password-input-hint/password-input-hint.component.html index 3c337a022..028698b23 100644 --- a/src/app/shared/components/password-input-hint/password-input-hint.component.html +++ b/src/app/shared/components/password-input-hint/password-input-hint.component.html @@ -1,3 +1,3 @@ - {{ "auth.common.password.requirements" | translate }} + {{ 'auth.common.password.requirements' | translate }} diff --git a/src/app/shared/components/resources/filter-chips/filter-chips.component.html b/src/app/shared/components/resources/filter-chips/filter-chips.component.html index 4d6ec44a7..b55a1cba0 100644 --- a/src/app/shared/components/resources/filter-chips/filter-chips.component.html +++ b/src/app/shared/components/resources/filter-chips/filter-chips.component.html @@ -1,5 +1,5 @@ @if (filters().creator.value && !isMyProfilePage()) { - @let creator = filters().creator.filterName + ": " + filters().creator.label; + @let creator = filters().creator.filterName + ': ' + filters().creator.label;
- @if ( - item()?.resourceType && item()?.resourceType === ResourceType.Agent - ) { + @if (item()?.resourceType && item()?.resourceType === ResourceType.Agent) {

User

} @else if (item()?.resourceType) {

{{ ResourceType[item()?.resourceType!] }}

}
- @if ( - item()?.resourceType === ResourceType.File && item()?.fileName - ) { + @if (item()?.resourceType === ResourceType.File && item()?.fileName) { {{ item()?.fileName }} } @else if (item()?.title && item()?.title) { {{ item()?.title }} } @if (item()?.orcid) { - orcid + orcid }
@if (item()?.creators?.length) {
- @for ( - creator of item()?.creators!.slice(0, 4); - track creator.id; - let i = $index - ) { + @for (creator of item()?.creators!.slice(0, 4); track creator.id; let i = $index) { {{ creator.name }} @if (i < (item()?.creators)!.length - 1 && i < 3) { , } } @if ((item()?.creators)!.length > 4) { -

-  and {{ (item()?.creators)!.length - 4 }} more -

+

 and {{ (item()?.creators)!.length - 4 }} more

}
} @@ -54,25 +39,21 @@ @if (item()?.from?.id && item()?.from?.name) { } @if (item()?.dateCreated && item()?.dateModified) {

@if (!isSmall()) { - Date created: {{ item()?.dateCreated | date: "MMMM d, y" }} | - Date modified: {{ item()?.dateModified | date: "MMMM d, y" }} + Date created: {{ item()?.dateCreated | date: 'MMMM d, y' }} | Date modified: + {{ item()?.dateModified | date: 'MMMM d, y' }} } @else {

-

- Date created: {{ item()?.dateCreated | date: "MMMM d, y" }} -

+

Date created: {{ item()?.dateCreated | date: 'MMMM d, y' }}

Date modified: - {{ item()?.dateModified | date: "MMMM d, y" }} + {{ item()?.dateModified | date: 'MMMM d, y' }}

} @@ -146,9 +127,7 @@ } @if (item()?.registrationTemplate) { -

- Registration Template: {{ item()?.registrationTemplate }} -

+

Registration Template: {{ item()?.registrationTemplate }}

} @if (item()?.provider?.id) { @@ -158,14 +137,8 @@ } - @if ( - item()?.conflictOfInterestResponse && - item()?.conflictOfInterestResponse === "no-conflict-of-interest" - ) { -

- Conflict of Interest response: Author asserted no Conflict of - Interest -

+ @if (item()?.conflictOfInterestResponse && item()?.conflictOfInterestResponse === 'no-conflict-of-interest') { +

Conflict of Interest response: Author asserted no Conflict of Interest

} @if (item()?.resourceType !== ResourceType.Agent && item()?.id) { @@ -189,9 +162,7 @@ } @else {

Public projects: {{ item()?.publicProjects ?? 0 }}

-

- Public registrations: {{ item()?.publicRegistrations ?? 0 }} -

+

Public registrations: {{ item()?.publicRegistrations ?? 0 }}

Public preprints: {{ item()?.publicPreprints ?? 0 }}

} } diff --git a/src/app/shared/components/resources/resource-card/resource-card.component.ts b/src/app/shared/components/resources/resource-card/resource-card.component.ts index 04a63b20a..009c158f6 100644 --- a/src/app/shared/components/resources/resource-card/resource-card.component.ts +++ b/src/app/shared/components/resources/resource-card/resource-card.component.ts @@ -1,20 +1,10 @@ -import { - Accordion, - AccordionContent, - AccordionHeader, - AccordionPanel, -} from 'primeng/accordion'; +import { Accordion, AccordionContent, AccordionHeader, AccordionPanel } from 'primeng/accordion'; import { Skeleton } from 'primeng/skeleton'; import { finalize } from 'rxjs'; import { DatePipe, NgOptimizedImage } from '@angular/common'; -import { - ChangeDetectionStrategy, - Component, - inject, - model, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, model } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { Resource } from '@osf/features/search/models/resource.entity'; @@ -24,15 +14,7 @@ import { ResourceCardService } from '@shared/components/resources/resource-card/ @Component({ selector: 'osf-resource-card', - imports: [ - Accordion, - AccordionContent, - AccordionHeader, - AccordionPanel, - DatePipe, - NgOptimizedImage, - Skeleton, - ], + imports: [Accordion, AccordionContent, AccordionHeader, AccordionPanel, DatePipe, NgOptimizedImage, Skeleton], templateUrl: './resource-card.component.html', styleUrl: './resource-card.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, @@ -57,7 +39,7 @@ export class ResourceCardComponent { finalize(() => { this.loading = false; this.dataIsLoaded = true; - }), + }) ) .subscribe((res) => { this.item.update( @@ -69,7 +51,7 @@ export class ResourceCardComponent { publicRegistrations: res.registrations, education: res.education, employment: res.employment, - }) as Resource, + }) as Resource ); }); } diff --git a/src/app/shared/components/resources/resource-filters/filters/creators/creators-filter.component.ts b/src/app/shared/components/resources/resource-filters/filters/creators/creators-filter.component.ts index 427411116..b9305ecef 100644 --- a/src/app/shared/components/resources/resource-filters/filters/creators/creators-filter.component.ts +++ b/src/app/shared/components/resources/resource-filters/filters/creators/creators-filter.component.ts @@ -22,10 +22,7 @@ import { GetCreatorsOptions, } from '@shared/components/resources/resource-filters/filters/store/resource-filters-options.actions'; import { ResourceFiltersOptionsSelectors } from '@shared/components/resources/resource-filters/filters/store/resource-filters-options.selectors'; -import { - ResourceFiltersSelectors, - SetCreator, -} from '@shared/components/resources/resource-filters/store'; +import { ResourceFiltersSelectors, SetCreator } from '@shared/components/resources/resource-filters/store'; @Component({ selector: 'osf-creators-filter', @@ -37,9 +34,7 @@ import { export class CreatorsFilterComponent implements OnDestroy { readonly #store = inject(Store); - protected searchCreatorsResults = this.#store.selectSignal( - ResourceFiltersOptionsSelectors.getCreators, - ); + protected searchCreatorsResults = this.#store.selectSignal(ResourceFiltersOptionsSelectors.getCreators); protected creatorsOptions = computed(() => { return this.searchCreatorsResults().map((creator) => ({ label: creator.name, @@ -47,20 +42,14 @@ export class CreatorsFilterComponent implements OnDestroy { })); }); protected creatorsLoading = signal(false); - protected creatorState = this.#store.selectSignal( - ResourceFiltersSelectors.getCreator, - ); + protected creatorState = this.#store.selectSignal(ResourceFiltersSelectors.getCreator); readonly #unsubscribe = new Subject(); protected creatorsInput = signal(null); protected initialization = true; constructor() { toObservable(this.creatorsInput) - .pipe( - debounceTime(500), - distinctUntilChanged(), - takeUntil(this.#unsubscribe), - ) + .pipe(debounceTime(500), distinctUntilChanged(), takeUntil(this.#unsubscribe)) .subscribe((searchText) => { if (!this.initialization) { if (searchText) { @@ -94,9 +83,7 @@ export class CreatorsFilterComponent implements OnDestroy { setCreator(event: SelectChangeEvent): void { if ((event.originalEvent as PointerEvent).pointerId && event.value) { - const creator = this.creatorsOptions().find((p) => - p.label.includes(event.value), - ); + const creator = this.creatorsOptions().find((p) => p.label.includes(event.value)); if (creator) { this.#store.dispatch(new SetCreator(creator.label, creator.id)); this.#store.dispatch(GetAllOptions); diff --git a/src/app/shared/components/resources/resource-filters/filters/date-created/date-created-filter.component.ts b/src/app/shared/components/resources/resource-filters/filters/date-created/date-created-filter.component.ts index 5bd2ee659..3b0b094c0 100644 --- a/src/app/shared/components/resources/resource-filters/filters/date-created/date-created-filter.component.ts +++ b/src/app/shared/components/resources/resource-filters/filters/date-created/date-created-filter.component.ts @@ -2,23 +2,12 @@ import { Store } from '@ngxs/store'; import { Select, SelectChangeEvent } from 'primeng/select'; -import { - ChangeDetectionStrategy, - Component, - computed, - effect, - inject, - signal, - untracked, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, effect, inject, signal, untracked } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { GetAllOptions } from '@shared/components/resources/resource-filters/filters/store/resource-filters-options.actions'; import { ResourceFiltersOptionsSelectors } from '@shared/components/resources/resource-filters/filters/store/resource-filters-options.selectors'; -import { - ResourceFiltersSelectors, - SetDateCreated, -} from '@shared/components/resources/resource-filters/store'; +import { ResourceFiltersSelectors, SetDateCreated } from '@shared/components/resources/resource-filters/store'; @Component({ selector: 'osf-date-created-filter', @@ -30,12 +19,8 @@ import { export class DateCreatedFilterComponent { readonly #store = inject(Store); - protected availableDates = this.#store.selectSignal( - ResourceFiltersOptionsSelectors.getDatesCreated, - ); - protected dateCreatedState = this.#store.selectSignal( - ResourceFiltersSelectors.getDateCreated, - ); + protected availableDates = this.#store.selectSignal(ResourceFiltersOptionsSelectors.getDatesCreated); + protected dateCreatedState = this.#store.selectSignal(ResourceFiltersSelectors.getDateCreated); protected inputDate = signal(null); protected datesOptions = computed(() => { return this.availableDates().map((date) => ({ diff --git a/src/app/shared/components/resources/resource-filters/filters/funder/funder-filter.component.html b/src/app/shared/components/resources/resource-filters/filters/funder/funder-filter.component.html index fd813ff38..f2bba5e1f 100644 --- a/src/app/shared/components/resources/resource-filters/filters/funder/funder-filter.component.html +++ b/src/app/shared/components/resources/resource-filters/filters/funder/funder-filter.component.html @@ -1,7 +1,5 @@
-

- Please select the funder from the dropdown below or start typing for find it -

+

Please select the funder from the dropdown below or start typing for find it

(null); protected fundersOptions = computed(() => { if (this.inputText() !== null) { @@ -75,9 +60,7 @@ export class FunderFilterComponent { setFunders(event: SelectChangeEvent): void { if ((event.originalEvent as PointerEvent).pointerId && event.value) { - const funder = this.fundersOptions()?.find((funder) => - funder.label.includes(event.value), - ); + const funder = this.fundersOptions()?.find((funder) => funder.label.includes(event.value)); if (funder) { this.#store.dispatch(new SetFunder(funder.label, funder.id)); this.#store.dispatch(GetAllOptions); diff --git a/src/app/shared/components/resources/resource-filters/filters/institution-filter/institution-filter.component.html b/src/app/shared/components/resources/resource-filters/filters/institution-filter/institution-filter.component.html index 684603584..0f59afc86 100644 --- a/src/app/shared/components/resources/resource-filters/filters/institution-filter/institution-filter.component.html +++ b/src/app/shared/components/resources/resource-filters/filters/institution-filter/institution-filter.component.html @@ -1,8 +1,5 @@
-

- Please select the institution from the dropdown below or start typing for - find it -

+

Please select the institution from the dropdown below or start typing for find it

(null); protected institutionsOptions = computed(() => { if (this.inputText() !== null) { const search = this.inputText()!.toLowerCase(); return this.availableInstitutions() - .filter((institution) => - institution.label.toLowerCase().includes(search), - ) + .filter((institution) => institution.label.toLowerCase().includes(search)) .map((institution) => ({ labelCount: institution.label + ' (' + institution.count + ')', label: institution.label, @@ -77,13 +60,9 @@ export class InstitutionFilterComponent { setInstitutions(event: SelectChangeEvent): void { if ((event.originalEvent as PointerEvent).pointerId && event.value) { - const institution = this.institutionsOptions()?.find((institution) => - institution.label.includes(event.value), - ); + const institution = this.institutionsOptions()?.find((institution) => institution.label.includes(event.value)); if (institution) { - this.#store.dispatch( - new SetInstitution(institution.label, institution.id), - ); + this.#store.dispatch(new SetInstitution(institution.label, institution.id)); this.#store.dispatch(GetAllOptions); } } else { diff --git a/src/app/shared/components/resources/resource-filters/filters/license-filter/license-filter.component.html b/src/app/shared/components/resources/resource-filters/filters/license-filter/license-filter.component.html index 2fbbb2b18..ce0d34b4d 100644 --- a/src/app/shared/components/resources/resource-filters/filters/license-filter/license-filter.component.html +++ b/src/app/shared/components/resources/resource-filters/filters/license-filter/license-filter.component.html @@ -1,8 +1,5 @@
-

- Please select the license from the dropdown below or start typing for find - it -

+

Please select the license from the dropdown below or start typing for find it

(null); protected licensesOptions = computed(() => { if (this.inputText() !== null) { @@ -73,9 +58,7 @@ export class LicenseFilterComponent { setLicenses(event: SelectChangeEvent): void { if ((event.originalEvent as PointerEvent).pointerId && event.value) { - const license = this.licensesOptions().find((license) => - license.label.includes(event.value), - ); + const license = this.licensesOptions().find((license) => license.label.includes(event.value)); if (license) { this.#store.dispatch(new SetLicense(license.label, license.id)); this.#store.dispatch(GetAllOptions); diff --git a/src/app/shared/components/resources/resource-filters/filters/part-of-collection-filter/part-of-collection-filter.component.html b/src/app/shared/components/resources/resource-filters/filters/part-of-collection-filter/part-of-collection-filter.component.html index b8409b2d8..cd1ea9e8c 100644 --- a/src/app/shared/components/resources/resource-filters/filters/part-of-collection-filter/part-of-collection-filter.component.html +++ b/src/app/shared/components/resources/resource-filters/filters/part-of-collection-filter/part-of-collection-filter.component.html @@ -1,8 +1,5 @@
-

- Please select the partOfCollection from the dropdown below or start typing - for find it -

+

Please select the partOfCollection from the dropdown below or start typing for find it

(null); protected partOfCollectionsOptions = computed(() => { return this.availablePartOfCollections().map((partOfCollection) => ({ @@ -62,9 +47,7 @@ export class PartOfCollectionFilterComponent { setPartOfCollections(event: SelectChangeEvent): void { if ((event.originalEvent as PointerEvent).pointerId && event.value) { - const part = this.partOfCollectionsOptions().find((p) => - p.label.includes(event.value), - ); + const part = this.partOfCollectionsOptions().find((p) => p.label.includes(event.value)); if (part) { this.#store.dispatch(new SetPartOfCollection(part.label, part.id)); this.#store.dispatch(GetAllOptions); diff --git a/src/app/shared/components/resources/resource-filters/filters/provider-filter/provider-filter.component.html b/src/app/shared/components/resources/resource-filters/filters/provider-filter/provider-filter.component.html index 0c2f0e870..3d299cdde 100644 --- a/src/app/shared/components/resources/resource-filters/filters/provider-filter/provider-filter.component.html +++ b/src/app/shared/components/resources/resource-filters/filters/provider-filter/provider-filter.component.html @@ -1,8 +1,5 @@
-

- Please select the provider from the dropdown below or start typing for find - it -

+

Please select the provider from the dropdown below or start typing for find it

(null); protected providersOptions = computed(() => { if (this.inputText() !== null) { @@ -73,9 +58,7 @@ export class ProviderFilterComponent { setProviders(event: SelectChangeEvent): void { if ((event.originalEvent as PointerEvent).pointerId && event.value) { - const provider = this.providersOptions().find((p) => - p.label.includes(event.value), - ); + const provider = this.providersOptions().find((p) => p.label.includes(event.value)); if (provider) { this.#store.dispatch(new SetProvider(provider.label, provider.id)); this.#store.dispatch(GetAllOptions); diff --git a/src/app/shared/components/resources/resource-filters/filters/resource-type-filter/resource-type-filter.component.html b/src/app/shared/components/resources/resource-filters/filters/resource-type-filter/resource-type-filter.component.html index 89d44409f..d001451ad 100644 --- a/src/app/shared/components/resources/resource-filters/filters/resource-type-filter/resource-type-filter.component.html +++ b/src/app/shared/components/resources/resource-filters/filters/resource-type-filter/resource-type-filter.component.html @@ -1,8 +1,5 @@
-

- Please select the resourceType from the dropdown below or start typing for - find it -

+

Please select the resourceType from the dropdown below or start typing for find it

(null); protected resourceTypesOptions = computed(() => { if (this.inputText() !== null) { const search = this.inputText()!.toLowerCase(); return this.availableResourceTypes() - .filter((resourceType) => - resourceType.label.toLowerCase().includes(search), - ) + .filter((resourceType) => resourceType.label.toLowerCase().includes(search)) .map((resourceType) => ({ labelCount: resourceType.label + ' (' + resourceType.count + ')', label: resourceType.label, @@ -75,13 +58,9 @@ export class ResourceTypeFilterComponent { setResourceTypes(event: SelectChangeEvent): void { if ((event.originalEvent as PointerEvent).pointerId && event.value) { - const resourceType = this.resourceTypesOptions().find((p) => - p.label.includes(event.value), - ); + const resourceType = this.resourceTypesOptions().find((p) => p.label.includes(event.value)); if (resourceType) { - this.#store.dispatch( - new SetResourceType(resourceType.label, resourceType.id), - ); + this.#store.dispatch(new SetResourceType(resourceType.label, resourceType.id)); this.#store.dispatch(GetAllOptions); } } else { diff --git a/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.actions.ts b/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.actions.ts index 5f7687cfe..b538f026a 100644 --- a/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.actions.ts +++ b/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.actions.ts @@ -33,8 +33,7 @@ export class GetProvidersOptions { } export class GetPartOfCollectionOptions { - static readonly type = - '[Resource Filters Options] Get Part Of Collection Options'; + static readonly type = '[Resource Filters Options] Get Part Of Collection Options'; } export class GetAllOptions { diff --git a/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.selectors.ts b/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.selectors.ts index 4b7a834d9..3165f0140 100644 --- a/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.selectors.ts +++ b/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.selectors.ts @@ -19,9 +19,7 @@ export class ResourceFiltersOptionsSelectors { } @Selector([ResourceFiltersOptionsState]) - static getDatesCreated( - state: ResourceFiltersOptionsStateModel, - ): DateCreated[] { + static getDatesCreated(state: ResourceFiltersOptionsStateModel): DateCreated[] { return state.datesCreated; } @@ -41,37 +39,27 @@ export class ResourceFiltersOptionsSelectors { } @Selector([ResourceFiltersOptionsState]) - static getResourceTypes( - state: ResourceFiltersOptionsStateModel, - ): ResourceTypeFilter[] { + static getResourceTypes(state: ResourceFiltersOptionsStateModel): ResourceTypeFilter[] { return state.resourceTypes; } @Selector([ResourceFiltersOptionsState]) - static getInstitutions( - state: ResourceFiltersOptionsStateModel, - ): InstitutionFilter[] { + static getInstitutions(state: ResourceFiltersOptionsStateModel): InstitutionFilter[] { return state.institutions; } @Selector([ResourceFiltersOptionsState]) - static getProviders( - state: ResourceFiltersOptionsStateModel, - ): ProviderFilter[] { + static getProviders(state: ResourceFiltersOptionsStateModel): ProviderFilter[] { return state.providers; } @Selector([ResourceFiltersOptionsState]) - static getPartOfCollection( - state: ResourceFiltersOptionsStateModel, - ): PartOfCollectionFilter[] { + static getPartOfCollection(state: ResourceFiltersOptionsStateModel): PartOfCollectionFilter[] { return state.partOfCollection; } @Selector([ResourceFiltersOptionsState]) - static getAllOptions( - state: ResourceFiltersOptionsStateModel, - ): ResourceFiltersOptionsStateModel { + static getAllOptions(state: ResourceFiltersOptionsStateModel): ResourceFiltersOptionsStateModel { return { ...state, }; diff --git a/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.state.ts b/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.state.ts index bae422cfb..2329c5709 100644 --- a/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.state.ts +++ b/src/app/shared/components/resources/resource-filters/filters/store/resource-filters-options.state.ts @@ -39,10 +39,7 @@ export class ResourceFiltersOptionsState { readonly #resourceFiltersService = inject(ResourceFiltersService); @Action(GetCreatorsOptions) - getProjects( - ctx: StateContext, - action: GetCreatorsOptions, - ) { + getProjects(ctx: StateContext, action: GetCreatorsOptions) { if (!action.searchName) { ctx.patchState({ creators: [] }); return []; @@ -51,7 +48,7 @@ export class ResourceFiltersOptionsState { return this.#resourceFiltersService.getCreators(action.searchName).pipe( tap((creators) => { ctx.patchState({ creators: creators }); - }), + }) ); } @@ -60,7 +57,7 @@ export class ResourceFiltersOptionsState { return this.#resourceFiltersService.getDates().pipe( tap((datesCreated) => { ctx.patchState({ datesCreated: datesCreated }); - }), + }) ); } @@ -69,7 +66,7 @@ export class ResourceFiltersOptionsState { return this.#resourceFiltersService.getFunders().pipe( tap((funders) => { ctx.patchState({ funders: funders }); - }), + }) ); } @@ -78,7 +75,7 @@ export class ResourceFiltersOptionsState { return this.#resourceFiltersService.getSubjects().pipe( tap((subjects) => { ctx.patchState({ subjects: subjects }); - }), + }) ); } @@ -87,7 +84,7 @@ export class ResourceFiltersOptionsState { return this.#resourceFiltersService.getLicenses().pipe( tap((licenses) => { ctx.patchState({ licenses: licenses }); - }), + }) ); } @@ -96,7 +93,7 @@ export class ResourceFiltersOptionsState { return this.#resourceFiltersService.getResourceTypes().pipe( tap((resourceTypes) => { ctx.patchState({ resourceTypes: resourceTypes }); - }), + }) ); } @@ -105,7 +102,7 @@ export class ResourceFiltersOptionsState { return this.#resourceFiltersService.getInstitutions().pipe( tap((institutions) => { ctx.patchState({ institutions: institutions }); - }), + }) ); } @@ -114,7 +111,7 @@ export class ResourceFiltersOptionsState { return this.#resourceFiltersService.getProviders().pipe( tap((providers) => { ctx.patchState({ providers: providers }); - }), + }) ); } @Action(GetPartOfCollectionOptions) @@ -122,7 +119,7 @@ export class ResourceFiltersOptionsState { return this.#resourceFiltersService.getPartOtCollections().pipe( tap((partOfCollection) => { ctx.patchState({ partOfCollection: partOfCollection }); - }), + }) ); } diff --git a/src/app/shared/components/resources/resource-filters/filters/subject/subject-filter.component.html b/src/app/shared/components/resources/resource-filters/filters/subject/subject-filter.component.html index dd18db123..a33f1f7af 100644 --- a/src/app/shared/components/resources/resource-filters/filters/subject/subject-filter.component.html +++ b/src/app/shared/components/resources/resource-filters/filters/subject/subject-filter.component.html @@ -1,8 +1,5 @@
-

- Please select the subject from the dropdown below or start typing for find - it -

+

Please select the subject from the dropdown below or start typing for find it

(null); protected subjectsOptions = computed(() => { if (this.inputText() !== null) { @@ -73,9 +58,7 @@ export class SubjectFilterComponent { setSubject(event: SelectChangeEvent): void { if ((event.originalEvent as PointerEvent).pointerId && event.value) { - const subject = this.subjectsOptions().find((p) => - p.label.includes(event.value), - ); + const subject = this.subjectsOptions().find((p) => p.label.includes(event.value)); if (subject) { this.#store.dispatch(new SetSubject(subject.label, subject.id)); this.#store.dispatch(GetAllOptions); diff --git a/src/app/shared/components/resources/resource-filters/mappers/dateCreated/date-created.mapper.ts b/src/app/shared/components/resources/resource-filters/mappers/dateCreated/date-created.mapper.ts index 8c390d008..736d1769d 100644 --- a/src/app/shared/components/resources/resource-filters/mappers/dateCreated/date-created.mapper.ts +++ b/src/app/shared/components/resources/resource-filters/mappers/dateCreated/date-created.mapper.ts @@ -11,12 +11,9 @@ export function MapDateCreated(items: IndexValueSearch[]): DateCreated[] { for (const item of items) { if (item.type === 'search-result') { - const indexCard = items.find( - (p) => p.id === item.relationships.indexCard.data.id, - ); + const indexCard = items.find((p) => p.id === item.relationships.indexCard.data.id); datesCreated.push({ - value: (indexCard as IndexCardFilter).attributes.resourceMetadata - .displayLabel[0]['@value'], + value: (indexCard as IndexCardFilter).attributes.resourceMetadata.displayLabel[0]['@value'], count: item.attributes.cardSearchResultCount, }); } diff --git a/src/app/shared/components/resources/resource-filters/mappers/funder/funder.mapper.ts b/src/app/shared/components/resources/resource-filters/mappers/funder/funder.mapper.ts index 518ffe7ae..65062ed2b 100644 --- a/src/app/shared/components/resources/resource-filters/mappers/funder/funder.mapper.ts +++ b/src/app/shared/components/resources/resource-filters/mappers/funder/funder.mapper.ts @@ -11,15 +11,10 @@ export function MapFunders(items: FunderIndexValueSearch[]): FunderFilter[] { for (const item of items) { if (item.type === 'search-result') { - const indexCard = items.find( - (p) => p.id === item.relationships.indexCard.data.id, - ); + const indexCard = items.find((p) => p.id === item.relationships.indexCard.data.id); funders.push({ - id: (indexCard as FunderIndexCardFilter).attributes.resourceMetadata?.[ - '@id' - ], - label: (indexCard as FunderIndexCardFilter).attributes.resourceMetadata - ?.name?.[0]?.['@value'], + id: (indexCard as FunderIndexCardFilter).attributes.resourceMetadata?.['@id'], + label: (indexCard as FunderIndexCardFilter).attributes.resourceMetadata?.name?.[0]?.['@value'], count: item.attributes.cardSearchResultCount, }); } diff --git a/src/app/shared/components/resources/resource-filters/mappers/institution/institution.mapper.ts b/src/app/shared/components/resources/resource-filters/mappers/institution/institution.mapper.ts index 36bf95c5d..e9c34df34 100644 --- a/src/app/shared/components/resources/resource-filters/mappers/institution/institution.mapper.ts +++ b/src/app/shared/components/resources/resource-filters/mappers/institution/institution.mapper.ts @@ -2,9 +2,7 @@ import { InstitutionFilter } from '@shared/components/resources/resource-filters import { InstitutionIndexCardFilter } from '@shared/components/resources/resource-filters/models/institution/institution-index-card-filter.entity'; import { InstitutionIndexValueSearch } from '@shared/components/resources/resource-filters/models/institution/institution-index-value-search.entity'; -export function MapInstitutions( - items: InstitutionIndexValueSearch[], -): InstitutionFilter[] { +export function MapInstitutions(items: InstitutionIndexValueSearch[]): InstitutionFilter[] { const institutions: InstitutionFilter[] = []; if (!items) { @@ -13,14 +11,10 @@ export function MapInstitutions( for (const item of items) { if (item.type === 'search-result') { - const indexCard = items.find( - (p) => p.id === item.relationships.indexCard.data.id, - ); + const indexCard = items.find((p) => p.id === item.relationships.indexCard.data.id); institutions.push({ - id: (indexCard as InstitutionIndexCardFilter).attributes - .resourceMetadata?.['@id'], - label: (indexCard as InstitutionIndexCardFilter).attributes - .resourceMetadata?.name?.[0]?.['@value'], + id: (indexCard as InstitutionIndexCardFilter).attributes.resourceMetadata?.['@id'], + label: (indexCard as InstitutionIndexCardFilter).attributes.resourceMetadata?.name?.[0]?.['@value'], count: item.attributes.cardSearchResultCount, }); } diff --git a/src/app/shared/components/resources/resource-filters/mappers/license/license.mapper.ts b/src/app/shared/components/resources/resource-filters/mappers/license/license.mapper.ts index 998fc85a6..287e8e2b0 100644 --- a/src/app/shared/components/resources/resource-filters/mappers/license/license.mapper.ts +++ b/src/app/shared/components/resources/resource-filters/mappers/license/license.mapper.ts @@ -11,15 +11,10 @@ export function MapLicenses(items: LicenseIndexValueSearch[]): LicenseFilter[] { for (const item of items) { if (item.type === 'search-result') { - const indexCard = items.find( - (p) => p.id === item.relationships.indexCard.data.id, - ); + const indexCard = items.find((p) => p.id === item.relationships.indexCard.data.id); licenses.push({ - id: (indexCard as LicenseIndexCardFilter).attributes.resourceMetadata?.[ - '@id' - ], - label: (indexCard as LicenseIndexCardFilter).attributes.resourceMetadata - ?.name?.[0]?.['@value'], + id: (indexCard as LicenseIndexCardFilter).attributes.resourceMetadata?.['@id'], + label: (indexCard as LicenseIndexCardFilter).attributes.resourceMetadata?.name?.[0]?.['@value'], count: item.attributes.cardSearchResultCount, }); } diff --git a/src/app/shared/components/resources/resource-filters/mappers/part-of-collection/part-of-collection.mapper.ts b/src/app/shared/components/resources/resource-filters/mappers/part-of-collection/part-of-collection.mapper.ts index 8db0e5301..397d166fe 100644 --- a/src/app/shared/components/resources/resource-filters/mappers/part-of-collection/part-of-collection.mapper.ts +++ b/src/app/shared/components/resources/resource-filters/mappers/part-of-collection/part-of-collection.mapper.ts @@ -2,9 +2,7 @@ import { PartOfCollectionFilter } from '@shared/components/resources/resource-fi import { PartOfCollectionIndexCardFilter } from '@shared/components/resources/resource-filters/models/part-of-collection/part-of-collection-index-card-filter.entity'; import { PartOfCollectionIndexValueSearch } from '@shared/components/resources/resource-filters/models/part-of-collection/part-of-collection-index-value-search.entity'; -export function MapPartOfCollections( - items: PartOfCollectionIndexValueSearch[], -): PartOfCollectionFilter[] { +export function MapPartOfCollections(items: PartOfCollectionIndexValueSearch[]): PartOfCollectionFilter[] { const partOfCollections: PartOfCollectionFilter[] = []; if (!items) { @@ -13,14 +11,10 @@ export function MapPartOfCollections( for (const item of items) { if (item.type === 'search-result') { - const indexCard = items.find( - (p) => p.id === item.relationships.indexCard.data.id, - ); + const indexCard = items.find((p) => p.id === item.relationships.indexCard.data.id); partOfCollections.push({ - id: (indexCard as PartOfCollectionIndexCardFilter).attributes - .resourceMetadata?.['@id'], - label: (indexCard as PartOfCollectionIndexCardFilter).attributes - .resourceMetadata?.title?.[0]?.['@value'], + id: (indexCard as PartOfCollectionIndexCardFilter).attributes.resourceMetadata?.['@id'], + label: (indexCard as PartOfCollectionIndexCardFilter).attributes.resourceMetadata?.title?.[0]?.['@value'], count: item.attributes.cardSearchResultCount, }); } diff --git a/src/app/shared/components/resources/resource-filters/mappers/provider/provider.mapper.ts b/src/app/shared/components/resources/resource-filters/mappers/provider/provider.mapper.ts index eceab0354..46eca9156 100644 --- a/src/app/shared/components/resources/resource-filters/mappers/provider/provider.mapper.ts +++ b/src/app/shared/components/resources/resource-filters/mappers/provider/provider.mapper.ts @@ -2,9 +2,7 @@ import { ProviderFilter } from '@shared/components/resources/resource-filters/mo import { ProviderIndexCardFilter } from '@shared/components/resources/resource-filters/models/provider/provider-index-card-filter.entity'; import { ProviderIndexValueSearch } from '@shared/components/resources/resource-filters/models/provider/provider-index-value-search.entity'; -export function MapProviders( - items: ProviderIndexValueSearch[], -): ProviderFilter[] { +export function MapProviders(items: ProviderIndexValueSearch[]): ProviderFilter[] { const providers: ProviderFilter[] = []; if (!items) { @@ -13,14 +11,10 @@ export function MapProviders( for (const item of items) { if (item.type === 'search-result') { - const indexCard = items.find( - (p) => p.id === item.relationships.indexCard.data.id, - ); + const indexCard = items.find((p) => p.id === item.relationships.indexCard.data.id); providers.push({ - id: (indexCard as ProviderIndexCardFilter).attributes - .resourceMetadata?.['@id'], - label: (indexCard as ProviderIndexCardFilter).attributes - .resourceMetadata?.name?.[0]?.['@value'], + id: (indexCard as ProviderIndexCardFilter).attributes.resourceMetadata?.['@id'], + label: (indexCard as ProviderIndexCardFilter).attributes.resourceMetadata?.name?.[0]?.['@value'], count: item.attributes.cardSearchResultCount, }); } diff --git a/src/app/shared/components/resources/resource-filters/mappers/resource-type/resource-type.mapper.ts b/src/app/shared/components/resources/resource-filters/mappers/resource-type/resource-type.mapper.ts index 46236022c..9bd0c0e14 100644 --- a/src/app/shared/components/resources/resource-filters/mappers/resource-type/resource-type.mapper.ts +++ b/src/app/shared/components/resources/resource-filters/mappers/resource-type/resource-type.mapper.ts @@ -2,9 +2,7 @@ import { ResourceTypeFilter } from '@shared/components/resources/resource-filter import { ResourceTypeIndexCardFilter } from '@shared/components/resources/resource-filters/models/resource-type/resource-type-index-card-filter.entity'; import { ResourceTypeIndexValueSearch } from '@shared/components/resources/resource-filters/models/resource-type/resource-type-index-value-search.entity'; -export function MapResourceType( - items: ResourceTypeIndexValueSearch[], -): ResourceTypeFilter[] { +export function MapResourceType(items: ResourceTypeIndexValueSearch[]): ResourceTypeFilter[] { const resourceTypes: ResourceTypeFilter[] = []; if (!items) { @@ -13,14 +11,10 @@ export function MapResourceType( for (const item of items) { if (item.type === 'search-result') { - const indexCard = items.find( - (p) => p.id === item.relationships.indexCard.data.id, - ); + const indexCard = items.find((p) => p.id === item.relationships.indexCard.data.id); resourceTypes.push({ - id: (indexCard as ResourceTypeIndexCardFilter).attributes - .resourceMetadata?.['@id'], - label: (indexCard as ResourceTypeIndexCardFilter).attributes - .resourceMetadata?.displayLabel?.[0]?.['@value'], + id: (indexCard as ResourceTypeIndexCardFilter).attributes.resourceMetadata?.['@id'], + label: (indexCard as ResourceTypeIndexCardFilter).attributes.resourceMetadata?.displayLabel?.[0]?.['@value'], count: item.attributes.cardSearchResultCount, }); } diff --git a/src/app/shared/components/resources/resource-filters/mappers/subject/subject.mapper.ts b/src/app/shared/components/resources/resource-filters/mappers/subject/subject.mapper.ts index 66ed126ac..77336572e 100644 --- a/src/app/shared/components/resources/resource-filters/mappers/subject/subject.mapper.ts +++ b/src/app/shared/components/resources/resource-filters/mappers/subject/subject.mapper.ts @@ -11,13 +11,10 @@ export function MapSubject(items: IndexValueSearch[]): SubjectFilter[] { for (const item of items) { if (item.type === 'search-result') { - const indexCard = items.find( - (p) => p.id === item.relationships.indexCard.data.id, - ); + const indexCard = items.find((p) => p.id === item.relationships.indexCard.data.id); subjects.push({ id: (indexCard as IndexCardFilter).attributes.resourceMetadata?.['@id'], - label: (indexCard as IndexCardFilter).attributes.resourceMetadata - ?.displayLabel?.[0]?.['@value'], + label: (indexCard as IndexCardFilter).attributes.resourceMetadata?.displayLabel?.[0]?.['@value'], count: item.attributes.cardSearchResultCount, }); } diff --git a/src/app/shared/components/resources/resource-filters/models/institution/institution-index-value-search.entity.ts b/src/app/shared/components/resources/resource-filters/models/institution/institution-index-value-search.entity.ts index 32088406b..75f4649f8 100644 --- a/src/app/shared/components/resources/resource-filters/models/institution/institution-index-value-search.entity.ts +++ b/src/app/shared/components/resources/resource-filters/models/institution/institution-index-value-search.entity.ts @@ -1,6 +1,4 @@ import { InstitutionIndexCardFilter } from '@shared/components/resources/resource-filters/models/institution/institution-index-card-filter.entity'; import { SearchResultCount } from '@shared/components/resources/resource-filters/models/search-result-count.entity'; -export type InstitutionIndexValueSearch = - | SearchResultCount - | InstitutionIndexCardFilter; +export type InstitutionIndexValueSearch = SearchResultCount | InstitutionIndexCardFilter; diff --git a/src/app/shared/components/resources/resource-filters/models/license/license-index-value-search.entity.ts b/src/app/shared/components/resources/resource-filters/models/license/license-index-value-search.entity.ts index 55f812d45..2f2275125 100644 --- a/src/app/shared/components/resources/resource-filters/models/license/license-index-value-search.entity.ts +++ b/src/app/shared/components/resources/resource-filters/models/license/license-index-value-search.entity.ts @@ -1,6 +1,4 @@ import { LicenseIndexCardFilter } from '@shared/components/resources/resource-filters/models/license/license-index-card-filter.entity'; import { SearchResultCount } from '@shared/components/resources/resource-filters/models/search-result-count.entity'; -export type LicenseIndexValueSearch = - | SearchResultCount - | LicenseIndexCardFilter; +export type LicenseIndexValueSearch = SearchResultCount | LicenseIndexCardFilter; diff --git a/src/app/shared/components/resources/resource-filters/models/part-of-collection/part-of-collection-index-value-search.entity.ts b/src/app/shared/components/resources/resource-filters/models/part-of-collection/part-of-collection-index-value-search.entity.ts index 7babbf73b..18add9ae1 100644 --- a/src/app/shared/components/resources/resource-filters/models/part-of-collection/part-of-collection-index-value-search.entity.ts +++ b/src/app/shared/components/resources/resource-filters/models/part-of-collection/part-of-collection-index-value-search.entity.ts @@ -1,6 +1,4 @@ import { PartOfCollectionIndexCardFilter } from '@shared/components/resources/resource-filters/models/part-of-collection/part-of-collection-index-card-filter.entity'; import { SearchResultCount } from '@shared/components/resources/resource-filters/models/search-result-count.entity'; -export type PartOfCollectionIndexValueSearch = - | SearchResultCount - | PartOfCollectionIndexCardFilter; +export type PartOfCollectionIndexValueSearch = SearchResultCount | PartOfCollectionIndexCardFilter; diff --git a/src/app/shared/components/resources/resource-filters/models/provider/provider-index-value-search.entity.ts b/src/app/shared/components/resources/resource-filters/models/provider/provider-index-value-search.entity.ts index c4222a50e..0a20d358d 100644 --- a/src/app/shared/components/resources/resource-filters/models/provider/provider-index-value-search.entity.ts +++ b/src/app/shared/components/resources/resource-filters/models/provider/provider-index-value-search.entity.ts @@ -1,6 +1,4 @@ import { ProviderIndexCardFilter } from '@shared/components/resources/resource-filters/models/provider/provider-index-card-filter.entity'; import { SearchResultCount } from '@shared/components/resources/resource-filters/models/search-result-count.entity'; -export type ProviderIndexValueSearch = - | SearchResultCount - | ProviderIndexCardFilter; +export type ProviderIndexValueSearch = SearchResultCount | ProviderIndexCardFilter; diff --git a/src/app/shared/components/resources/resource-filters/models/resource-type/resource-type-index-value-search.entity.ts b/src/app/shared/components/resources/resource-filters/models/resource-type/resource-type-index-value-search.entity.ts index a5a0b19ea..bc3dc6d4f 100644 --- a/src/app/shared/components/resources/resource-filters/models/resource-type/resource-type-index-value-search.entity.ts +++ b/src/app/shared/components/resources/resource-filters/models/resource-type/resource-type-index-value-search.entity.ts @@ -1,6 +1,4 @@ import { ResourceTypeIndexCardFilter } from '@shared/components/resources/resource-filters/models/resource-type/resource-type-index-card-filter.entity'; import { SearchResultCount } from '@shared/components/resources/resource-filters/models/search-result-count.entity'; -export type ResourceTypeIndexValueSearch = - | SearchResultCount - | ResourceTypeIndexCardFilter; +export type ResourceTypeIndexValueSearch = SearchResultCount | ResourceTypeIndexCardFilter; diff --git a/src/app/shared/components/resources/resource-filters/resource-filters.component.ts b/src/app/shared/components/resources/resource-filters/resource-filters.component.ts index 581a2fc43..ed56a3991 100644 --- a/src/app/shared/components/resources/resource-filters/resource-filters.component.ts +++ b/src/app/shared/components/resources/resource-filters/resource-filters.component.ts @@ -1,19 +1,9 @@ import { Store } from '@ngxs/store'; -import { - Accordion, - AccordionContent, - AccordionHeader, - AccordionPanel, -} from 'primeng/accordion'; +import { Accordion, AccordionContent, AccordionHeader, AccordionPanel } from 'primeng/accordion'; import { AutoCompleteModule } from 'primeng/autocomplete'; -import { - ChangeDetectionStrategy, - Component, - computed, - inject, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { SearchSelectors } from '@osf/features/search/store'; @@ -63,48 +53,46 @@ export class ResourceFiltersComponent { readonly funderOptionsCount = computed(() => this.#store .selectSignal(ResourceFiltersOptionsSelectors.getFunders)() - .reduce((acc, item) => acc + item.count, 0), + .reduce((acc, item) => acc + item.count, 0) ); readonly subjectOptionsCount = computed(() => this.#store .selectSignal(ResourceFiltersOptionsSelectors.getSubjects)() - .reduce((acc, item) => acc + item.count, 0), + .reduce((acc, item) => acc + item.count, 0) ); readonly licenseOptionsCount = computed(() => this.#store .selectSignal(ResourceFiltersOptionsSelectors.getLicenses)() - .reduce((acc, item) => acc + item.count, 0), + .reduce((acc, item) => acc + item.count, 0) ); readonly resourceTypeOptionsCount = computed(() => this.#store .selectSignal(ResourceFiltersOptionsSelectors.getResourceTypes)() - .reduce((acc, item) => acc + item.count, 0), + .reduce((acc, item) => acc + item.count, 0) ); readonly institutionOptionsCount = computed(() => this.#store .selectSignal(ResourceFiltersOptionsSelectors.getInstitutions)() - .reduce((acc, item) => acc + item.count, 0), + .reduce((acc, item) => acc + item.count, 0) ); readonly providerOptionsCount = computed(() => this.#store .selectSignal(ResourceFiltersOptionsSelectors.getProviders)() - .reduce((acc, item) => acc + item.count, 0), + .reduce((acc, item) => acc + item.count, 0) ); readonly partOfCollectionOptionsCount = computed(() => this.#store .selectSignal(ResourceFiltersOptionsSelectors.getPartOfCollection)() - .reduce((acc, item) => acc + item.count, 0), + .reduce((acc, item) => acc + item.count, 0) ); - readonly isMyProfilePage = this.#store.selectSignal( - SearchSelectors.getIsMyProfile, - ); + readonly isMyProfilePage = this.#store.selectSignal(SearchSelectors.getIsMyProfile); readonly anyOptionsCount = computed(() => { return ( diff --git a/src/app/shared/components/resources/resource-filters/resource-filters.service.ts b/src/app/shared/components/resources/resource-filters/resource-filters.service.ts index c6b6a4b61..1582b78ac 100644 --- a/src/app/shared/components/resources/resource-filters/resource-filters.service.ts +++ b/src/app/shared/components/resources/resource-filters/resource-filters.service.ts @@ -4,10 +4,7 @@ import { map, Observable } from 'rxjs'; import { inject, Injectable } from '@angular/core'; -import { - ApiData, - JsonApiResponse, -} from '@core/services/json-api/json-api.entity'; +import { ApiData, JsonApiResponse } from '@core/services/json-api/json-api.entity'; import { JsonApiService } from '@core/services/json-api/json-api.service'; import { SearchSelectors } from '@osf/features/search/store'; import { getResourceTypes } from '@osf/features/search/utils/helpers/get-resource-types.helper'; @@ -49,26 +46,19 @@ export class ResourceFiltersService { #store = inject(Store); #getFilterParams(): Record { - return addFiltersParams( - this.#store.selectSignal(ResourceFiltersSelectors.getAllFilters)(), - ); + return addFiltersParams(this.#store.selectSignal(ResourceFiltersSelectors.getAllFilters)()); } #getParams(): Record { const params: Record = {}; - const resourceTab = this.#store.selectSnapshot( - SearchSelectors.getResourceTab, - ); + const resourceTab = this.#store.selectSnapshot(SearchSelectors.getResourceTab); const resourceTypes = getResourceTypes(resourceTab); - const searchText = this.#store.selectSnapshot( - SearchSelectors.getSearchText, - ); + const searchText = this.#store.selectSnapshot(SearchSelectors.getSearchText); const sort = this.#store.selectSnapshot(SearchSelectors.getSortBy); params['cardSearchFilter[resourceType]'] = resourceTypes; params['cardSearchFilter[accessService]'] = 'https://staging4.osf.io/'; - params['cardSearchText[*,creator.name,isContainedBy.creator.name]'] = - searchText; + params['cardSearchText[*,creator.name,isContainedBy.creator.name]'] = searchText; params['page[size]'] = '10'; params['sort'] = sort; return params; @@ -88,22 +78,15 @@ export class ResourceFiltersService { return this.#jsonApiService .get< - JsonApiResponse< - null, - ApiData<{ resourceMetadata: CreatorItem }, null, null>[] - > + JsonApiResponse[]> >(`${environment.shareDomainUrl}/index-value-search`, fullParams) .pipe( map((response) => { - const included = (response?.included ?? []) as ApiData< - { resourceMetadata: CreatorItem }, - null, - null - >[]; + const included = (response?.included ?? []) as ApiData<{ resourceMetadata: CreatorItem }, null, null>[]; return included .filter((item) => item.type === 'index-card') .map((item) => MapCreators(item.attributes.resourceMetadata)); - }), + }) ); } @@ -119,9 +102,7 @@ export class ResourceFiltersService { }; return this.#jsonApiService - .get< - JsonApiResponse - >(`${environment.shareDomainUrl}/index-value-search`, fullParams) + .get>(`${environment.shareDomainUrl}/index-value-search`, fullParams) .pipe(map((response) => MapDateCreated(response?.included ?? []))); } @@ -155,9 +136,7 @@ export class ResourceFiltersService { }; return this.#jsonApiService - .get< - JsonApiResponse - >(`${environment.shareDomainUrl}/index-value-search`, fullParams) + .get>(`${environment.shareDomainUrl}/index-value-search`, fullParams) .pipe(map((response) => MapSubject(response?.included ?? []))); } diff --git a/src/app/shared/components/resources/resource-filters/store/resource-filters.actions.ts b/src/app/shared/components/resources/resource-filters/store/resource-filters.actions.ts index 1b371a84d..b97d653ed 100644 --- a/src/app/shared/components/resources/resource-filters/store/resource-filters.actions.ts +++ b/src/app/shared/components/resources/resource-filters/store/resource-filters.actions.ts @@ -2,7 +2,7 @@ export class SetCreator { static readonly type = '[Resource Filters] Set Creator'; constructor( public name: string, - public id: string, + public id: string ) {} } @@ -15,7 +15,7 @@ export class SetFunder { static readonly type = '[Resource Filters] Set Funder'; constructor( public funder: string, - public id: string, + public id: string ) {} } @@ -23,7 +23,7 @@ export class SetSubject { static readonly type = '[Resource Filters] Set Subject'; constructor( public subject: string, - public id: string, + public id: string ) {} } @@ -31,7 +31,7 @@ export class SetLicense { static readonly type = '[Resource Filters] Set License'; constructor( public license: string, - public id: string, + public id: string ) {} } @@ -39,7 +39,7 @@ export class SetResourceType { static readonly type = '[Resource Filters] Set Resource Type'; constructor( public resourceType: string, - public id: string, + public id: string ) {} } @@ -47,7 +47,7 @@ export class SetInstitution { static readonly type = '[Resource Filters] Set Institution'; constructor( public institution: string, - public id: string, + public id: string ) {} } @@ -55,7 +55,7 @@ export class SetProvider { static readonly type = '[Resource Filters] Set Provider'; constructor( public provider: string, - public id: string, + public id: string ) {} } @@ -63,7 +63,7 @@ export class SetPartOfCollection { static readonly type = '[Resource Filters] Set PartOfCollection'; constructor( public partOfCollection: string, - public id: string, + public id: string ) {} } diff --git a/src/app/shared/components/resources/resource-filters/store/resource-filters.selectors.ts b/src/app/shared/components/resources/resource-filters/store/resource-filters.selectors.ts index c710c3e91..69d1e5213 100644 --- a/src/app/shared/components/resources/resource-filters/store/resource-filters.selectors.ts +++ b/src/app/shared/components/resources/resource-filters/store/resource-filters.selectors.ts @@ -8,9 +8,7 @@ import { ResourceFiltersState } from '@shared/components/resources/resource-filt export class ResourceFiltersSelectors { @Selector([ResourceFiltersState]) - static getAllFilters( - state: ResourceFiltersStateModel, - ): ResourceFiltersStateModel { + static getAllFilters(state: ResourceFiltersStateModel): ResourceFiltersStateModel { return { ...state, }; @@ -42,9 +40,7 @@ export class ResourceFiltersSelectors { } @Selector([ResourceFiltersState]) - static getResourceType( - state: ResourceFiltersStateModel, - ): ResourceFilterLabel { + static getResourceType(state: ResourceFiltersStateModel): ResourceFilterLabel { return state.resourceType; } @@ -59,9 +55,7 @@ export class ResourceFiltersSelectors { } @Selector([ResourceFiltersState]) - static getPartOfCollection( - state: ResourceFiltersStateModel, - ): ResourceFilterLabel { + static getPartOfCollection(state: ResourceFiltersStateModel): ResourceFilterLabel { return state.partOfCollection; } } diff --git a/src/app/shared/components/resources/resource-filters/store/resource-filters.state.ts b/src/app/shared/components/resources/resource-filters/store/resource-filters.state.ts index b49440b2c..b81694382 100644 --- a/src/app/shared/components/resources/resource-filters/store/resource-filters.state.ts +++ b/src/app/shared/components/resources/resource-filters/store/resource-filters.state.ts @@ -37,10 +37,7 @@ export class ResourceFiltersState { } @Action(SetDateCreated) - setDateCreated( - ctx: StateContext, - action: SetDateCreated, - ) { + setDateCreated(ctx: StateContext, action: SetDateCreated) { ctx.patchState({ dateCreated: { filterName: FilterLabels.dateCreated, @@ -84,10 +81,7 @@ export class ResourceFiltersState { } @Action(SetResourceType) - setResourceType( - ctx: StateContext, - action: SetResourceType, - ) { + setResourceType(ctx: StateContext, action: SetResourceType) { ctx.patchState({ resourceType: { filterName: FilterLabels.resourceType, @@ -98,10 +92,7 @@ export class ResourceFiltersState { } @Action(SetInstitution) - setInstitution( - ctx: StateContext, - action: SetInstitution, - ) { + setInstitution(ctx: StateContext, action: SetInstitution) { ctx.patchState({ institution: { filterName: FilterLabels.institution, @@ -112,10 +103,7 @@ export class ResourceFiltersState { } @Action(SetProvider) - setProvider( - ctx: StateContext, - action: SetProvider, - ) { + setProvider(ctx: StateContext, action: SetProvider) { ctx.patchState({ provider: { filterName: FilterLabels.provider, @@ -126,10 +114,7 @@ export class ResourceFiltersState { } @Action(SetPartOfCollection) - setPartOfCollection( - ctx: StateContext, - action: SetPartOfCollection, - ) { + setPartOfCollection(ctx: StateContext, action: SetPartOfCollection) { ctx.patchState({ partOfCollection: { filterName: FilterLabels.partOfCollection, diff --git a/src/app/shared/components/resources/resource-filters/utils/add-filters-params.helper.ts b/src/app/shared/components/resources/resource-filters/utils/add-filters-params.helper.ts index e60cf5bf0..65d9d4b21 100644 --- a/src/app/shared/components/resources/resource-filters/utils/add-filters-params.helper.ts +++ b/src/app/shared/components/resources/resource-filters/utils/add-filters-params.helper.ts @@ -1,8 +1,6 @@ import { ResourceFiltersStateModel } from '@shared/components/resources/resource-filters/store'; -export function addFiltersParams( - filters: ResourceFiltersStateModel, -): Record { +export function addFiltersParams(filters: ResourceFiltersStateModel): Record { const params: Record = {}; if (filters.creator.value) { @@ -30,8 +28,7 @@ export function addFiltersParams( params['cardSearchFilter[publisher][]'] = filters.provider.value; } if (filters.partOfCollection.value) { - params['cardSearchFilter[isPartOfCollection][]'] = - filters.partOfCollection.value; + params['cardSearchFilter[isPartOfCollection][]'] = filters.partOfCollection.value; } return params; diff --git a/src/app/shared/components/resources/resources-wrapper/resources-wrapper.component.ts b/src/app/shared/components/resources/resources-wrapper/resources-wrapper.component.ts index 7788f1a8c..26175b31b 100644 --- a/src/app/shared/components/resources/resources-wrapper/resources-wrapper.component.ts +++ b/src/app/shared/components/resources/resources-wrapper/resources-wrapper.component.ts @@ -2,22 +2,11 @@ import { Store } from '@ngxs/store'; import { take } from 'rxjs'; -import { - ChangeDetectionStrategy, - Component, - effect, - inject, - OnInit, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, effect, inject, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ResourceTab } from '@osf/features/search/models/resource-tab.enum'; -import { - SearchSelectors, - SetResourceTab, - SetSearchText, - SetSortBy, -} from '@osf/features/search/store'; +import { SearchSelectors, SetResourceTab, SetSearchText, SetSortBy } from '@osf/features/search/store'; import { GetAllOptions } from '@shared/components/resources/resource-filters/filters/store/resource-filters-options.actions'; import { FilterLabels } from '@shared/components/resources/resource-filters/models/filter-labels'; import { @@ -47,60 +36,31 @@ export class ResourcesWrapperComponent implements OnInit { readonly #activeRoute = inject(ActivatedRoute); readonly #router = inject(Router); - creatorSelected = this.#store.selectSignal( - ResourceFiltersSelectors.getCreator, - ); - dateCreatedSelected = this.#store.selectSignal( - ResourceFiltersSelectors.getDateCreated, - ); + creatorSelected = this.#store.selectSignal(ResourceFiltersSelectors.getCreator); + dateCreatedSelected = this.#store.selectSignal(ResourceFiltersSelectors.getDateCreated); funderSelected = this.#store.selectSignal(ResourceFiltersSelectors.getFunder); - subjectSelected = this.#store.selectSignal( - ResourceFiltersSelectors.getSubject, - ); - licenseSelected = this.#store.selectSignal( - ResourceFiltersSelectors.getLicense, - ); - resourceTypeSelected = this.#store.selectSignal( - ResourceFiltersSelectors.getResourceType, - ); - institutionSelected = this.#store.selectSignal( - ResourceFiltersSelectors.getInstitution, - ); - providerSelected = this.#store.selectSignal( - ResourceFiltersSelectors.getProvider, - ); - partOfCollectionSelected = this.#store.selectSignal( - ResourceFiltersSelectors.getPartOfCollection, - ); + subjectSelected = this.#store.selectSignal(ResourceFiltersSelectors.getSubject); + licenseSelected = this.#store.selectSignal(ResourceFiltersSelectors.getLicense); + resourceTypeSelected = this.#store.selectSignal(ResourceFiltersSelectors.getResourceType); + institutionSelected = this.#store.selectSignal(ResourceFiltersSelectors.getInstitution); + providerSelected = this.#store.selectSignal(ResourceFiltersSelectors.getProvider); + partOfCollectionSelected = this.#store.selectSignal(ResourceFiltersSelectors.getPartOfCollection); sortSelected = this.#store.selectSignal(SearchSelectors.getSortBy); searchInput = this.#store.selectSignal(SearchSelectors.getSearchText); - resourceTabSelected = this.#store.selectSignal( - SearchSelectors.getResourceTab, - ); + resourceTabSelected = this.#store.selectSignal(SearchSelectors.getResourceTab); isMyProfilePage = this.#store.selectSignal(SearchSelectors.getIsMyProfile); constructor() { // if new value for some filter was put in store, add it to route effect(() => this.syncFilterToQuery('Creator', this.creatorSelected())); - effect(() => - this.syncFilterToQuery('DateCreated', this.dateCreatedSelected()), - ); + effect(() => this.syncFilterToQuery('DateCreated', this.dateCreatedSelected())); effect(() => this.syncFilterToQuery('Funder', this.funderSelected())); effect(() => this.syncFilterToQuery('Subject', this.subjectSelected())); effect(() => this.syncFilterToQuery('License', this.licenseSelected())); - effect(() => - this.syncFilterToQuery('ResourceType', this.resourceTypeSelected()), - ); - effect(() => - this.syncFilterToQuery('Institution', this.institutionSelected()), - ); + effect(() => this.syncFilterToQuery('ResourceType', this.resourceTypeSelected())); + effect(() => this.syncFilterToQuery('Institution', this.institutionSelected())); effect(() => this.syncFilterToQuery('Provider', this.providerSelected())); - effect(() => - this.syncFilterToQuery( - 'PartOfCollection', - this.partOfCollectionSelected(), - ), - ); + effect(() => this.syncFilterToQuery('PartOfCollection', this.partOfCollectionSelected())); effect(() => this.syncSortingToQuery(this.sortSelected())); effect(() => this.syncSearchToQuery(this.searchInput())); effect(() => this.syncResourceTabToQuery(this.resourceTabSelected())); @@ -115,33 +75,15 @@ export class ResourcesWrapperComponent implements OnInit { const search = params.get('search'); const resourceTab = params.get('resourceTab'); - const creator = filters.find( - (p: ResourceFilterLabel) => p.filterName === FilterLabels.creator, - ); - const dateCreated = filters.find( - (p: ResourceFilterLabel) => p.filterName === 'DateCreated', - ); - const funder = filters.find( - (p: ResourceFilterLabel) => p.filterName === FilterLabels.funder, - ); - const subject = filters.find( - (p: ResourceFilterLabel) => p.filterName === FilterLabels.subject, - ); - const license = filters.find( - (p: ResourceFilterLabel) => p.filterName === FilterLabels.license, - ); - const resourceType = filters.find( - (p: ResourceFilterLabel) => p.filterName === 'ResourceType', - ); - const institution = filters.find( - (p: ResourceFilterLabel) => p.filterName === FilterLabels.institution, - ); - const provider = filters.find( - (p: ResourceFilterLabel) => p.filterName === FilterLabels.provider, - ); - const partOfCollection = filters.find( - (p: ResourceFilterLabel) => p.filterName === 'PartOfCollection', - ); + const creator = filters.find((p: ResourceFilterLabel) => p.filterName === FilterLabels.creator); + const dateCreated = filters.find((p: ResourceFilterLabel) => p.filterName === 'DateCreated'); + const funder = filters.find((p: ResourceFilterLabel) => p.filterName === FilterLabels.funder); + const subject = filters.find((p: ResourceFilterLabel) => p.filterName === FilterLabels.subject); + const license = filters.find((p: ResourceFilterLabel) => p.filterName === FilterLabels.license); + const resourceType = filters.find((p: ResourceFilterLabel) => p.filterName === 'ResourceType'); + const institution = filters.find((p: ResourceFilterLabel) => p.filterName === FilterLabels.institution); + const provider = filters.find((p: ResourceFilterLabel) => p.filterName === FilterLabels.provider); + const partOfCollection = filters.find((p: ResourceFilterLabel) => p.filterName === 'PartOfCollection'); if (creator) { this.#store.dispatch(new SetCreator(creator.label, creator.value)); @@ -159,25 +101,16 @@ export class ResourcesWrapperComponent implements OnInit { this.#store.dispatch(new SetLicense(license.label, license.value)); } if (resourceType) { - this.#store.dispatch( - new SetResourceType(resourceType.label, resourceType.value), - ); + this.#store.dispatch(new SetResourceType(resourceType.label, resourceType.value)); } if (institution) { - this.#store.dispatch( - new SetInstitution(institution.label, institution.value), - ); + this.#store.dispatch(new SetInstitution(institution.label, institution.value)); } if (provider) { this.#store.dispatch(new SetProvider(provider.label, provider.value)); } if (partOfCollection) { - this.#store.dispatch( - new SetPartOfCollection( - partOfCollection.label, - partOfCollection.value, - ), - ); + this.#store.dispatch(new SetPartOfCollection(partOfCollection.label, partOfCollection.value)); } if (sortBy) { @@ -207,9 +140,7 @@ export class ResourcesWrapperComponent implements OnInit { let filters: ResourceFilterLabel[] = []; try { - filters = currentFiltersRaw - ? (JSON.parse(currentFiltersRaw) as ResourceFilterLabel[]) - : []; + filters = currentFiltersRaw ? (JSON.parse(currentFiltersRaw) as ResourceFilterLabel[]) : []; } catch (e) { console.error('Invalid activeFilters format in query params', e); } diff --git a/src/app/shared/components/resources/resources.component.html b/src/app/shared/components/resources/resources.component.html index d74e62774..283248fa8 100644 --- a/src/app/shared/components/resources/resources.component.html +++ b/src/app/shared/components/resources/resources.component.html @@ -1,15 +1,7 @@ -
+
@if (isMobile()) { - - + } @if (searchCount() > 10000) {

10 000+ results

diff --git a/src/app/shared/components/resources/resources.component.ts b/src/app/shared/components/resources/resources.component.ts index 14a8d7d51..4af5be4f1 100644 --- a/src/app/shared/components/resources/resources.component.ts +++ b/src/app/shared/components/resources/resources.component.ts @@ -8,25 +8,12 @@ import { Select } from 'primeng/select'; import { TableModule } from 'primeng/table'; import { NgOptimizedImage } from '@angular/common'; -import { - ChangeDetectionStrategy, - Component, - computed, - effect, - inject, - signal, - untracked, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, effect, inject, signal, untracked } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ResourceTab } from '@osf/features/search/models/resource-tab.enum'; -import { - GetResourcesByLink, - SearchSelectors, - SetResourceTab, - SetSortBy, -} from '@osf/features/search/store'; +import { GetResourcesByLink, SearchSelectors, SetResourceTab, SetSortBy } from '@osf/features/search/store'; import { FilterChipsComponent } from '@shared/components/resources/filter-chips/filter-chips.component'; import { ResourceCardComponent } from '@shared/components/resources/resource-card/resource-card.component'; import { ResourceFiltersOptionsSelectors } from '@shared/components/resources/resource-filters/filters/store/resource-filters-options.selectors'; @@ -71,12 +58,8 @@ export class ResourcesComponent { isFiltersOpen = signal(false); isSortingOpen = signal(false); - protected filters = this.#store.selectSignal( - ResourceFiltersSelectors.getAllFilters, - ); - protected filtersOptions = this.#store.selectSignal( - ResourceFiltersOptionsSelectors.getAllOptions, - ); + protected filters = this.#store.selectSignal(ResourceFiltersSelectors.getAllFilters); + protected filtersOptions = this.#store.selectSignal(ResourceFiltersOptionsSelectors.getAllOptions); protected isAnyFilterSelected = computed(() => { return ( this.filters().creator.value || diff --git a/src/app/shared/components/search-input/search-input.component.ts b/src/app/shared/components/search-input/search-input.component.ts index cc741d777..b52c1c628 100644 --- a/src/app/shared/components/search-input/search-input.component.ts +++ b/src/app/shared/components/search-input/search-input.component.ts @@ -1,11 +1,6 @@ import { InputText } from 'primeng/inputtext'; -import { - ChangeDetectionStrategy, - Component, - input, - model, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, input, model } from '@angular/core'; import { FormsModule } from '@angular/forms'; @Component({ diff --git a/src/app/shared/components/sub-header/sub-header.component.html b/src/app/shared/components/sub-header/sub-header.component.html index 17cd23819..339563fd8 100644 --- a/src/app/shared/components/sub-header/sub-header.component.html +++ b/src/app/shared/components/sub-header/sub-header.component.html @@ -7,10 +7,7 @@

{{ title() }}

@if (showButton()) {
- +
}

diff --git a/src/app/shared/components/sub-header/sub-header.component.ts b/src/app/shared/components/sub-header/sub-header.component.ts index 9bb3a75a0..a7bb0c5f4 100644 --- a/src/app/shared/components/sub-header/sub-header.component.ts +++ b/src/app/shared/components/sub-header/sub-header.component.ts @@ -1,12 +1,6 @@ import { Button } from 'primeng/button'; -import { - ChangeDetectionStrategy, - Component, - inject, - input, - output, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, input, output } from '@angular/core'; import { toSignal } from '@angular/core/rxjs-interop'; import { IS_XSMALL } from '@shared/utils/breakpoints.tokens'; diff --git a/src/app/shared/utils/breakpoints.tokens.ts b/src/app/shared/utils/breakpoints.tokens.ts index 14ab29fc7..bb492746e 100644 --- a/src/app/shared/utils/breakpoints.tokens.ts +++ b/src/app/shared/utils/breakpoints.tokens.ts @@ -5,16 +5,12 @@ import { inject, InjectionToken } from '@angular/core'; import { BreakpointQueries } from '@shared/utils/breakpoint-queries.enum'; -function createBreakpointToken( - query: string, -): InjectionToken> { +function createBreakpointToken(query: string): InjectionToken> { return new InjectionToken>(`Breakpoint ${query}`, { providedIn: 'root', factory: () => { const breakpointObserver = inject(BreakpointObserver); - return breakpointObserver - .observe([query]) - .pipe(map((result) => result.matches)); + return breakpointObserver.observe([query]).pipe(map((result) => result.matches)); }, }); } diff --git a/src/app/shared/utils/remove-nullable.const.ts b/src/app/shared/utils/remove-nullable.const.ts index 275cc9d2f..615efe166 100644 --- a/src/app/shared/utils/remove-nullable.const.ts +++ b/src/app/shared/utils/remove-nullable.const.ts @@ -1,7 +1,5 @@ export function removeNullable(obj: T): Partial { return Object.fromEntries( - Object.entries(obj).filter( - ([_, value]) => value !== null && value !== undefined, - ), + Object.entries(obj).filter(([_, value]) => value !== null && value !== undefined) ) as Partial; } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index dd210bfe0..ae8c84dd1 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -482,4 +482,4 @@ }, "copyright": "Copyright © 2011-2025" } -} \ No newline at end of file +} diff --git a/src/assets/icons/dist/icons.css b/src/assets/icons/dist/icons.css index d414d65b9..9c40a6bbb 100644 --- a/src/assets/icons/dist/icons.css +++ b/src/assets/icons/dist/icons.css @@ -1,222 +1,224 @@ @font-face { - font-family: "icons"; - src: url("./icons.eot?cdc3c964cbe66b7f705386b7b66a51b6#iefix") format("embedded-opentype"), -url("./icons.woff2?cdc3c964cbe66b7f705386b7b66a51b6") format("woff2"), -url("./icons.woff?cdc3c964cbe66b7f705386b7b66a51b6") format("woff"); + font-family: 'icons'; + src: + url('./icons.eot?cdc3c964cbe66b7f705386b7b66a51b6#iefix') format('embedded-opentype'), + url('./icons.woff2?cdc3c964cbe66b7f705386b7b66a51b6') format('woff2'), + url('./icons.woff?cdc3c964cbe66b7f705386b7b66a51b6') format('woff'); } -i[class^="osf-icon-"]:before, i[class*=" osf-icon-"]:before { - font-family: icons !important; - font-style: normal; - font-weight: normal !important; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; +i[class^='osf-icon-']:before, +i[class*=' osf-icon-']:before { + font-family: icons !important; + font-style: normal; + font-weight: normal !important; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } .osf-icon-withdrawn:before { - content: "\f101"; + content: '\f101'; } .osf-icon-warning:before { - content: "\f102"; + content: '\f102'; } .osf-icon-warning-sign:before { - content: "\f103"; + content: '\f103'; } .osf-icon-upload:before { - content: "\f104"; + content: '\f104'; } .osf-icon-trash:before { - content: "\f105"; + content: '\f105'; } .osf-icon-support:before { - content: "\f106"; + content: '\f106'; } .osf-icon-supplements:before { - content: "\f107"; + content: '\f107'; } .osf-icon-sort-desc:before { - content: "\f108"; + content: '\f108'; } .osf-icon-sort-asc:before { - content: "\f109"; + content: '\f109'; } .osf-icon-sort-asc-grey:before { - content: "\f10a"; + content: '\f10a'; } .osf-icon-share:before { - content: "\f10b"; + content: '\f10b'; } .osf-icon-settings:before { - content: "\f10c"; + content: '\f10c'; } .osf-icon-search:before { - content: "\f10d"; + content: '\f10d'; } .osf-icon-search-2:before { - content: "\f10e"; + content: '\f10e'; } .osf-icon-rejected:before { - content: "\f10f"; + content: '\f10f'; } .osf-icon-registries:before { - content: "\f110"; + content: '\f110'; } .osf-icon-quotes:before { - content: "\f111"; + content: '\f111'; } .osf-icon-profile:before { - content: "\f112"; + content: '\f112'; } .osf-icon-preprints:before { - content: "\f113"; + content: '\f113'; } .osf-icon-plus:before { - content: "\f114"; + content: '\f114'; } .osf-icon-pending:before { - content: "\f115"; + content: '\f115'; } .osf-icon-pdf:before { - content: "\f116"; + content: '\f116'; } .osf-icon-papers:before { - content: "\f117"; + content: '\f117'; } .osf-icon-padlock:before { - content: "\f118"; + content: '\f118'; } .osf-icon-padlock-unlock:before { - content: "\f119"; + content: '\f119'; } .osf-icon-my-projects:before { - content: "\f11a"; + content: '\f11a'; } .osf-icon-minus:before { - content: "\f11b"; + content: '\f11b'; } .osf-icon-menu:before { - content: "\f11c"; + content: '\f11c'; } .osf-icon-meetings:before { - content: "\f11d"; + content: '\f11d'; } .osf-icon-materials:before { - content: "\f11e"; + content: '\f11e'; } .osf-icon-list:before { - content: "\f11f"; + content: '\f11f'; } .osf-icon-link:before { - content: "\f120"; + content: '\f120'; } .osf-icon-last:before { - content: "\f121"; + content: '\f121'; } .osf-icon-institutions:before { - content: "\f122"; + content: '\f122'; } .osf-icon-information:before { - content: "\f123"; + content: '\f123'; } .osf-icon-image:before { - content: "\f124"; + content: '\f124'; } .osf-icon-home:before { - content: "\f125"; + content: '\f125'; } .osf-icon-home-2:before { - content: "\f126"; + content: '\f126'; } .osf-icon-help:before { - content: "\f127"; + content: '\f127'; } .osf-icon-folder:before { - content: "\f128"; + content: '\f128'; } .osf-icon-first:before { - content: "\f129"; + content: '\f129'; } .osf-icon-filter:before { - content: "\f12a"; + content: '\f12a'; } .osf-icon-eye-view:before { - content: "\f12b"; + content: '\f12b'; } .osf-icon-eye-hidden:before { - content: "\f12c"; + content: '\f12c'; } .osf-icon-email:before { - content: "\f12d"; + content: '\f12d'; } .osf-icon-duplicate:before { - content: "\f12e"; + content: '\f12e'; } .osf-icon-download:before { - content: "\f12f"; + content: '\f12f'; } .osf-icon-double-arrow-left:before { - content: "\f130"; + content: '\f130'; } .osf-icon-dots:before { - content: "\f131"; + content: '\f131'; } .osf-icon-donate:before { - content: "\f132"; + content: '\f132'; } .osf-icon-doc:before { - content: "\f133"; + content: '\f133'; } .osf-icon-diagram:before { - content: "\f134"; + content: '\f134'; } .osf-icon-data:before { - content: "\f135"; + content: '\f135'; } .osf-icon-customize:before { - content: "\f136"; + content: '\f136'; } .osf-icon-copy:before { - content: "\f137"; + content: '\f137'; } .osf-icon-contact:before { - content: "\f138"; + content: '\f138'; } .osf-icon-collections:before { - content: "\f139"; + content: '\f139'; } .osf-icon-code:before { - content: "\f13a"; + content: '\f13a'; } .osf-icon-close:before { - content: "\f13b"; + content: '\f13b'; } .osf-icon-chevron-right:before { - content: "\f13c"; + content: '\f13c'; } .osf-icon-chevron-left:before { - content: "\f13d"; + content: '\f13d'; } .osf-icon-calendar-silhouette:before { - content: "\f13e"; + content: '\f13e'; } .osf-icon-bookmark:before { - content: "\f13f"; + content: '\f13f'; } .osf-icon-bookmark-fill:before { - content: "\f140"; + content: '\f140'; } .osf-icon-arrow:before { - content: "\f141"; + content: '\f141'; } .osf-icon-arrow-left:before { - content: "\f142"; + content: '\f142'; } .osf-icon-arrow-down:before { - content: "\f143"; + content: '\f143'; } .osf-icon-accepted:before { - content: "\f144"; + content: '\f144'; } diff --git a/src/assets/icons/dist/icons.json b/src/assets/icons/dist/icons.json index 409477e4c..34e334f6b 100644 --- a/src/assets/icons/dist/icons.json +++ b/src/assets/icons/dist/icons.json @@ -1,70 +1,70 @@ { - "withdrawn": 61697, - "warning": 61698, - "warning-sign": 61699, - "upload": 61700, - "trash": 61701, - "support": 61702, - "supplements": 61703, - "sort-desc": 61704, - "sort-asc": 61705, - "sort-asc-grey": 61706, - "share": 61707, - "settings": 61708, - "search": 61709, - "search-2": 61710, - "rejected": 61711, - "registries": 61712, - "quotes": 61713, - "profile": 61714, - "preprints": 61715, - "plus": 61716, - "pending": 61717, - "pdf": 61718, - "papers": 61719, - "padlock": 61720, - "padlock-unlock": 61721, - "my-projects": 61722, - "minus": 61723, - "menu": 61724, - "meetings": 61725, - "materials": 61726, - "list": 61727, - "link": 61728, - "last": 61729, - "institutions": 61730, - "information": 61731, - "image": 61732, - "home": 61733, - "home-2": 61734, - "help": 61735, - "folder": 61736, - "first": 61737, - "filter": 61738, - "eye-view": 61739, - "eye-hidden": 61740, - "email": 61741, - "duplicate": 61742, - "download": 61743, - "double-arrow-left": 61744, - "dots": 61745, - "donate": 61746, - "doc": 61747, - "diagram": 61748, - "data": 61749, - "customize": 61750, - "copy": 61751, - "contact": 61752, - "collections": 61753, - "code": 61754, - "close": 61755, - "chevron-right": 61756, - "chevron-left": 61757, - "calendar-silhouette": 61758, - "bookmark": 61759, - "bookmark-fill": 61760, - "arrow": 61761, - "arrow-left": 61762, - "arrow-down": 61763, - "accepted": 61764 -} \ No newline at end of file + "withdrawn": 61697, + "warning": 61698, + "warning-sign": 61699, + "upload": 61700, + "trash": 61701, + "support": 61702, + "supplements": 61703, + "sort-desc": 61704, + "sort-asc": 61705, + "sort-asc-grey": 61706, + "share": 61707, + "settings": 61708, + "search": 61709, + "search-2": 61710, + "rejected": 61711, + "registries": 61712, + "quotes": 61713, + "profile": 61714, + "preprints": 61715, + "plus": 61716, + "pending": 61717, + "pdf": 61718, + "papers": 61719, + "padlock": 61720, + "padlock-unlock": 61721, + "my-projects": 61722, + "minus": 61723, + "menu": 61724, + "meetings": 61725, + "materials": 61726, + "list": 61727, + "link": 61728, + "last": 61729, + "institutions": 61730, + "information": 61731, + "image": 61732, + "home": 61733, + "home-2": 61734, + "help": 61735, + "folder": 61736, + "first": 61737, + "filter": 61738, + "eye-view": 61739, + "eye-hidden": 61740, + "email": 61741, + "duplicate": 61742, + "download": 61743, + "double-arrow-left": 61744, + "dots": 61745, + "donate": 61746, + "doc": 61747, + "diagram": 61748, + "data": 61749, + "customize": 61750, + "copy": 61751, + "contact": 61752, + "collections": 61753, + "code": 61754, + "close": 61755, + "chevron-right": 61756, + "chevron-left": 61757, + "calendar-silhouette": 61758, + "bookmark": 61759, + "bookmark-fill": 61760, + "arrow": 61761, + "arrow-left": 61762, + "arrow-down": 61763, + "accepted": 61764 +} diff --git a/src/assets/icons/optimize.mjs b/src/assets/icons/optimize.mjs index 1848be4b1..58e4c0caf 100644 --- a/src/assets/icons/optimize.mjs +++ b/src/assets/icons/optimize.mjs @@ -15,7 +15,6 @@ const removeFillAttribute = (svgString) => { fs.promises .readdir(path.join(__dirname, sourceDirectory)) .then((files) => { - files.forEach((file) => { if (file.endsWith('.svg')) { console.log(file); diff --git a/src/assets/styles/_variables.scss b/src/assets/styles/_variables.scss index 7c96b0206..9cff6f9af 100644 --- a/src/assets/styles/_variables.scss +++ b/src/assets/styles/_variables.scss @@ -128,10 +128,5 @@ $white-60: var(--white-60); rgba(219, 237, 251, 0.5) 98.07% ), #f3f8fd; - --gradient-3: linear-gradient( - 90.12deg, - #dbedfb 0.03%, - #eff4fc 54.38%, - #dbedfb 98.07% - ); + --gradient-3: linear-gradient(90.12deg, #dbedfb 0.03%, #eff4fc 54.38%, #dbedfb 98.07%); } diff --git a/src/assets/styles/overrides/panel-menu.scss b/src/assets/styles/overrides/panel-menu.scss index 7b72cdd48..a9fa7913d 100644 --- a/src/assets/styles/overrides/panel-menu.scss +++ b/src/assets/styles/overrides/panel-menu.scss @@ -36,8 +36,7 @@ background-color: transparent; } - .p-panelmenu-header:not(.p-disabled):focus-visible - .p-panelmenu-header-content, + .p-panelmenu-header:not(.p-disabled):focus-visible .p-panelmenu-header-content, .p-panelmenu-item.p-focus > .p-panelmenu-item-content { background-color: var.$dark-blue-2; border-radius: 0.5rem; diff --git a/src/index.html b/src/index.html index 0628ad111..c7a2695f3 100644 --- a/src/index.html +++ b/src/index.html @@ -10,8 +10,6 @@ - + diff --git a/src/main.ts b/src/main.ts index 6ad6b3a1c..bd61a1937 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,16 +1,8 @@ -import { isDevMode } from '@angular/core'; import { bootstrapApplication } from '@angular/platform-browser'; -import { provideServiceWorker } from '@angular/service-worker'; import { AppComponent } from '@osf/app.component'; import { appConfig } from '@osf/app.config'; bootstrapApplication(AppComponent, { - providers: [ - ...appConfig.providers, - provideServiceWorker('ngsw-worker.js', { - enabled: !isDevMode(), - registrationStrategy: 'registerWhenStable:30000', - }), - ], + providers: [...appConfig.providers], }).catch((err) => console.error(err)); diff --git a/tsconfig.app.json b/tsconfig.app.json index 3775b37e3..8886e903f 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -6,10 +6,6 @@ "outDir": "./out-tsc/app", "types": [] }, - "files": [ - "src/main.ts" - ], - "include": [ - "src/**/*.d.ts" - ] + "files": ["src/main.ts"], + "include": ["src/**/*.d.ts"] } diff --git a/tsconfig.spec.json b/tsconfig.spec.json index 5fb748d92..e00e30e6d 100644 --- a/tsconfig.spec.json +++ b/tsconfig.spec.json @@ -4,12 +4,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/spec", - "types": [ - "jasmine" - ] + "types": ["jasmine"] }, - "include": [ - "src/**/*.spec.ts", - "src/**/*.d.ts" - ] + "include": ["src/**/*.spec.ts", "src/**/*.d.ts"] }