Fix/add to collection #178

rnastyuk · 2025-07-14T14:50:46Z

added deactivate guard when leaving add to colletion page
added project store clearing when leaving add to colletion page

…lder

# Conflicts: # src/app/features/project/addons/addons.component.ts # src/app/features/settings/addons/addons.component.spec.ts # src/app/features/settings/addons/addons.component.ts # src/app/shared/components/addons/addon-card-list/addon-card-list.component.ts # src/app/shared/components/addons/addon-card/addon-card.component.ts

… and logic

# Conflicts: # src/app/features/project/addons/addons.component.html # src/app/features/project/addons/addons.component.ts # src/app/features/settings/addons/addons.component.html # src/app/features/settings/addons/addons.component.ts # src/app/shared/components/addons/addon-card/addon-card.component.html # src/app/shared/components/addons/addon-card/addon-card.component.ts # src/app/shared/enums/index.ts # src/assets/i18n/en.json # src/assets/styles/overrides/button.scss

…refactored code

# Conflicts: # src/app/shared/components/addons/addon-card/addon-card.component.ts # src/app/shared/services/index.ts # src/assets/i18n/en.json # src/assets/styles/styles.scss

…ons fetching

…nav tab

# Conflicts: # src/app/core/components/nav-menu/nav-menu.component.ts # src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.html # src/app/features/settings/tokens/services/tokens.service.ts

…ic layout

# Conflicts: # src/app/features/collections/components/collections-filters/collections-filters.component.html # src/app/features/collections/components/collections-main-content/collections-main-content.component.html # src/assets/styles/overrides/accordion.scss # src/assets/styles/overrides/paginator.scss

# Conflicts: # src/app/features/collections/collections.component.html # src/app/features/collections/collections.component.scss # src/app/features/collections/collections.component.ts # src/app/features/collections/collections.routes.ts # src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.html # src/app/features/collections/components/collections-filter-chips/collections-filter-chips.component.ts # src/app/features/collections/components/collections-filters/collections-filters.component.html # src/app/features/collections/components/collections-filters/collections-filters.component.ts # src/app/features/collections/components/collections-main-content/collections-main-content.component.html # src/app/features/collections/components/collections-main-content/collections-main-content.component.ts # src/app/features/collections/components/collections-search-results/collections-search-results.component.html # src/app/features/collections/constants/filter-types.const.ts # src/app/features/collections/constants/sort-options.const.ts # src/app/features/collections/enums/index.ts # src/app/features/collections/models/collections-json-api.models.ts # src/app/features/collections/models/index.ts # src/app/features/collections/services/collections-query-sync.service.ts # src/app/features/collections/services/collections.service.ts # src/app/features/collections/store/collections.actions.ts # src/app/features/collections/store/collections.state.ts # src/app/features/preprints/models/preprints.models.ts # src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts # src/app/features/preprints/services/index.ts # src/assets/i18n/en.json # src/assets/styles/styles.scss

# Conflicts: # src/app/features/collections/store/collections/collections.state.ts # src/app/features/my-projects/my-projects.component.ts # src/app/features/my-projects/services/my-projects.service.ts # src/app/features/project/overview/components/overview-toolbar/overview-toolbar.component.ts # src/app/features/project/overview/project-overview.component.ts # src/app/shared/stores/index.ts

# Conflicts: # src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts

# Conflicts: # src/app/features/my-projects/my-projects.component.ts # src/app/shared/stores/index.ts

…e collection

… feat/201-add-to-collection

# Conflicts: # src/app/features/collections/components/add-to-collection/add-to-collection.component.scss # src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.html # src/app/features/collections/components/add-to-collection/project-contributors-step/project-contributors-step.component.ts # src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.html # src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.html # src/app/features/collections/components/add-to-collection/select-project-step/select-project-step.component.ts # src/app/features/collections/components/collections-discover/collections-discover.component.scss # src/app/features/collections/services/add-to-collection.service.ts # src/app/shared/mappers/projects/projects.mapper.ts # src/app/shared/services/projects.service.ts # src/app/shared/stores/projects/projects.state.ts # src/assets/styles/components/collections.scss

