Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: The latest workflow records are not loaded #776

Merged
merged 1 commit into from
Apr 16, 2023
Merged

Fix: The latest workflow records are not loaded #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/velaux-data/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"./CHANGELOG.md",
"LICENSE_APACHE2"
],
"main": "dist/index.js",
"main": "src/index.ts",
"types": "dist/index.d.ts",
"scripts": {
"build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/velaux-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"files": [
"dist/**"
],
"main": "dist/types.js",
"main": "src/index.ts",
"types": "dist/types.d.ts",
"publishConfig": {
"main": "dist/types.js",
Expand Down
9 changes: 2 additions & 7 deletions packages/velaux-ui/src/components/UISchema/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ class UISchema extends Component<Props, State> {
});
const formItemLayout = {
labelCol: {
fixedSpan: 5,
fixedSpan: 9,
},
wrapperCol: {
span: 14,
Expand All @@ -986,12 +986,7 @@ class UISchema extends Component<Props, State> {
<Divider />
<If condition={showAdvancedButton}>
<Form {...formItemLayout} style={{ width: '100%' }} fullWidth={true}>
<Form.Item
labelAlign="left"
colon={true}
label={<Translation>Advanced Parameters</Translation>}
labelWidth="200px"
>
<Form.Item labelAlign="left" colon={true} label={<Translation>Advanced Parameters</Translation>}>
<Switch onChange={this.onChangeAdvanced} size="small" checked={advanced} />
</Form.Item>
</Form>
Expand Down
4 changes: 4 additions & 0 deletions packages/velaux-ui/src/pages/ApplicationConfig/components/ComponentDialog/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,7 @@
}
}
}

.footer-actions {
display: flex;
}
2 changes: 1 addition & 1 deletion packages/velaux-ui/src/pages/ApplicationConfig/components/ComponentDialog/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class ComponentDialog extends React.Component<Props, State> {
const { onComponentClose, isEditComponent, project, componentName, appName } = this.props;
const { isCreateComponentLoading, isUpdateComponentLoading } = this.state;
return (
<div>
<div className="footer-actions">
<Button type="secondary" onClick={onComponentClose} className="margin-right-10">
{i18n.t('Cancel').toString()}
</Button>
Expand Down
1 change: 1 addition & 0 deletions packages/velaux-ui/src/pages/ApplicationWorkflowStatus/components/WorkflowRecord/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
background: #fff;
border-radius: 8px;
box-shadow: var(--elevation-3);
width: 280px;
&:before {
position: absolute;
top: 32px;
Expand Down
3 changes: 2 additions & 1 deletion packages/velaux-ui/src/pages/ApplicationWorkflowStatus/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class ApplicationWorkflow extends React.Component<Props, State> {
if (env) {
getApplicationEnvRecords({ appName: appName, envName: envName }).then((res: { records: WorkflowRecord[] }) => {
if (res) {
const records = res.records.reverse();
const records = res.records;
this.setState({ records: records || [], showRecordName: '' });
const currentRecord = res.records.find((re) => re.name === record);
if (currentRecord) {
Expand Down Expand Up @@ -194,6 +194,7 @@ class ApplicationWorkflow extends React.Component<Props, State> {
<Select
value={showRecordName}
locale={locale().Select}
autoWidth={false}
placeholder={i18n.t('Switch the workflow record')}
onChange={(selectRecord: string) => {
this.setState({ showRecordName: selectRecord }, () => {
Expand Down
3 changes: 1 addition & 2 deletions pkg/server/domain/service/workflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,8 @@ func (w *workflowServiceImpl) ListWorkflowRecordsFromEnv(ctx context.Context, ap
}

filterOptions := datastore.FilterOptions{In: []datastore.InQueryOption{{Key: "workflowName", Values: wfNames}}}

records, err := w.Store.List(ctx, &record, &datastore.ListOptions{Page: page, PageSize: pageSize, SortBy: []datastore.SortOption{
{Key: "createTime", Order: datastore.SortOrderAscending}},
{Key: "createTime", Order: datastore.SortOrderDescending}},
FilterOptions: filterOptions,
})
if err != nil {
Expand Down