This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-6017-ab58d477ba77d1f42cbe56f888dda96fe3fffad0 in repository https://gitbox.apache.org/repos/asf/texera.git
commit 812f17705fbeb0a47601d9a4047ff59e74611ae8 Author: Mrudhulraj <[email protected]> AuthorDate: Tue Jul 28 22:12:34 2026 -0700 fix(query): Remove duplicated rows when workflows shared Publicly in the hub page (#6017) <!-- Thanks for sending a pull request (PR)! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: [Contributing to Texera](https://github.com/apache/texera/blob/main/CONTRIBUTING.md) 2. Ensure you have added or run the appropriate tests for your PR 3. If the PR is work in progress, mark it a draft on GitHub. 4. Please write your PR title to summarize what this PR proposes, we are following Conventional Commits style for PR titles as well. 5. Be sure to keep the PR description updated to reflect all changes. --> ### What changes were proposed in this PR? #### Issue - Duplicate datasets/workflows on hub landing page / hub search Symptom: A user creates a workflow, makes it public, and grants another user explicit access. When the grantee browses the hub, the dataset appears twice in the search results. Root cause refer to #6016 similar issue observed in workflows. #### Fix — WorkflowSearchQueryBuilder.toEntryImpl + WorkflowSearchQueryBuilder.constructFromClause Apply the same JOIN pattern for workflow represented in #6016 and add null-safe getters to handle the now-NULL access columns. <!-- Please clarify what changes you are proposing. The purpose of this section is to outline the changes. Here are some tips for you: 1. If you propose a new API, clarify the use case for a new API. 2. If you fix a bug, you can clarify why it is a bug. 3. If it is a refactoring, clarify what has been changed. 3. It would be helpful to include a before-and-after comparison using screenshots or GIFs. 4. Please consider writing useful notes for better and faster reviews. --> ### Any related issues, documentation, discussions? Fixes #5957 <!-- Please use this section to link other resources if not mentioned already. 1. If this PR fixes an issue, please include `Fixes #1234`, `Resolves #1234` or `Closes #1234`. If it is only related, simply mention the issue number. 2. If there is design documentation, please add the link. 3. If there is a discussion in the mailing list, please add the link. --> ### How was this PR tested? Tested manually with database checks and UI workflow testing. <!-- If tests were added, say they were added here. Or simply mention that if the PR is tested with existing test cases. Make sure to include/update test cases that check the changes thoroughly including negative and positive cases if possible. If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future. If tests were not added, please describe why they were not added and/or why it was difficult to add. --> ### Was this PR authored or co-authored using generative AI tooling? No AI tools were used in the process. <!-- If generative AI tooling has been used in the process of authoring this PR, please include the phrase: 'Generated-by: ' followed by the name of the tool and its version. If no, write 'No'. Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details. --> Co-authored-by: Yicong Huang <[email protected]> --- .../dashboard/WorkflowSearchQueryBuilder.scala | 13 +++-- .../dashboard/file/WorkflowResourceSpec.scala | 56 +++++++++++++++++++++- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala index 9a08742c3e..b44ccaf30c 100644 --- a/amber/src/main/scala/org/apache/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala +++ b/amber/src/main/scala/org/apache/texera/web/resource/dashboard/WorkflowSearchQueryBuilder.scala @@ -29,6 +29,7 @@ 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 object WorkflowSearchQueryBuilder extends SearchQueryBuilder { @@ -65,6 +66,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) @@ -73,6 +75,7 @@ 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)) .leftJoin(WORKFLOW_COVER_IMAGE) .on(WORKFLOW_COVER_IMAGE.WID.eq(WORKFLOW.WID)) @@ -81,7 +84,7 @@ object WorkflowSearchQueryBuilder extends SearchQueryBuilder { 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 { @@ -149,10 +152,10 @@ object WorkflowSearchQueryBuilder extends SearchQueryBuilder { ): DashboardResource.DashboardClickableFileEntry = { 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(WORKFLOW_OF_USER).getUid == uid, + Option(record.get(WORKFLOW_USER_ACCESS.PRIVILEGE, classOf[PrivilegeEnum])) + .map(_.toString) + .getOrElse(PrivilegeEnum.NONE.toString), record.into(USER).getName, record.into(WORKFLOW).into(classOf[Workflow]), if (record.get(pidField) == null) { diff --git a/amber/src/test/scala/org/apache/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala index d41b452f6b..78aa85316e 100644 --- a/amber/src/test/scala/org/apache/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala +++ b/amber/src/test/scala/org/apache/texera/web/resource/dashboard/file/WorkflowResourceSpec.scala @@ -45,6 +45,7 @@ import java.time.{Duration, OffsetDateTime, ZoneOffset} import java.util import java.util.Collections import java.util.concurrent.TimeUnit +import org.apache.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource class WorkflowResourceSpec extends AnyFlatSpec @@ -60,6 +61,7 @@ class WorkflowResourceSpec val user = new User user.setUid(Integer.valueOf(1)) user.setName("test_user") + user.setEmail("[email protected]") user.setRole(UserRoleEnum.ADMIN) user.setPassword("123") user.setComment("test_comment") @@ -71,6 +73,7 @@ class WorkflowResourceSpec val user = new User user.setUid(Integer.valueOf(2)) user.setName("test_user2") + user.setEmail("[email protected]") user.setRole(UserRoleEnum.ADMIN) user.setPassword("123") user.setComment("test_comment2") @@ -318,7 +321,7 @@ class WorkflowResourceSpec assert(ownerName == testUser.getName) } - "/search API " should "be able to search for workflows in different columns in Workflow table" in { + "/search API" should "be able to search for workflows in different columns in Workflow table" in { // testWorkflow1: {name: test_name, descrption: test_description, content: test_content} // search "test_name" or "test_description" or "test_content" should return testWorkflow1 workflowResource.persistWorkflow(testWorkflow1, sessionUser1) @@ -369,6 +372,57 @@ class WorkflowResourceSpec assert(DashboardWorkflowEntryList.results.length == 2) } + it should "return only single instance of workflow when owned and shared publicly" in { + // Create a public workflow + val publicWorkflow = new Workflow() + publicWorkflow.setName("public_workflow_1") + publicWorkflow.setDescription(testWorkflow1.getDescription) + publicWorkflow.setContent(testWorkflow1.getContent) + publicWorkflow.setIsPublic(true) + + // Persist workflow with testUser as owner + workflowResource.persistWorkflow(publicWorkflow, sessionUser1) + + val DashboardWorkflowEntryList = + dashboardResource.searchAllResourcesCall( + sessionUser1, + SearchQueryParams(), + includePublic = true + ) + assert(DashboardWorkflowEntryList.results.length == 1) + assertSameWorkflow(publicWorkflow, DashboardWorkflowEntryList.results.head.workflow.get) + } + + it should "return only single instance of workflow when publicly and explicitly shared" in { + // Create a public workflow + val publicWorkflow = new Workflow() + publicWorkflow.setName("public_workflow_2") + publicWorkflow.setDescription(testWorkflow1.getDescription) + publicWorkflow.setContent(testWorkflow1.getContent) + publicWorkflow.setIsPublic(true) + + // Persist workflow with testUser as owner + val savedWorkflow = workflowResource.persistWorkflow(publicWorkflow, sessionUser1) + + // Share workflow with read access to testUser2 + val workflowAccessResource = new WorkflowAccessResource() + workflowAccessResource.grantAccess( + savedWorkflow.getWid, + testUser2.getEmail, + "READ", + sessionUser1 + ) + + val DashboardWorkflowEntryList = + dashboardResource.searchAllResourcesCall( + sessionUser2, + SearchQueryParams(), + includePublic = true + ) + assert(DashboardWorkflowEntryList.results.length == 1) + assertSameWorkflow(publicWorkflow, DashboardWorkflowEntryList.results.head.workflow.get) + } + it should "be able to search with arbitrary number of keywords in different combinations" in { // testWorkflow1: {name: test_name, description: test_description, content: "key pair"} // search ["key"] or ["pair", "key"] should return the testWorkflow1