kpetrov24exoft and others added 30 commits May 28, 2025 20:04

chore(157): project-addons-ui

0cc7430

fix(project-addons): minor fixes

9797cb9

Merge branch 'main' into feat/184-project-addons-api

ddd68fc

feat(project-addons-api): moved reusable addon files to the shared fo…

1e279f1

…lder

feat(profile-addons-api): added initial profile addons page structure…

9cb147b

… and logic

Merge branch 'refs/heads/main' into feat/184-project-addons-api

988e267

feat(profile-addons-api): added addon configuration functionality

2ccd258

feat(profile-addons-api): fixed connection creation bug, fixed form, …

3484429

…refactored code

Merge branch 'main' into feat/184-project-addons-api

614d12d

# Conflicts: # src/app/shared/components/addons/addon-card/addon-card.component.ts # src/app/shared/services/index.ts # src/assets/i18n/en.json # src/assets/styles/styles.scss

feat(profile-addons-api): added breadcrumbs trimming

4afb7a6

Merge branch 'main' into feat/184-project-addons-api

b040475

feat(profile-addons-api): fixed comments

8c21899

feat(profile-addons-api): changed p-select usage to reusable osf-select

cd6365a

Merge branch 'main' into feat/178-collections-api

3377ef7

feat(collections-api): added get collection provider logic

52ef634

feat(profile-addons-api): added filter logic and collections submissi…

b7e8669

…ons fetching

feat(profile-addons-api): added dynamic rendering of the collections …

8382bdf

…nav tab

feat(add-to-collection): refactored collections routing and added bas…

621bdb6

…ic layout

feat(collections-api): refactored branding service

b7e2dd4

Merge branch 'feat/178-collections-api' into feat/201-add-to-collection

a7cff22

feat(add-to-collection): changed accordion to basic stepper

c938d35

feat(add-to-collection): added stepper enum

9d0d7a9

feat(add-to-collection-api): changed accordion to stepper

a03e40a

Merge branch 'refs/heads/main' into feat/201-add-to-collection

dc85bf4

rnastyuk added 17 commits July 4, 2025 11:17

Merge branch 'refs/heads/main' into feat/201-add-to-collection

c13aff8

# Conflicts: # src/app/features/preprints/pages/submit-preprint-stepper/submit-preprint-stepper.component.ts

Merge branch 'refs/heads/main' into feat/201-add-to-collection

a628942

Merge branch 'refs/heads/main' into feat/201-add-to-collection

342ee27

# Conflicts: # src/app/features/my-projects/my-projects.component.ts # src/app/shared/stores/index.ts

Merge branch 'refs/heads/main' into feat/201-add-to-collection

e3a97f7

feat(add-to-collection-api): added logic for submitting project to th…

fb0f8da

…e collection

Merge branch 'main' into feat/201-add-to-collection

6ddacb2

feat(add-to-collection-api): fixed bug with the contributor deletion

404d9bb

feat(add-to-collection-api): fixed input style

b047207

Merge branch 'main' into feat/201-add-to-collection

da69ecb

Merge remote-tracking branch 'origin/feat/201-add-to-collection' into…

ffed90e

… feat/201-add-to-collection

feat(add-to-collection-api): fixed comments

525649c

Merge branch 'main' into feat/201-add-to-collection

d2606f9

feat(add-to-collection-api): added shared bookmarks service

d59b45b

feat(add-to-collection-api): shorten import

82ce7e6

fix(add-to-collection-api): added deactivate guard and clearing store

1b3533b

fix(add-to-collection-api): moved guard

c66bb5c

rnastyuk requested a review from nsemets July 14, 2025 14:50

rnastyuk self-assigned this Jul 14, 2025

Merge branch 'main' into fix/add-to-collection

435a4db

nsemets approved these changes Jul 14, 2025

View reviewed changes

rnastyuk merged commit 93442de into main Jul 14, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix/add to collection #178

Fix/add to collection #178

Uh oh!

rnastyuk commented Jul 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Fix/add to collection #178

Fix/add to collection #178

Uh oh!

Conversation

rnastyuk commented Jul 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants