This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new e541bbe15 fix: fix some small bug (#3967)
e541bbe15 is described below
commit e541bbe15d945c0ff9c36eaac324eec50fc773db
Author: Likyh <[email protected]>
AuthorDate: Mon Dec 19 16:00:02 2022 +0800
fix: fix some small bug (#3967)
* fix: fix some small bug
* fix: for linter
* fix: add control for bp edit page
* fix: fix for review
---
config-ui/src/hooks/useBlueprintManager.jsx | 14 +++++++-------
config-ui/src/pages/blueprint/create/bp-context.tsx | 1 +
config-ui/src/pages/blueprint/create/step-four/index.tsx | 3 +++
config-ui/src/pages/blueprint/detail/blueprint-detail.tsx | 2 +-
.../detail/components/update-policy-dialog/index.tsx | 2 ++
.../src/pages/blueprint/detail/panel/configuration.tsx | 2 +-
config-ui/src/pages/blueprint/detail/types.ts | 2 ++
config-ui/src/pages/blueprint/detail/use-detail.ts | 2 +-
config-ui/src/pages/blueprints/blueprint-settings.jsx | 2 +-
config-ui/src/plugins/common/sync-policy/index.tsx | 15 +++++----------
10 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/config-ui/src/hooks/useBlueprintManager.jsx
b/config-ui/src/hooks/useBlueprintManager.jsx
index 4246d8f0b..5063c8804 100644
--- a/config-ui/src/hooks/useBlueprintManager.jsx
+++ b/config-ui/src/hooks/useBlueprintManager.jsx
@@ -15,14 +15,14 @@
* limitations under the License.
*
*/
-import {useCallback, useState} from 'react'
-import {DEVLAKE_ENDPOINT} from '@/utils/config'
+import { useCallback, useState } from 'react'
+import { DEVLAKE_ENDPOINT } from '@/utils/config'
import request from '@/utils/request'
-import {ToastNotification} from '@/components/Toast'
-import {BlueprintMode, NullBlueprint} from '@/data/NullBlueprint'
+import { ToastNotification } from '@/components/Toast'
+import { BlueprintMode, NullBlueprint } from '@/data/NullBlueprint'
import cron from 'cron-validate'
import parser from 'cron-parser'
-import {Intent} from '@blueprintjs/core'
+import { Intent } from '@blueprintjs/core'
function useBlueprintManager(
blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
@@ -194,7 +194,7 @@ function useBlueprintManager(
: NullBlueprint
)
setSkipOnFail(blueprintData.skipOnFail)
- setCreatedDateAfter(blueprintData.settings.createdDateAfter)
+ setCreatedDateAfter(blueprintData.settings?.createdDateAfter)
setErrors(b.status !== 200 ? [b.data] : [])
setTimeout(() => {
setIsFetching(false)
@@ -244,7 +244,7 @@ function useBlueprintManager(
enable: enable,
mode,
isManual,
- skipOnFail,
+ skipOnFail
}
console.log('>> DISPATCHING BLUEPRINT SAVE REQUEST', blueprintPayload)
const run = async () => {
diff --git a/config-ui/src/pages/blueprint/create/bp-context.tsx
b/config-ui/src/pages/blueprint/create/bp-context.tsx
index 700c5bc35..e4a705b6e 100644
--- a/config-ui/src/pages/blueprint/create/bp-context.tsx
+++ b/config-ui/src/pages/blueprint/create/bp-context.tsx
@@ -159,6 +159,7 @@ export const BPContextProvider = ({ from, projectName,
children }: Props) => {
params.plan = !validRawPlan(rawPlan)
? JSON.parse(rawPlan)
: JSON.stringify([[]], null, ' ')
+ params.settings = null
}
return params
diff --git a/config-ui/src/pages/blueprint/create/step-four/index.tsx
b/config-ui/src/pages/blueprint/create/step-four/index.tsx
index 4d7a5a116..81f3621bf 100644
--- a/config-ui/src/pages/blueprint/create/step-four/index.tsx
+++ b/config-ui/src/pages/blueprint/create/step-four/index.tsx
@@ -22,9 +22,11 @@ import { SyncPolicy } from '@/plugins'
import { Card, Divider } from '@/components'
import { useCreateBP } from '../bp-context'
+import {ModeEnum} from "../types";
export const StepFour = () => {
const {
+ mode,
isManual,
cronConfig,
skipOnFail,
@@ -43,6 +45,7 @@ export const StepFour = () => {
isManual={isManual}
cronConfig={cronConfig}
skipOnFail={skipOnFail}
+ showTimeFilter={mode == ModeEnum.normal}
createdDateAfter={createdDateAfter}
onChangeIsManual={onChangeIsManual}
onChangeCronConfig={onChangeCronConfig}
diff --git a/config-ui/src/pages/blueprint/detail/blueprint-detail.tsx
b/config-ui/src/pages/blueprint/detail/blueprint-detail.tsx
index 6efa3834c..91eb1061a 100644
--- a/config-ui/src/pages/blueprint/detail/blueprint-detail.tsx
+++ b/config-ui/src/pages/blueprint/detail/blueprint-detail.tsx
@@ -32,7 +32,7 @@ import Status from '@/pages/blueprints/blueprint-detail'
interface Props extends UseDetailProps {}
export const BlueprintDetail = ({ id }: Props) => {
- const [activeTab, setActiveTab] = useState<TabId>('configuration')
+ const [activeTab, setActiveTab] = useState<TabId>('status')
const { loading, blueprint, connections, saving, onUpdate } = useDetail({
id
diff --git
a/config-ui/src/pages/blueprint/detail/components/update-policy-dialog/index.tsx
b/config-ui/src/pages/blueprint/detail/components/update-policy-dialog/index.tsx
index 58bd02f18..ab376cf7c 100644
---
a/config-ui/src/pages/blueprint/detail/components/update-policy-dialog/index.tsx
+++
b/config-ui/src/pages/blueprint/detail/components/update-policy-dialog/index.tsx
@@ -22,6 +22,7 @@ import { Dialog } from '@/components'
import { SyncPolicy } from '@/plugins'
import type { BlueprintType } from '../../types'
+import {ModeEnum} from "@/pages/blueprint/create/types";
interface Props {
blueprint: BlueprintType
@@ -81,6 +82,7 @@ export const UpdatePolicyDialog = ({
isManual={isManual}
cronConfig={cronConfig}
skipOnFail={skipOnFail}
+ showTimeFilter={blueprint.mode == ModeEnum.normal}
createdDateAfter={createdDateAfter}
onChangeIsManual={setIsManual}
onChangeCronConfig={setCronConfig}
diff --git a/config-ui/src/pages/blueprint/detail/panel/configuration.tsx
b/config-ui/src/pages/blueprint/detail/panel/configuration.tsx
index edcaba059..120b93b1a 100644
--- a/config-ui/src/pages/blueprint/detail/panel/configuration.tsx
+++ b/config-ui/src/pages/blueprint/detail/panel/configuration.tsx
@@ -215,7 +215,7 @@ export const Configuration = ({
isManual={blueprint.isManual}
cronConfig={blueprint.cronConfig}
skipOnFail={blueprint.skipOnFail}
- createdDateAfter={blueprint.settings.createdDateAfter}
+ createdDateAfter={blueprint.settings?.createdDateAfter}
saving={saving}
onCancel={handleCancel}
onSubmit={handleUpdatePolicy}
diff --git a/config-ui/src/pages/blueprint/detail/types.ts
b/config-ui/src/pages/blueprint/detail/types.ts
index 5ad8c6bf0..21d81d4a1 100644
--- a/config-ui/src/pages/blueprint/detail/types.ts
+++ b/config-ui/src/pages/blueprint/detail/types.ts
@@ -17,6 +17,7 @@
*/
import { Plugins } from '@/plugins'
+import {ModeEnum} from "@/pages/blueprint/create/types";
export type ConnectionItemType = {
icon: string
@@ -29,6 +30,7 @@ export type ConnectionItemType = {
export type BlueprintType = {
id: ID
+ mode: ModeEnum
name: string
isManual: boolean
cronConfig: string
diff --git a/config-ui/src/pages/blueprint/detail/use-detail.ts
b/config-ui/src/pages/blueprint/detail/use-detail.ts
index 4b41d123f..986f4d644 100644
--- a/config-ui/src/pages/blueprint/detail/use-detail.ts
+++ b/config-ui/src/pages/blueprint/detail/use-detail.ts
@@ -56,7 +56,7 @@ export const useDetail = ({ id }: UseDetailProps) => {
try {
const res = await API.getBlueprint(id)
setBlueprint(res)
- setConnections(transformConnection(res.settings.connections))
+ setConnections(transformConnection(res.settings?.connections || []))
} finally {
setLoading(false)
}
diff --git a/config-ui/src/pages/blueprints/blueprint-settings.jsx
b/config-ui/src/pages/blueprints/blueprint-settings.jsx
index ca32ffa97..06d358ca9 100644
--- a/config-ui/src/pages/blueprints/blueprint-settings.jsx
+++ b/config-ui/src/pages/blueprints/blueprint-settings.jsx
@@ -680,7 +680,7 @@ const BlueprintSettings = ({ id }) => {
payload: {
isManual: !!isManualCron,
skipOnFail,
- settings: {...blueprintSettings, createdDateAfter},
+ settings: { ...blueprintSettings, createdDateAfter },
cronConfig: isManualCron
? getCronPreset('daily').cronConfig
: isCustomCron
diff --git a/config-ui/src/plugins/common/sync-policy/index.tsx
b/config-ui/src/plugins/common/sync-policy/index.tsx
index 3e8cda5cb..f0bf542db 100644
--- a/config-ui/src/plugins/common/sync-policy/index.tsx
+++ b/config-ui/src/plugins/common/sync-policy/index.tsx
@@ -17,14 +17,7 @@
*/
import React, { useMemo } from 'react'
-import {
- RadioGroup,
- Radio,
- InputGroup,
- Icon,
- Checkbox,
- Position
-} from '@blueprintjs/core'
+import { Checkbox, Icon, InputGroup, Position, Radio, RadioGroup } from
'@blueprintjs/core'
import { Popover2 } from '@blueprintjs/popover2'
import StartFromSelector from '@/components/blueprints/StartFromSelector'
@@ -37,6 +30,7 @@ interface Props {
isManual: boolean
cronConfig: string
skipOnFail: boolean
+ showTimeFilter: boolean
createdDateAfter: string | null
onChangeIsManual: (val: boolean) => void
onChangeCronConfig: (val: string) => void
@@ -48,6 +42,7 @@ export const SyncPolicy = ({
isManual,
cronConfig,
skipOnFail,
+ showTimeFilter,
createdDateAfter,
onChangeIsManual,
onChangeCronConfig,
@@ -76,7 +71,7 @@ export const SyncPolicy = ({
return (
<S.Wrapper>
- <div className='block'>
+ {showTimeFilter && <div className='block'>
<h3>Time Filter *</h3>
<p>
Select the data range you wish to collect. DevLake will collect the
@@ -87,7 +82,7 @@ export const SyncPolicy = ({
date={createdDateAfter}
onSave={onChangeCreatedDateAfter}
/>
- </div>
+ </div>}
<div className='block'>
<h3>Frequency</h3>
<p>Blueprints will run recurringly based on the sync frequency.</p>
