-
Notifications
You must be signed in to change notification settings - Fork 56
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
Changes from all commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
8375eb7
Add user messaging modal to user's tab on institutional dashboard
975af66
fix en-us typo
d09ca7d
add aira-label.
0627e1b
fix label for message box
7639ea1
update sendMessage to task
9eb5df3
update text area for Ember type area
abe2852
Add type annotations for belongs to
0d8cd74
add checkboxes for reply-to and ccing
fa4ae5e
update to fit Product language and styling
28aadaf
update language and fix modal closing bug.
777dd66
Merge branch 'develop' of https://github.com/CenterForOpenScience/emb…
d5803a6
make message types an enum
434288e
use proper Ember input tags, remove extra close modal command
5a7fe94
add Project request modal with user messaging tab to the institution…
5bbb5a3
Merge pull request #2421 from Johnetordoff/institutional-access-user-…
Johnetordoff 13f0699
Merge branch 'feature/institutional-access' of https://github.com/Cen…
1abd4e4
Merge branch 'develop' of https://github.com/CenterForOpenScience/emb…
9b21ce4
Merge branch 'develop' of https://github.com/CenterForOpenScience/emb…
524eef0
integrations fixes and refactors
4057df3
add project request and messaging modal to institution dashboard
19fb416
Merge branch 'institutional-access-project-request-modal' of https://…
4b74341
Code review cleanup and typos
983ac69
clean-up user message pane and make tasks
e7f569d
use variables for colors
715bee8
clean-up exception handling and include notes
a92edbf
add translation to default value for unknown contributor
9a3e056
clean-up translation keys
497b301
Merge pull request #2433 from Johnetordoff/institutional-access-proje…
Johnetordoff 6d86462
fix user messaging bug due to out of sync adapter
6c972a2
Merge pull request #2467 from Johnetordoff/fix-user-messaging-tab
Johnetordoff 239f9e1
use FE feature flipping
c001e63
Merge pull request #2469 from Johnetordoff/feature-flipper
Johnetordoff c0e7469
fix feature flip bug (#2470)
Johnetordoff c3afad6
Merge https://github.com/centerforopenscience/ember-osf-web into feat…
Johnetordoff b0e1cbe
Merge branch 'feature/institutional-access' of https://github.com/Cen…
Johnetordoff 9108857
Merge pull request #2473 from Johnetordoff/feature/institutional-access
Johnetordoff 237a0ec
surface 409s as error messages
Johnetordoff b735ed3
fix typo stopping emails
Johnetordoff a759326
make buttons display properly
Johnetordoff e0f63f8
fix messageRecipient problem by using real user data not guid
Johnetordoff 5073c59
fix syntax on brackets
Johnetordoff bff0b1e
revert/restore old code
Johnetordoff c45d417
Merge pull request #2476 from CenterForOpenScience/IA-fixes
Johnetordoff 5551223
fix typo and issue preventing pop-up modal from popping up
Johnetordoff 9c52b2a
Merge pull request #2478 from Johnetordoff/IA-fixes
Johnetordoff 75f03ba
fix issue with not including error response codes in payload
Johnetordoff 07aef1a
Merge pull request #2479 from Johnetordoff/IA-fixes
Johnetordoff d550aaf
update translation to remove html tag
Johnetordoff 56c156b
Merge pull request #2480 from Johnetordoff/IA-fixes
Johnetordoff af22ef9
remove debugging return
Johnetordoff 2da6676
remove superfluous import and type Institution model correctly
Johnetordoff c26aa4f
Merge pull request #2481 from Johnetordoff/IA-fixes
Johnetordoff File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import { inject as service } from '@ember/service'; | ||
import config from 'ember-osf-web/config/environment'; | ||
const { OSF: { apiUrl } } = config; | ||
import OsfAdapter from './osf-adapter'; | ||
|
||
export default class NodeRequestAdapter extends OsfAdapter { | ||
@service session; | ||
|
||
urlForCreateRecord(modelName, snapshot) { | ||
const nodeId = snapshot.record.target; | ||
return `${apiUrl}/v2/nodes/${nodeId}/requests/`; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import config from 'ember-osf-web/config/environment'; | ||
const { OSF: { apiUrl } } = config; | ||
import OsfAdapter from './osf-adapter'; | ||
|
||
export default class UserMessageAdapter extends OsfAdapter { | ||
urlForCreateRecord(modelName, snapshot) { | ||
const userId = snapshot.record.messageRecipient; | ||
return `${apiUrl}/v2/users/${userId}/messages/`; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#2486