Merge pull request #107 from qoretechnologies/develop

v6.0-2.0.3
qoretechnologies · Aug 8, 2024 · 2004970 · 2004970
2 parents 4e7a459 + b0636ae
commit 2004970
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qorus-ui",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Qorus UI",
   "author": "Qore Technologies",
   "repository": {

diff --git a/src/js/components/StepCodeDiagram/index.tsx b/src/js/components/StepCodeDiagram/index.tsx
@@ -12,11 +12,10 @@ import { groupInstances } from '../../helpers/orders';
 import modal from '../../hocomponents/modal';
 import { graph } from '../../lib/graph';
 import StepDetailTable from '../../views/order/diagram/step_details';
-import { Breadcrumbs, Crumb } from '../breadcrumbs';
 // @ts-ignore ts-migrate(2306) FIXME: File '/workspace/qorus-webapp/src/js/components/co... Remove this comment to see the full error message
+import { ReqoreControlGroup, ReqoreH5 } from '@qoretechnologies/reqore';
 import { Control as Button, Controls as ButtonGroup } from '../controls';
 import Flex from '../Flex';
-import Headbar from '../Headbar';
 import Loader from '../loader';
 import Pull from '../Pull';
 import StepModal from './modal';
@@ -1056,13 +1055,9 @@ class StepsTab extends Component {
 
     return (
       <Flex>
-        <Headbar>
-          <Breadcrumbs collapsed>
-            {/* @ts-ignore ts-migrate(2339) FIXME: Property 'normalizedName' does not exist on type '... Remove this comment to see the full error message */}
-            <Crumb>{workflow.normalizedName}</Crumb>
-          </Breadcrumbs>
-          <Pull right>
-            <ButtonGroup>
+        <ReqoreControlGroup style={{ justifyContent: 'space-between'}}>
+          <ReqoreH5>{workflow.normalizedName}</ReqoreH5>
+          <ReqoreControlGroup>
               {useDrag && (
                 <span style={{ lineHeight: '30px', paddingRight: 5 }} className="text-muted">
                   <FormattedMessage id="button.drag-to-move-around" />
@@ -1101,9 +1096,8 @@ class StepsTab extends Component {
                 onClick={this.handleZoomReset}
                 big
               />
-            </ButtonGroup>
-          </Pull>
-        </Headbar>
+          </ReqoreControlGroup>
+        </ReqoreControlGroup>
         <div
           ref={this.handlePanRef}
           style={{

diff --git a/src/js/components/box/index.tsx b/src/js/components/box/index.tsx
@@ -1,5 +1,4 @@
 // @flow
-import React from 'react';
 import pure from 'recompose/onlyUpdateForKeys';
 import Flex from '../Flex';
 

diff --git a/src/js/hocomponents/csv.tsx b/src/js/hocomponents/csv.tsx
@@ -49,6 +49,7 @@ export default (collection: string, name: string): Function =>
               label="Export data as CSV"
               onClose={() => setIsOpen(false)}
               fill
+              height='400px'
               bottomActions={[
                 {
                   label: 'Copy',
@@ -72,15 +73,16 @@ export default (collection: string, name: string): Function =>
               ]}
             >
               <ReqoreTextarea
-                scaleWithContent
                 fluid
+                style={{ height: '100%', resize: 'none' }}
+                wrapperStyle={{ height: '100%' }}
                 readOnly
                 id="CSV-modal-text"
                 value={`${generateCSV(props[collection], name)}`}
               />
             </ReqoreModal>
           )}
-          <Component onCSVClick={handleCSVClick} {...props} />;
+          <Component onCSVClick={handleCSVClick} {...props} />
         </>
       );
     };

diff --git a/src/js/views/order/hierarchy/index.tsx b/src/js/views/order/hierarchy/index.tsx
@@ -1,7 +1,6 @@
 // @flow
 import map from 'lodash/map';
 import size from 'lodash/size';
-import React from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import compose from 'recompose/compose';
 import mapProps from 'recompose/mapProps';
@@ -88,7 +87,7 @@ Props) => (
             </Th>
           </FixedRow>
           <FixedRow {...{ sortData, onSortChange }}>
-            <IdColumnHeader />
+            <IdColumnHeader className="medium" />
             <NameColumnHeader title={intl.formatMessage({ id: 'table.workflow' })} />
             <Th icon="info-sign" name="workflowstatus">
               <FormattedMessage id="table.status" />

diff --git a/src/js/views/order/hierarchy/row.tsx b/src/js/views/order/hierarchy/row.tsx
@@ -27,7 +27,7 @@ const HierarchyRow: Function = ({
 }: // @ts-ignore ts-migrate(2724) FIXME: 'React' has no exported member named 'Element'. Di... Remove this comment to see the full error message
 Props) => (
   <Tr first={first}>
-    <NameColumn name={id} link={`/order/${id}/24h`} type="order" className="normal" />
+    <NameColumn name={id} link={`/order/${id}/24h`} type="order" className="medium" />
     <NameColumn
       // @ts-ignore ts-migrate(2339) FIXME: Property 'hierarchy_level' does not exist on type ... Remove this comment to see the full error message
       name={`${[...Array(item.hierarchy_level)].map((): string => '--')} ${

diff --git a/src/js/views/workflows/tabs/index.tsx b/src/js/views/workflows/tabs/index.tsx
@@ -48,6 +48,7 @@ WorkflowDetailTabsProps) => (
     {!isPane && (
       <SimpleTab name="orders">
         <List {...{ workflow, date, location, linkDate }} />
+
       </SimpleTab>
     )}
     {!isPane && (

diff --git a/src/js/views/workflows/tabs/list/index.tsx b/src/js/views/workflows/tabs/list/index.tsx
@@ -1,6 +1,5 @@
 // @flow
 import flowRight from 'lodash/flowRight';
-import React from 'react';
 import { connect } from 'react-redux';
 import compose from 'recompose/compose';
 import lifecycle from 'recompose/lifecycle';