Edit service access control #47
Merged
Conversation
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
FilipMasar
changed the title
| @@ -160,6 +163,12 @@ export default function AddService({ | |||
| newFiles = filesEncrypted | |||
| } | |||
|
|
|||
| const credentials = generateCredentials( | |||
| undefined, | |||
There was a problem hiding this comment.
Usually optional parameters should be last
There was a problem hiding this comment.
I am thinking what to do about it, but perhaps it's best to just keep it like that. It is used like that even in the code that I haven't changed e.g. here https://github.com/OceanProtocolEnterprise/market/blob/main/src/components/Publish/_utils.ts#L242
LMK what you think
FilipMasar
changed the title
AdriGeorge
reviewed
Nov 12, 2024
| @@ -169,6 +178,7 @@ export default function AddService({ | |||
| datatokenAddress, | |||
| serviceEndpoint: values.providerUrl.url, | |||
| timeout: mapTimeoutStringToSeconds(values.timeout), | |||
| credentials, | |||
| ...(values.access === 'compute' && { | |||
There was a problem hiding this comment.
should we use enums, to not have string encoded?
AdriGeorge
reviewed
Nov 12, 2024
| const updatedService: Service = { | ||
| ...service, | ||
| name: values.name, | ||
| description: values.description, | ||
| type: values.access, | ||
| timeout: mapTimeoutStringToSeconds(values.timeout), | ||
| files: updatedFiles, // TODO: check if this works | ||
| files: updatedFiles, // TODO: check if this works, | ||
| credentials, | ||
| ...(values.access === 'compute' && { |
AdriGeorge
reviewed
Nov 12, 2024
| const updatedService: Service = { | ||
| ...service, | ||
| name: values.name, | ||
| description: values.description, | ||
| timeout: mapTimeoutStringToSeconds(values.timeout), | ||
| files: updatedFiles, // TODO: check if this works | ||
| files: updatedFiles, // TODO: check if this works, | ||
| credentials: updatedCredentials, | ||
| ...(values.access === 'compute' && { |
AdriGeorge
reviewed
Nov 12, 2024
| @@ -105,6 +107,14 @@ export const getServiceInitialValues = ( | |||
| timeout: secondsToString(service.timeout), | |||
| usesConsumerParameters: service.consumerParameters?.length > 0, | |||
| consumerParameters: parseConsumerParameters(service.consumerParameters), | |||
| allow: | |||
| service.credentials?.allow?.find( | |||
| (credential) => credential.type === 'address' | |||
|
@AdriGeorge its a good idea to use enums as you pointed out in your comments. But I think it is out of scope of this PR. If I start changing it, it would effect many other files. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #17
What was done?
ocean-node support was done here OceanProtocolEnterprise/ocean-node#12 and here oceanprotocol/ocean-node#698