oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Code Releases Activity

wrapping publish in permissions wrapper

Browse Source
This commit is contained in:
Jamie Hewitt 2021-05-20 17:18:23 +03:00
parent f74ec8dce5
commit 440afbdc05
3 changed files with 87 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/pages/Home.tsx
View File

@ -94,8 +94,8 @@ function SectionQueryResult({
export default function HomePage(): ReactElement { export default function HomePage(): ReactElement {
return ( return (
<> <Permission eventType="browse">
<Permission eventType="browse"> <>
<Container narrow className={styles.searchWrap}> <Container narrow className={styles.searchWrap}>
<SearchBar size="large" /> <SearchBar size="large" />
</Container> </Container>
@ -127,7 +127,7 @@ export default function HomePage(): ReactElement {
</Button> </Button>
} }
/> />
</Permission> </>
</> </Permission>
) )
} }

157
src/components/pages/Publish/index.tsx
View File

@ -1,4 +1,5 @@
import React, { ReactElement, useState, useEffect } from 'react' import React, { ReactElement, useState, useEffect } from 'react'
import Permission from '../../organisms/Permission'
import { Formik, FormikState } from 'formik' import { Formik, FormikState } from 'formik'
import { usePublish } from '../../../hooks/usePublish' import { usePublish } from '../../../hooks/usePublish'
import styles from './index.module.css' import styles from './index.module.css'
@ -216,86 +217,92 @@ export default function PublishPage({
} }
return isInPurgatory && purgatoryData ? null : ( return isInPurgatory && purgatoryData ? null : (
<Formik <Permission eventType="publish">
initialValues={ <Formik
publishType === 'dataset' ? datasetInitialValues : algoInitialValues initialValues={
} publishType === 'dataset' ? datasetInitialValues : algoInitialValues
initialStatus="empty" }
validationSchema={ initialStatus="empty"
publishType === 'dataset' ? validationSchema : validationSchemaAlgorithm validationSchema={
} publishType === 'dataset'
onSubmit={async (values, { resetForm }) => { ? validationSchema
// move user's focus to top of screen : validationSchemaAlgorithm
window.scrollTo({ top: 0, left: 0, behavior: 'smooth' }) }
// kick off publishing onSubmit={async (values, { resetForm }) => {
publishType === 'dataset' // move user's focus to top of screen
? await handleSubmit(values, resetForm) window.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
: await handleAlgorithmSubmit(values, resetForm) // kick off publishing
}} publishType === 'dataset'
enableReinitialize ? await handleSubmit(values, resetForm)
> : await handleAlgorithmSubmit(values, resetForm)
{({ values }) => { }}
const tabs = [ enableReinitialize
{ >
title: 'Data Set', {({ values }) => {
content: <TabContent values={values} publishType={publishType} /> const tabs = [
}, {
{ title: 'Data Set',
title: 'Algorithm', content: <TabContent values={values} publishType={publishType} />
content: <TabContent values={values} publishType={publishType} /> },
} {
] title: 'Algorithm',
content: <TabContent values={values} publishType={publishType} />
}
]
return ( return (
<> <>
<Persist <Persist
name={ name={
publishType === 'dataset' publishType === 'dataset'
? formNameDatasets ? formNameDatasets
: formNameAlgorithms : formNameAlgorithms
} }
ignoreFields={['isSubmitting']} ignoreFields={['isSubmitting']}
/>
{hasFeedback ? (
<MetadataFeedback
title={title}
error={error}
success={success}
loading={publishStepText}
setError={setError}
successAction={{
name: `Go to ${
publishType === 'dataset' ? 'data set' : 'algorithm'
} →`,
to: `/asset/${did}`
}}
/> />
) : (
<>
<Alert
text={content.warning}
state="info"
className={styles.alert}
/>
<Tabs {hasFeedback ? (
className={styles.tabs} <MetadataFeedback
items={tabs} title={title}
handleTabChange={(title) => { error={error}
setPublishType(title.toLowerCase().replace(' ', '') as any) success={success}
title === 'Algorithm' loading={publishStepText}
? setdatasetInitialValues(values) setError={setError}
: setAlgoInitialValues(values) successAction={{
name: `Go to ${
publishType === 'dataset' ? 'data set' : 'algorithm'
} →`,
to: `/asset/${did}`
}} }}
/> />
</> ) : (
)} <>
<Alert
text={content.warning}
state="info"
className={styles.alert}
/>
{debug === true && <Debug values={values} />} <Tabs
</> className={styles.tabs}
) items={tabs}
}} handleTabChange={(title) => {
</Formik> setPublishType(
title.toLowerCase().replace(' ', '') as any
)
title === 'Algorithm'
? setdatasetInitialValues(values)
: setAlgoInitialValues(values)
}}
/>
</>
)}
{debug === true && <Debug values={values} />}
</>
)
}}
</Formik>
</Permission>
) )
} }

2
src/utils/rbac.ts
View File

