CrossBucket push, frontend

catalog/app/containers/Bucket/CopyButton.js

@@ -93,7 +93,7 @@ function Button({ children, onClick }) {
       <M.Icon>exit_to_app</M.Icon>
     </M.IconButton>
   ) : (
-    <M.Button startIcon={<M.Icon>arrow_right_alt</M.Icon>} variant="outlined" {...props}>
+    <M.Button variant="outlined" {...props}>
       {children}
     </M.Button>
   )

catalog/app/containers/Bucket/PackageCopyDialog.js

@@ -12,31 +12,21 @@ import Delay from 'utils/Delay'
 import * as NamedRoutes from 'utils/NamedRoutes'
 import StyledLink from 'utils/StyledLink'
 import tagged from 'utils/tagged'
+import * as workflows from 'utils/workflows'
 import * as validators from 'utils/validators'
 
 import * as PD from './PackageDialog'
 import * as requests from './requests'
 
 async function requestPackageCopy(
   req,
-  {
-    commitMessage,
-    copyData,
-    hash,
-    initialName,
-    meta,
-    name,
-    sourceBucket,
-    targetBucket,
-    workflow,
-  },
+  { commitMessage, hash, initialName, meta, name, sourceBucket, targetBucket, workflow },
 ) {
   try {
     return req({
       endpoint: '/packages/promote',
       method: 'POST',
       body: {
-        copy_data: copyData,
         message: commitMessage,
         meta: PD.getMetaValue(meta),
         name,
@@ -54,51 +44,6 @@ async function requestPackageCopy(
   }
 }
 
-const useCopyDataSwitcherStyles = M.makeStyles((t) => ({
-  root: {
-    marginTop: t.spacing(2),
-  },
-  icon: {
-    color: t.palette.text.hint,
-    marginLeft: t.spacing(1),
-    verticalAlign: '-4px',
-  },
-}))
-
-function CopyDataSwitcher({ input: { onChange, value }, targetBucket, sourceBucket }) {
-  const classes = useCopyDataSwitcherStyles()
-
-  const handleChange = React.useCallback((event) => onChange(event.target.checked), [
-    onChange,
-  ])
-
-  const hint = (
-    <span>
-      Copy data
-      <M.Tooltip
-        title={
-          value
-            ? `Files will be copied to s3://${targetBucket}`
-            : `Files from the package will be reused, only links will be copied`
-        }
-      >
-        <M.Icon color="inherit" className={classes.icon} fontSize="small">
-          help_outline
-        </M.Icon>
-      </M.Tooltip>
-    </span>
-  )
-
-  return (
-    <div className={classes.root}>
-      <M.FormControlLabel
-        control={<M.Checkbox color="primary" checked={value} onChange={handleChange} />}
-        label={hint}
-      />
-    </div>
-  )
-}
-
 function DialogTitle({ bucket }) {
   const { urls } = NamedRoutes.use()
 
@@ -113,12 +58,6 @@ function DialogTitle({ bucket }) {
   )
 }
 
-const useDialogFormStyles = M.makeStyles(() => ({
-  filesWrapper: {
-    position: 'relative',
-  },
-}))
-
 function DialogForm({
   close,
   hash,
@@ -129,8 +68,6 @@ function DialogForm({
   targetBucket,
   workflowsConfig,
 }) {
-  const classes = useDialogFormStyles()
-
   const nameValidator = PD.useNameValidator()
 
   const initialMeta = React.useMemo(
@@ -144,11 +81,10 @@ function DialogForm({
   const req = APIConnector.use()
 
   // eslint-disable-next-line consistent-return
-  const onSubmit = async ({ commitMessage, copyData, name, meta, workflow }) => {
+  const onSubmit = async ({ commitMessage, name, meta, workflow }) => {
     try {
       const res = await requestPackageCopy(req, {
         commitMessage,
-        copyData,
         hash,
         initialName,
         meta,
@@ -165,6 +101,11 @@ function DialogForm({
     }
   }
 
+  const copyData = React.useMemo(
+    () => workflows.shouldSuccessorCopyData(workflowsConfig, targetBucket),
+    [targetBucket, workflowsConfig],
+  )
+
   return (
     <RF.Form onSubmit={onSubmit}>
       {({
@@ -214,16 +155,6 @@ function DialogForm({
                 margin="normal"
               />
 
-              <RF.Field
-                className={classes.filesSwitcher}
-                component={CopyDataSwitcher}
-                initialValue={workflowsConfig.copyData}
-                name="copyData"
-                sourceBucket={sourceBucket}
-                targetBucket={targetBucket}
-                validateFields={['copyData']}
-              />
-
               <PD.SchemaFetcher
                 schemaUrl={R.pathOr('', ['schema', 'url'], values.workflow)}
               >
@@ -265,7 +196,7 @@ function DialogForm({
                       <M.CircularProgress size={24} variant="indeterminate" />
                       <M.Box pl={1} />
                       <M.Typography variant="body2" color="textSecondary">
-                        {values.copyData
+                        {copyData
                           ? 'Copying files and writing manfest'
                           : 'Writing manifest'}
                       </M.Typography>

catalog/app/utils/workflows.js

@@ -14,13 +14,25 @@ function getNoWorkflow(data, hasConfig) {
   }
 }
 
+const COPY_DATA_DEFAULT = true
+
 export const emptyConfig = {
-  copyData: false,
+  copyData: COPY_DATA_DEFAULT,
   isRequired: false,
   successors: [],
   workflows: [getNoWorkflow({}, false)],
 }
 
+export function shouldSuccessorCopyData(workflowsConfig, bucket) {
+  if (!workflowsConfig.successors || !workflowsConfig.successors.length)
+    return COPY_DATA_DEFAULT
+
+  const successor = R.find(R.propEq('slug', bucket), workflowsConfig.successors)
+  if (!successor) return COPY_DATA_DEFAULT
+
+  return successor.copyData
+}
+
 function parseSchema(schemaSlug, schemas) {
   return {
     url: R.path([schemaSlug, 'url'], schemas),
@@ -38,6 +50,7 @@ function parseWorkflow(workflowSlug, workflow, data) {
 }
 
 const parseSuccessor = (url, successor) => ({
+  copyData: successor.copy_data || false,
   name: successor.title,
   slug: s3paths.parseS3Url(url).bucket,
   url,
@@ -60,7 +73,6 @@ export function parse(workflowsYaml) {
 
   const successors = data.successors || {}
   return {
-    copyData: data.copy_data || false,
     isRequired: data.is_workflow_required,
     successors: Object.entries(successors).map(([url, successor]) =>
       parseSuccessor(url, successor),

catalog/app/utils/workflows.spec.js

@@ -189,15 +189,72 @@ describe('utils/workflows', () => {
       const data = dedent`
         version: "1"
         default_workflow: workflow_2
-        copy_data: True
+        successors:
+          s3://something:
+            title: Successor №1
+            copy_data: True
+          s3://bucket-multiworded:
+            copy_data: False
+            title: Multi worded bucket
+          s3://bucket-copy-default:
+            title: Copy default
+        workflows:
+          workflow_1:
+            name: Workflow №1
+      `
+      const config = workflows.parse(data)
+
+      it('should return copyData params', () => {
+        expect(config.successors).toMatchObject([
+          {
+            name: 'Successor №1',
+            slug: 'something',
+            url: 's3://something',
+            copyData: true,
+          },
+          {
+            name: 'Multi worded bucket',
+            slug: 'bucket-multiworded',
+            url: 's3://bucket-multiworded',
+            copyData: false,
+          },
+          {
+            name: 'Copy default',
+            slug: 'bucket-copy-default',
+            url: 's3://bucket-copy-default',
+            copyData: false,
+          },
+        ])
+      })
+    })
+
+    describe('shouldSuccessorCopyData', () => {
+      const data = dedent`
+        version: "1"
+        default_workflow: workflow_2
+        successors:
+          s3://something:
+            title: Successor №1
+            copy_data: True
+          s3://bucket-multiworded:
+            copy_data: False
+            title: Multi worded bucket
+          s3://bucket-copy-default:
+            title: Copy default
         workflows:
           workflow_1:
             name: Workflow №1
       `
       const config = workflows.parse(data)
 
-      it('should return copyData param', () => {
-        expect(config.copyData).toBe(true)
+      it('should return false by default', () => {
+        expect(workflows.shouldSuccessorCopyData(config, 'fgsfds')).toBe(true)
+      })
+
+      it('should return correct value when value set', () => {
+        expect(workflows.shouldSuccessorCopyData(config, 'bucket-multiworded')).toBe(
+          false,
+        )
       })
     })
   })