You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2023/04/13 01:07:19 UTC
[dolphinscheduler] branch 3.1.6-prepare updated (f13c2d7a12 -> dc40cd76bc)
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a change to branch 3.1.6-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
from f13c2d7a12 doc: Add hyperlink for pydolphinscheduler doc (#13907)
new 897d3d3973 fix: docker auto push tag name (#13858)
new c4efc242ff Add release Helm Chart #13385
new dc40cd76bc Fix item, workflow, and task parameters in dependent task nodes can be searched (#13918)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/publish-docker.yaml | 4 ++-
deploy/kubernetes/dolphinscheduler/Chart.yaml | 2 +-
.../task/components/node/fields/use-dependent.ts | 33 +++++++++++++++++-----
.../views/projects/task/components/node/types.ts | 5 ++++
4 files changed, 35 insertions(+), 9 deletions(-)
[dolphinscheduler] 01/03: fix: docker auto push tag name (#13858)
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.6-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 897d3d39736234e4481a30b99d35f42fb4ee3a21
Author: Jay Chung <zh...@gmail.com>
AuthorDate: Mon Apr 3 18:28:26 2023 +0800
fix: docker auto push tag name (#13858)
---
.github/workflows/publish-docker.yaml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 3fa1cf4b1f..612f4a10db 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -48,11 +48,13 @@ jobs:
echo "DOCKER_USERNAME=${{ secrets.DOCKERHUB_USER }}" >> $GITHUB_ENV
echo "DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }}" >> $GITHUB_ENV
echo "HUB=apache" >> $GITHUB_ENV
+ echo "DOCKER_TAG=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
else
echo "DOCKER_REGISTRY=ghcr.io/apache/dolphinscheduler" >> $GITHUB_ENV
echo "DOCKER_USERNAME=${{ github.actor }}" >> $GITHUB_ENV
echo "DOCKER_PASSWORD=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
echo "HUB=ghcr.io/apache/dolphinscheduler" >> $GITHUB_ENV
+ echo "DOCKER_TAG=${{ github.sha }}" >> $GITHUB_ENV
fi
- name: Log in to the Container registry
uses: docker/login-action@v2
@@ -71,6 +73,6 @@ jobs:
-Dmaven.javadoc.skip \
-Dcheckstyle.skip=true \
-Dmaven.deploy.skip \
- -Ddocker.tag=${{ github.sha }} \
+ -Ddocker.tag=${{ env.DOCKER_TAG }} \
-Ddocker.hub=${{ env.HUB }} \
-Pdocker,release
[dolphinscheduler] 03/03: Fix item, workflow, and task parameters in dependent task nodes can be searched (#13918)
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.6-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit dc40cd76bcd0ce79c8939cdaf21ddba563e17a79
Author: Kerwin <37...@users.noreply.github.com>
AuthorDate: Thu Apr 13 08:56:38 2023 +0800
Fix item, workflow, and task parameters in dependent task nodes can be searched (#13918)
---
.../task/components/node/fields/use-dependent.ts | 33 +++++++++++++++++-----
.../views/projects/task/components/node/types.ts | 5 ++++
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dependent.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dependent.ts
index fdf757f95a..50d228cc99 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dependent.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dependent.ts
@@ -36,6 +36,7 @@ import type {
ITaskState,
IDateType
} from '../types'
+import {IRenderOption} from "../types";
export function useDependent(model: { [field: string]: any }): IJsonItem[] {
const { t } = useI18n()
@@ -44,12 +45,12 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
const dependentResult = nodeStore.getDependentResult
const TasksStateConfig = tasksState(t)
- const projectList = ref([] as { label: string; value: number }[])
+ const projectList = ref([] as IRenderOption[])
const processCache = {} as {
- [key: number]: { label: string; value: number }[]
+ [key: number]: IRenderOption[]
}
const taskCache = {} as {
- [key: number]: { label: string; value: number }[]
+ [key: number]: IRenderOption[]
}
const selectOptions = ref([] as IDependTaskOptions[])
@@ -182,7 +183,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
const result = await queryAllProjectListForDependent()
projectList.value = result.map((item: { code: number; name: string }) => ({
value: item.code,
- label: () => h(NEllipsis, null, item.name)
+ label: () => h(NEllipsis, null, item.name),
+ filterLabel: item.name
}))
return projectList
}
@@ -193,7 +195,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
const result = await queryProcessDefinitionList(code)
const processList = result.map((item: { code: number; name: string }) => ({
value: item.code,
- label: () => h(NEllipsis, null, item.name)
+ label: () => h(NEllipsis, null, item.name),
+ filterLabel: item.name
}))
processCache[code] = processList
@@ -207,7 +210,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
const result = await getTasksByDefinitionList(code, processCode)
const taskList = result.map((item: { code: number; name: string }) => ({
value: item.code,
- label: () => h(NEllipsis, null, item.name)
+ label: () => h(NEllipsis, null, item.name),
+ filterLabel: item.name
}))
taskList.unshift({
value: 0,
@@ -283,6 +287,11 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
span: 24,
props: {
filterable: true,
+ filter: (query: string, option: IRenderOption) => {
+ return option.filterLabel
+ .toLowerCase()
+ .includes(query.toLowerCase())
+ },
onUpdateValue: async (projectCode: number) => {
const item = model.dependTaskList[i].dependItemList[j]
const options = selectOptions?.value[i] || {}
@@ -315,6 +324,11 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
name: t('project.node.process_name'),
props: {
filterable: true,
+ filter: (query: string, option: IRenderOption) => {
+ return option.filterLabel
+ .toLowerCase()
+ .includes(query.toLowerCase())
+ },
onUpdateValue: async (processCode: number) => {
const item = model.dependTaskList[i].dependItemList[j]
selectOptions.value[i].dependItemList[j].depTaskCodeOptions = await getTaskList(
@@ -343,7 +357,12 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] {
span: 24,
name: t('project.node.task_name'),
props: {
- filterable: true
+ filterable: true,
+ filter: (query: string, option: IRenderOption) => {
+ return option.filterLabel
+ .toLowerCase()
+ .includes(query.toLowerCase())
+ }
},
options:
selectOptions.value[i]?.dependItemList[j]?.depTaskCodeOptions ||
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts
index 40a90b6f1e..df9c14955b 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts
@@ -48,6 +48,10 @@ interface IOption {
value: string | number
}
+interface IRenderOption extends IOption {
+ filterLabel: string
+}
+
interface ITaskPriorityOption extends SelectOption {
icon: VNode
color: string
@@ -461,6 +465,7 @@ export {
INodeData,
ITaskParams,
IOption,
+ IRenderOption,
IDataBase,
ModelType,
SourceType,
[dolphinscheduler] 02/03: Add release Helm Chart #13385
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.6-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit c4efc242ffd8161211c5e457fd8c1c1d7db4fc7c
Author: zhuangchong <zh...@163.com>
AuthorDate: Mon Apr 10 11:02:43 2023 +0800
Add release Helm Chart #13385
---
deploy/kubernetes/dolphinscheduler/Chart.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deploy/kubernetes/dolphinscheduler/Chart.yaml b/deploy/kubernetes/dolphinscheduler/Chart.yaml
index 3b4a7a2ce6..d11ab485b4 100644
--- a/deploy/kubernetes/dolphinscheduler/Chart.yaml
+++ b/deploy/kubernetes/dolphinscheduler/Chart.yaml
@@ -16,7 +16,7 @@
#
apiVersion: v2
-name: dolphinscheduler
+name: dolphinscheduler-helm
description: Dolphin Scheduler is a distributed and easy-to-expand visual DAG workflow scheduling system, dedicated to solving the complex dependencies in data processing, making the scheduling system out of the box for data processing.
home: https://dolphinscheduler.apache.org
icon: https://dolphinscheduler.apache.org/img/hlogo_colorful.svg