From d4468cdda6cd997db038c5060e87edc14cc6bc94 Mon Sep 17 00:00:00 2001 From: Foxhoundn Date: Wed, 7 Aug 2024 14:53:05 +0200 Subject: [PATCH 1/4] Textarea in CSV Modal now resizes with the modal --- package.json | 2 +- src/js/hocomponents/csv.tsx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e24d934b..ea4096c1 100644 --- 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/hocomponents/csv.tsx b/src/js/hocomponents/csv.tsx index 48b4311c..b7ced611 100644 --- a/src/js/hocomponents/csv.tsx +++ b/src/js/hocomponents/csv.tsx @@ -72,11 +72,12 @@ export default (collection: string, name: string): Function => ]} > )} From 6734e72c172e77aaa2ee2dc18fbbf7e3ead6225f Mon Sep 17 00:00:00 2001 From: Foxhoundn Date: Wed, 7 Aug 2024 15:02:10 +0200 Subject: [PATCH 2/4] Add default height to the modal --- src/js/hocomponents/csv.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/js/hocomponents/csv.tsx b/src/js/hocomponents/csv.tsx index b7ced611..2247e132 100644 --- 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', @@ -77,7 +78,7 @@ export default (collection: string, name: string): Function => wrapperStyle={{ height: '100%' }} readOnly id="CSV-modal-text" - value={`${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}${generateCSV(props[collection], name)}`} + value={`${generateCSV(props[collection], name)}`} /> )} From 0dfeeef78e4422129f583a6fb8dcb40e3d994f4c Mon Sep 17 00:00:00 2001 From: Foxhoundn Date: Thu, 8 Aug 2024 11:20:58 +0200 Subject: [PATCH 3/4] Remove resize --- src/js/hocomponents/csv.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/hocomponents/csv.tsx b/src/js/hocomponents/csv.tsx index 2247e132..17c2b306 100644 --- a/src/js/hocomponents/csv.tsx +++ b/src/js/hocomponents/csv.tsx @@ -74,7 +74,7 @@ export default (collection: string, name: string): Function => > Date: Thu, 8 Aug 2024 11:51:40 +0200 Subject: [PATCH 4/4] Cosmetic fixes --- src/js/components/StepCodeDiagram/index.tsx | 18 ++++++------------ src/js/components/box/index.tsx | 1 - src/js/hocomponents/csv.tsx | 2 +- src/js/views/order/hierarchy/index.tsx | 3 +-- src/js/views/order/hierarchy/row.tsx | 2 +- src/js/views/workflows/tabs/index.tsx | 1 + src/js/views/workflows/tabs/list/index.tsx | 1 - 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/js/components/StepCodeDiagram/index.tsx b/src/js/components/StepCodeDiagram/index.tsx index 1cdbde2f..f33d802a 100644 --- 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 ( - - - {/* @ts-ignore ts-migrate(2339) FIXME: Property 'normalizedName' does not exist on type '... Remove this comment to see the full error message */} - {workflow.normalizedName} - - - + + {workflow.normalizedName} + {useDrag && ( @@ -1101,9 +1096,8 @@ class StepsTab extends Component { onClick={this.handleZoomReset} big /> - - - + +
/> )} - ; + ); }; diff --git a/src/js/views/order/hierarchy/index.tsx b/src/js/views/order/hierarchy/index.tsx index b0398c29..70d0fdcf 100644 --- 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) => ( - + diff --git a/src/js/views/order/hierarchy/row.tsx b/src/js/views/order/hierarchy/row.tsx index c96a03b7..899e5279 100644 --- 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) => ( - + '--')} ${ diff --git a/src/js/views/workflows/tabs/index.tsx b/src/js/views/workflows/tabs/index.tsx index f4159283..eb02c4f5 100644 --- a/src/js/views/workflows/tabs/index.tsx +++ b/src/js/views/workflows/tabs/index.tsx @@ -48,6 +48,7 @@ WorkflowDetailTabsProps) => ( {!isPane && ( + )} {!isPane && ( diff --git a/src/js/views/workflows/tabs/list/index.tsx b/src/js/views/workflows/tabs/list/index.tsx index f974be39..90efd4f3 100644 --- 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';