Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/institutional access #2471

Merged
merged 52 commits into from
Jan 21, 2025
Merged

Conversation

Johnetordoff
Copy link
Collaborator

@Johnetordoff Johnetordoff commented Jan 16, 2025

  • Ticket: []
  • Feature flag: n/a

Purpose

Summary of Changes

  • Add models and adapters for:
    • User Message
    • Node Request
  • Change templates to add user messaging model to user tab
  • Change templates to add node request model to project tab

Screenshot(s)

Side Effects

QA Notes

John Tordoff and others added 30 commits December 6, 2024 10:01
…er-osf-web into institutional-access-user-message-modal

* 'develop' of https://github.com/CenterForOpenScience/ember-osf-web:
  Update CHANGELOG, bump version
  [ENG-5024] Feature/dashboard b and i (#2429)

# Conflicts:
#	app/institutions/dashboard/-components/institutional-users-list/component.ts
…message-modal

[ENG-6665] Add user messaging modal to user's tab on institutional dashboard
…terForOpenScience/ember-osf-web into institutional-access-project-request-modal

* 'feature/institutional-access' of https://github.com/CenterForOpenScience/ember-osf-web:
  use proper Ember input tags, remove extra close modal command
  make message types an enum
  update language and fix modal closing bug.
  update to fit Product language and styling
  add checkboxes for reply-to and ccing
  Add type annotations for belongs to
  update text area for Ember type area
  update sendMessage to task
  fix label for message box
  add aira-label.
  fix en-us typo
  Add user messaging modal to user's tab on institutional dashboard
…er-osf-web into institutional-access-project-request-modal

* 'develop' of https://github.com/CenterForOpenScience/ember-osf-web:
  Bump version no. Add CHANGELOG.
  Feature/share download integration (#2457)
…er-osf-web into institutional-access-project-request-modal

* 'develop' of https://github.com/CenterForOpenScience/ember-osf-web:
  Update CHANGELOG, bump version
  Fix funder column propertyPathKey
  Bump version no. Add CHANGELOG.
  Feature/share download integration (#2457)
…github.com/CenterForOpenScience/ember-osf-web into institutional-access-project-request-modal

* 'institutional-access-project-request-modal' of https://github.com/CenterForOpenScience/ember-osf-web:
  integrations fixes and refactors
  Update CHANGELOG, bump version
  Fix funder column propertyPathKey
  Bump version no. Add CHANGELOG.
  Feature/share download integration (#2457)
  Bump version no. Add CHANGELOG.
  Feature/share download integration (#2457)
  add Project request modal with user messaging tab to the institutional dashboard

# Conflicts:
#	app/institutions/dashboard/-components/object-list/component.ts
#	app/institutions/dashboard/-components/object-list/template.hbs
#	app/models/node-request.ts
…ct-request-modal

[ENG-6669] Institutional Access project Request Modal
[IAC][Bug] Fix User Messaging Tab Adapter Bug
@coveralls
Copy link

coveralls commented Jan 16, 2025

Pull Request Test Coverage Report for Build 12836329841

Details

  • 5 of 83 (6.02%) changed or added relevant lines in 5 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.4%) to 64.514%

Changes Missing Coverage Covered Lines Changed/Added Lines %
app/adapters/node-request.ts 1 3 33.33%
app/adapters/user-message.ts 1 3 33.33%
app/institutions/dashboard/-components/object-list/contributors-field/component.ts 0 4 0.0%
app/institutions/dashboard/-components/institutional-users-list/component.ts 1 24 4.17%
app/institutions/dashboard/-components/object-list/component.ts 2 49 4.08%
Totals Coverage Status
Change from base Build 12714530600: -0.4%
Covered Lines: 6979
Relevant Lines: 10402

💛 - Coveralls

@@ -10,6 +11,7 @@ import InstitutionModel from 'ember-osf-web/models/institution';
import InstitutionDepartmentsModel from 'ember-osf-web/models/institution-department';
import Analytics from 'ember-osf-web/services/analytics';
import { RelationshipWithLinks } from 'osf-api';
import {MessageTypeChoices} from 'ember-osf-web/models/user-message';
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spaces

futa-ikeda
futa-ikeda previously approved these changes Jan 17, 2025
Copy link
Contributor

@futa-ikeda futa-ikeda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just super minor nits that you don't need to address. Looks great!

import OsfAdapter from './osf-adapter';

export default class NodeRequestAdapter extends OsfAdapter {
@service session;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: doesn't look like you need this line and any imports for it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Johnetordoff This looks like it's still there, but you marked it as resolved without additional comment. What's going on with this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I must have missed it sorry, let me remove it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

app/adapters/user-message.ts Outdated Show resolved Hide resolved
app/models/user-message.ts Outdated Show resolved Hide resolved
@futa-ikeda
Copy link
Contributor

And it looks like the percy changes are just RNG text/image jitter, so I can approve it whenever we are ready to merge this to develop

update translation to remove html tag
@brianjgeiger brianjgeiger marked this pull request as ready for review January 17, 2025 19:47
Copy link
Contributor

@brianjgeiger brianjgeiger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found one thing, and also please do the small things that Futa found.

Copy link
Contributor

@brianjgeiger brianjgeiger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll get the last service import removed post-release.

@brianjgeiger
Copy link
Contributor

@futa-ikeda This is ready to go to develop. Could you approve Percy?

@brianjgeiger brianjgeiger merged commit af5227a into develop Jan 21, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants