[ARVADOS-WORKBENCH2] updated: 1.2.0-204-gb026476

Git user git at public.curoverse.com
Thu Aug 30 04:09:32 EDT 2018


Summary of changes:
 src/store/context-menu/context-menu-actions.ts     |  11 ++
 .../process-information-card.ts                    |  24 ++++
 src/views/process-panel/information-card.tsx       | 123 ---------------------
 .../process-panel/process-information-card.tsx     | 119 ++++++++++++++++++++
 src/views/process-panel/process-panel.tsx          |   2 +-
 5 files changed, 155 insertions(+), 124 deletions(-)
 create mode 100644 src/views-components/process-information-card/process-information-card.ts
 delete mode 100644 src/views/process-panel/information-card.tsx
 create mode 100644 src/views/process-panel/process-information-card.tsx

       via  b026476240a6f347b579e03efd53a9043f8daa5a (commit)
       via  e2ea20e09a5e5a629eee78145f35a9ed443a5867 (commit)
       via  a54f5270f980d4c2c6143b6654fb96a57b7bf46c (commit)
      from  3d996002ab1f259b31d07858d9c5d0a780600a00 (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 b026476240a6f347b579e03efd53a9043f8daa5a
Merge: 3d99600 e2ea20e
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date:   Thu Aug 30 10:09:16 2018 +0200

    Merge branch 'master' into 13860-status-for-subprocesses
    
    refs #13860
    
    Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>

diff --cc src/views/process-panel/process-panel.tsx
index 3b21b57,f416f7b..2c8db99
--- a/src/views/process-panel/process-panel.tsx
+++ b/src/views/process-panel/process-panel.tsx
@@@ -3,68 -3,17 +3,68 @@@
  // SPDX-License-Identifier: AGPL-3.0
  
  import * as React from 'react';
 -import { ProcessInformationCard } from '~/views-components/process-information-card/process-information-card';
  import { Grid } from '@material-ui/core';
- import { ProcessInformationCard } from '~/views/process-panel/information-card';
++import { ProcessInformationCard } from '~/views-components/process-information-card/process-information-card';
 +import { SubprocessesCard } from '~/views/process-panel/subprocesses-card';
 +import { SubprocessFilterDataProps } from '~/components/subprocess-filter/subprocess-filter';
  
  export class ProcessPanel extends React.Component {
 +    state = {
 +        filters: [
 +            {
 +                key: 'queued',
 +                value: 1,
 +                label: 'Queued',
 +                checked: true
 +            }, {
 +                key: 'active',
 +                value: 2,
 +                label: 'Active',
 +                checked: true
 +            },
 +            {
 +                key: 'completed',
 +                value: 2,
 +                label: 'Completed',
 +                checked: true
 +            },
 +            {
 +                key: 'failed',
 +                value: 2,
 +                label: 'Failed',
 +                checked: true
 +            }
 +        ]
 +    };
 +
 +    onToggle = (filter: SubprocessFilterDataProps) => {
 +        this.setState((prev: { filters: any[] }) => {
 +            return {
 +                filters: prev.filters.map((f: SubprocessFilterDataProps) => {
 +                    if(f.key === filter.key) {
 +                        return {
 +                            ...filter,
 +                            checked: !filter.checked
 +                        };
 +                    }
 +                    return f;
 +                })
 +            };
 +        });
 +    }
 +
      render() {
 -        return <div>
 -            <Grid container>
 -                <Grid item xs={7}>
 -                    <ProcessInformationCard />
 -                </Grid>
 +        return <Grid container spacing={16}>
 +            <Grid item xs={7}>
 +                <ProcessInformationCard />
 +            </Grid>
 +            <Grid item xs={5}>
 +                <SubprocessesCard 
 +                    subprocesses={4}
 +                    filters={this.state.filters}
 +                    onToggle={this.onToggle}
 +                />
              </Grid>
 -        </div>;
 +        </Grid>;
      }
 -}
 +}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list