Skip to content

fix(query): Remove duplicated rows when workflows shared Publicly in the hub page #6017

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

Open
Mrudhulraj wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(query): Remove duplicated rows when workflows shared Publicly in the hub page #6017

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf4bef4
fix(workflow): Remove duplicated worklfows when dataset shared Public…
Mrudhulraj Jun 29, 2026
d26294a
Merge branch 'apache:main' into fix/workflow-fetch-query-fix
Mrudhulraj Jun 29, 2026
e5ca700
Merge branch 'apache:main' into fix/workflow-fetch-query-fix
Mrudhulraj Jun 29, 2026
1a8e661
Merge branch 'apache:main' into fix/workflow-fetch-query-fix
Mrudhulraj Jun 30, 2026
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
16 changes: 10 additions & 6 deletions .../src/main/scala/org/apache/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import org.jooq.impl.DSL.groupConcatDistinct
import org.jooq.{Condition, GroupField, Record, TableLike}

import scala.jdk.CollectionConverters.CollectionHasAsScala
import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum
import software.amazon.awssdk.services.s3.endpoints.internal.Value.Str

object WorkflowSearchQueryBuilder extends SearchQueryBuilder {

Expand Down Expand Up @@ -56,6 +58,7 @@ object WorkflowSearchQueryBuilder extends SearchQueryBuilder {
val baseQuery = WORKFLOW
.leftJoin(WORKFLOW_USER_ACCESS)
.on(WORKFLOW_USER_ACCESS.WID.eq(WORKFLOW.WID))
.and(if (uid == null) DSL.falseCondition() else WORKFLOW_USER_ACCESS.UID.eq(uid))
.leftJoin(WORKFLOW_OF_USER)
.on(WORKFLOW_OF_USER.WID.eq(WORKFLOW.WID))
.leftJoin(USER)
Expand All @@ -64,13 +67,14 @@ object WorkflowSearchQueryBuilder extends SearchQueryBuilder {
.on(WORKFLOW_OF_PROJECT.WID.eq(WORKFLOW.WID))
.leftJoin(PROJECT_USER_ACCESS)
.on(PROJECT_USER_ACCESS.PID.eq(WORKFLOW_OF_PROJECT.PID))
.and(if (uid == null) DSL.falseCondition() else PROJECT_USER_ACCESS.UID.eq(uid))

var condition: Condition = DSL.trueCondition()
if (uid == null) {
condition = WORKFLOW.IS_PUBLIC.eq(true)
} else {
val privateAccessCondition =
WORKFLOW_USER_ACCESS.UID.eq(uid).or(PROJECT_USER_ACCESS.UID.eq(uid))
WORKFLOW_USER_ACCESS.UID.eq(uid).or(PROJECT_USER_ACCESS.UID.isNotNull)
if (includePublic) {
condition = privateAccessCondition.or(WORKFLOW.IS_PUBLIC.eq(true))
} else {
Expand Down Expand Up @@ -139,10 +143,10 @@ object WorkflowSearchQueryBuilder extends SearchQueryBuilder {
val pidField = groupConcatDistinct(WORKFLOW_OF_PROJECT.PID)
val dw = DashboardWorkflow(
record.into(WORKFLOW_OF_USER).getUid.eq(uid),
record
.get(WORKFLOW_USER_ACCESS.PRIVILEGE)
.toString,
record.into(USER).getName,
Option(record.get(WORKFLOW_USER_ACCESS.PRIVILEGE,classOf[PrivilegeEnum]))
.map(_.toString)
.getOrElse("NONE"),
Option(record.into(USER).getName).getOrElse(""),
record.into(WORKFLOW).into(classOf[Workflow]),
if (record.get(pidField) == null) {
List[Integer]()
Expand All @@ -154,7 +158,7 @@ object WorkflowSearchQueryBuilder extends SearchQueryBuilder {
.map(number => Integer.valueOf(number))
.toList
},
record.into(USER).getUid
Option(record.into(USER).getUid).getOrElse(0)
)
DashboardClickableFileEntry(SearchQueryBuilder.WORKFLOW_RESOURCE_TYPE, workflow = Some(dw))
}
Expand Down