-
Notifications
You must be signed in to change notification settings - Fork 57
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
[ENG-5145] converge with gravyvalet backend #2234
[ENG-5145] converge with gravyvalet backend #2234
Conversation
const resourceRefs = await this.store.query('resource-reference', { | ||
filter: {resource_uri: this.node.links.iri?.toString()}, | ||
}); | ||
this.serviceNode = resourceRefs.firstObject; |
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.
Did the peekRecord not work properly?
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.
peekRecord uses id, but gravyvalet mints its own ids and getting the gv resource-ref for an osf resource requires looking it up with filter[resource_uri]
(...which is less than ideal but where we've landed for now, it seems -- might be cleaner if it were fetched/cached on the node
model?)
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 think it would still be worth doing a peekRecord here and for the userReference, but now with the correct GV ids. We instantiate this class quite a bit and taking advantage of the caching would be nice. Unless query checks for any cached records first?
if (providerCapabilities?.includes(capability)) { | ||
textTranslationKey = textTranslationChoices.true; | ||
localClass = 'success-bg'; | ||
} else if (providerCapabilities.includes((capability + '_partial' as TermsOfServiceCapabilities))) { | ||
} else if (providerCapabilities?.includes((capability + '_partial' as TermsOfServiceCapabilities))) { |
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.
We need to get the providerCapabilities
in so we don't have those ?
s
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.
Huzzah! Thank you for helping with the integration!
assert.dom('[data-test-files-provider-link="bitbucket"]').exists('Bitbucket shown'); | ||
assert.dom('[data-test-files-provider-link="bitbucket"]').hasAttribute('href', |
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.
How did this pass without the closing brackets? 🤨
9fea8b2
into
CenterForOpenScience:feature/addon-services
@@ -216,9 +214,8 @@ export default class Provider { | |||
initiateOauth: initiateOauth || false, | |||
apiBaseUrl: (this.provider as ExternalStorageServiceModel).configurableApiRoot ? credentials.url : '', | |||
externalUserId: this.currentUser.user?.id, | |||
scopes: [], | |||
storageProvider: this.provider, | |||
configuringUser: this.userReference, |
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.
@brianjgeiger it looks like the removal of this line is what's messing up the user settings page. should add accountOwner: this.userReference
here
Purpose
Summary of Changes
addons_service
adapter: include auth cookies with requestsdisplayName
attr on external services, authorized accounts, and configured addonsthruAccount
relation to addon-operation-invocations (to allow the account owner to e.g. choose an authorized root folder without having configured an addon yet)credentials
members (allow/default to{}
)Screenshot(s)
Side Effects
QA Notes