[ARVADOS-WORKBENCH2] updated: 1.2.0-1025-g486d4d2

[Git user]

Summary of changes:
 .../project-properties-dialog/project-properties-form.tsx        | 5 ++++-
 .../resource-properties-form/resource-properties-form.tsx        | 9 ++++++---
 src/views/collection-panel/collection-tag-form.tsx               | 5 ++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

       via  486d4d2abb7329ea90fb31b9901c767d69b4ef37 (commit)
       via  52bc782204edbbf55ec837a23029eee6c40629fb (commit)
       via  4ff8b25918f8441696baa393b10435a384fbc8eb (commit)
      from  2cb16ce08bd7f09fdff84c572429485384455d7a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 486d4d2abb7329ea90fb31b9901c767d69b4ef37
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Wed Nov 28 12:48:59 2018 +0100

    Add margin to CollectionTagForm
    
    Feature #14393
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views/collection-panel/collection-tag-form.tsx b/src/views/collection-panel/collection-tag-form.tsx
index 04e37f2..fd4f088 100644
--- a/src/views/collection-panel/collection-tag-form.tsx
+++ b/src/views/collection-panel/collection-tag-form.tsx
@@ -5,6 +5,9 @@
 import { reduxForm, reset } from 'redux-form';
 import { createCollectionTag, COLLECTION_TAG_FORM_NAME } from '~/store/collection-panel/collection-panel-action';
 import { ResourcePropertiesForm, ResourcePropertiesFormData } from '~/views-components/resource-properties-form/resource-properties-form';
+import { withStyles } from '@material-ui/core';
+
+const Form = withStyles(({ spacing }) => ({ container: { marginBottom: spacing.unit * 2 } }))(ResourcePropertiesForm);
 
 export const CollectionTagForm = reduxForm<ResourcePropertiesFormData>({
     form: COLLECTION_TAG_FORM_NAME,
@@ -12,4 +15,4 @@ export const CollectionTagForm = reduxForm<ResourcePropertiesFormData>({
         dispatch<any>(createCollectionTag(data));
         dispatch(reset(COLLECTION_TAG_FORM_NAME));
     }
-})(ResourcePropertiesForm);
+})(Form);

commit 52bc782204edbbf55ec837a23029eee6c40629fb
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Wed Nov 28 12:47:16 2018 +0100

    Add margin to ProjectPropertiesForm
    
    Feature #14393
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views-components/project-properties-dialog/project-properties-form.tsx b/src/views-components/project-properties-dialog/project-properties-form.tsx
index bd72bcf..90c8c08 100644
--- a/src/views-components/project-properties-dialog/project-properties-form.tsx
+++ b/src/views-components/project-properties-dialog/project-properties-form.tsx
@@ -5,6 +5,9 @@
 import { reduxForm, reset } from 'redux-form';
 import { PROJECT_PROPERTIES_FORM_NAME, createProjectProperty } from '~/store/details-panel/details-panel-action';
 import { ResourcePropertiesForm, ResourcePropertiesFormData } from '~/views-components/resource-properties-form/resource-properties-form';
+import { withStyles } from '@material-ui/core';
+
+const Form = withStyles(({ spacing }) => ({ container: { marginBottom: spacing.unit * 2 } }))(ResourcePropertiesForm);
 
 export const ProjectPropertiesForm = reduxForm<ResourcePropertiesFormData>({
     form: PROJECT_PROPERTIES_FORM_NAME,
@@ -12,4 +15,4 @@ export const ProjectPropertiesForm = reduxForm<ResourcePropertiesFormData>({
         dispatch<any>(createProjectProperty(data));
         dispatch(reset(PROJECT_PROPERTIES_FORM_NAME));
     }
-})(ResourcePropertiesForm);
+})(Form);

commit 4ff8b25918f8441696baa393b10435a384fbc8eb
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Wed Nov 28 12:40:43 2018 +0100

    Add classes prop to ResourcePropertiesForm
    
    Feature #14393
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views-components/resource-properties-form/resource-properties-form.tsx b/src/views-components/resource-properties-form/resource-properties-form.tsx
index eeddf12..a62b3d1 100644
--- a/src/views-components/resource-properties-form/resource-properties-form.tsx
+++ b/src/views-components/resource-properties-form/resource-properties-form.tsx
@@ -4,19 +4,22 @@
 
 import * as React from 'react';
 import { InjectedFormProps } from 'redux-form';
-import { Grid, withStyles } from '@material-ui/core';
+import { Grid, withStyles, WithStyles } from '@material-ui/core';
 import { PropertyKeyField, PROPERTY_KEY_FIELD_NAME } from './property-key-field';
 import { PropertyValueField, PROPERTY_VALUE_FIELD_NAME } from './property-value-field';
 import { ProgressButton } from '~/components/progress-button/progress-button';
+import { GridClassKey } from '@material-ui/core/Grid';
 
 export interface ResourcePropertiesFormData {
     [PROPERTY_KEY_FIELD_NAME]: string;
     [PROPERTY_VALUE_FIELD_NAME]: string;
 }
 
-export const ResourcePropertiesForm = ({ handleSubmit, submitting, invalid }: InjectedFormProps<ResourcePropertiesFormData>) =>
+export type ResourcePropertiesFormProps = InjectedFormProps<ResourcePropertiesFormData> & WithStyles<GridClassKey>;
+
+export const ResourcePropertiesForm = ({ handleSubmit, submitting, invalid, classes }: ResourcePropertiesFormProps ) =>
     <form onSubmit={handleSubmit}>
-        <Grid container spacing={16}>
+        <Grid container spacing={16} classes={classes}>
             <Grid item xs>
                 <PropertyKeyField />
             </Grid>

-----------------------------------------------------------------------


hooks/post-receive
--