@ -12,7 +12,7 @@ export default async function rbacRequest(eventType: string): Promise<boolean> {
eventType, eventType,
credentials: { credentials: {
token: token:
'1eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJDWVdQTTJLY1NKUjJtV0o2ZFBqZTVKVmZ5YTZnZXdhVElVZDBabUoyWndFIn0.eyJleHAiOjE2MjE1MjAxNzcsImlhdCI6MTYyMTUxOTU3NywianRpIjoiZWFhZjQ2NmQtY2NhNy00MDlkLWEzNGItNzA1N2I2MjQ4NDFhIiwiaXNzIjoiaHR0cHM6Ly9rZXljbG9hay1pbnQuZGF0YS1tYXJrZXRwbGFjZS5pby9hdXRoL3JlYWxtcy9tYXJrZXRwbGFjZSIsImF1ZCI6ImFjY291bnQiLCJzdWIiOiJkZDM2NDVlZi0zN2Q5LTQzMzQtOWEzYy1jMjczNTRkYmNkMWMiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJwb3J0YWwiLCJzZXNzaW9uX3N0YXRlIjoiY2UxMjAxOTMtMDhhZi00ODRiLTk4OGUtYjhiMjlhYzVhNjY2IiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyJodHRwczovL3BvcnRhbC1pbnQuZGF0YS1tYXJrZXRwbGFjZS5pbyJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsib2ZmbGluZV9hY2Nlc3MiLCJwdWJsaXNoZXIiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfX0sInNjb3BlIjoicHJvZmlsZSBlbWFpbCIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJuYW1lIjoiamFtaWUgb2NlYW4iLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJqYW1pZUBvY2Vhbi5jb20iLCJnaXZlbl9uYW1lIjoiamFtaWUiLCJmYW1pbHlfbmFtZSI6Im9jZWFuIiwiZW1haWwiOiJqYW1pZUBvY2Vhbi5jb20ifQ.edeI8XiJk_v_vM0dwRXHWZK4hJ5GR_Wq-i2J00oBGt-7LSvEAqqyG39muMluqeoL1_s9KVaetVZqrESdksZyeu3AtmYJh_Nre7UjY75KgRsq2DTMHr4d20AjKQeBO0_ndyiz4rldrMiNhjK5Xi_uK3Aoh9VyuP5974IX4a0410Q_TiAB1I-zfYamWEgtl5GG1ErcZ2ecjL6HMP2uD3fLxanc674oHEVDojfTybYyI2Ao66OBU8NUvKZGajd0N2uTm-70jNSlAOJoVYHPdpmasfzFJ-gl5mUnlfNc_0hUsXy4sMmjIXQV0L6mrTSch7yiLrgYuxNDS0_EjD6h0ZJ9mg' 'eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJDWVdQTTJLY1NKUjJtV0o2ZFBqZTVKVmZ5YTZnZXdhVElVZDBabUoyWndFIn0.eyJleHAiOjE2MjE1MjA4MTUsImlhdCI6MTYyMTUyMDIxNSwianRpIjoiZmRhODM1Y2MtOTMyNi00YmM5LTkwNTktZWI5NWMxY2IwY2M3IiwiaXNzIjoiaHR0cHM6Ly9rZXljbG9hay1pbnQuZGF0YS1tYXJrZXRwbGFjZS5pby9hdXRoL3JlYWxtcy9tYXJrZXRwbGFjZSIsImF1ZCI6ImFjY291bnQiLCJzdWIiOiJkZDM2NDVlZi0zN2Q5LTQzMzQtOWEzYy1jMjczNTRkYmNkMWMiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJwb3J0YWwiLCJzZXNzaW9uX3N0YXRlIjoiZjBjZTE3YmQtZTM5ZS00N2E4LTkzMWMtNjUwNDBhZjNjZGJiIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyJodHRwczovL3BvcnRhbC1pbnQuZGF0YS1tYXJrZXRwbGFjZS5pbyJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsib2ZmbGluZV9hY2Nlc3MiLCJwdWJsaXNoZXIiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfX0sInNjb3BlIjoicHJvZmlsZSBlbWFpbCIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJuYW1lIjoiamFtaWUgb2NlYW4iLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJqYW1pZUBvY2Vhbi5jb20iLCJnaXZlbl9uYW1lIjoiamFtaWUiLCJmYW1pbHlfbmFtZSI6Im9jZWFuIiwiZW1haWwiOiJqYW1pZUBvY2Vhbi5jb20ifQ.OTDbNFg8FusY-TovkdpSZZqVcBQ8xVRQfl-Hf0aCzRioRLYc0mri4hgenbVubDsVqyThZU7xOIXUoQ2-mTGqQA0zwpgqKY-ntRz2XZ1GW6saVIiFMuYDCRpiL1KVdW0s0gVZKNJoYHT1O31Xg7aQ7qN8E0f8TFnK_pDwKZ5AEj5VyDVhDcHEqJo1pW6ElVe5A1Rnh7m11SsZ_yi5lbrfssa18RFOzU9XYSmqdqEsEzFGxlAdiTB-eeFSRTt7jUALVZ66jPiUQ6fju8qI9KKRB9Tg80N3sfjoULUp_EwbYGx7HVuxtvl_cPUYDpmb3gsjsAU1Fd877ddpLvsfTxi4hw'
} }
} }
console.log('appConfig', appConfig) console.log('appConfig', appConfig)