Merge pull request galaxyproject#19394 from jdavcs/dev_deleted_users_…

…items

Better handling of public pages and workflows authored by deleted users

client/src/api/schema/schema.ts

@@ -14740,6 +14740,11 @@ export interface components {
         PageContentFormat: "markdown" | "html";
         /** PageDetails */
         PageDetails: {
+            /**
+             * Author deleted
+             * @description Whether the author of this Page has been deleted.
+             */
+            author_deleted: boolean;
             /**
              * Content
              * @description Raw text contents of the last page revision (type dependent on content_format).
@@ -14838,6 +14843,11 @@ export interface components {
         };
         /** PageSummary */
         PageSummary: {
+            /**
+             * Author deleted
+             * @description Whether the author of this Page has been deleted.
+             */
+            author_deleted: boolean;
             /**
              * Create Time
              * Format: date-time
@@ -16387,6 +16397,11 @@ export interface components {
             creator?:
                 | (components["schemas"]["Person"] | components["schemas"]["galaxy__schema__schema__Organization"])[]
                 | null;
+            /**
+             * Creator deleted
+             * @description Whether the creator of this Workflow has been deleted.
+             */
+            creator_deleted: boolean;
             /**
              * Deleted
              * @description Whether this item is marked as deleted.

client/src/components/Common/PublishedItem.vue

@@ -12,6 +12,7 @@ interface Item {
     owner?: string;
     username?: string;
     email_hash?: string;
+    author_deleted?: boolean;
     tags?: string[];
     title?: string;
 }
@@ -37,8 +38,14 @@ const plural = computed(() => {
     return `${modelTitle.value}s`;
 });
 
+const owner = computed(() => {
+    if (props.item?.author_deleted) {
+        return "Archived author";
+    }
+    return props.item?.owner ?? props.item?.username ?? "Unavailable";
+});
+
 const gravatarSource = computed(() => `https://secure.gravatar.com/avatar/${props.item?.email_hash}?d=identicon`);
-const owner = computed(() => props.item?.owner ?? props.item?.username ?? "Unavailable");
 const pluralPath = computed(() => plural.value.toLowerCase());
 const publishedByUser = computed(() => `/${pluralPath.value}/list_published?f-username=${owner.value}`);
 const urlAll = computed(() => `/${pluralPath.value}/list_published`);
@@ -76,7 +83,7 @@ const urlAll = computed(() => `/${pluralPath.value}/list_published`);
                     <router-link :to="urlAll">All published {{ plural }}</router-link>
                 </div>
 
-                <div>
+                <div v-if="!props.item?.author_deleted">
                     <router-link :to="publishedByUser"> Published {{ plural }} by {{ owner }}</router-link>
                 </div>
             </div>

client/src/components/Workflow/Published/WorkflowInformation.vue

@@ -43,6 +43,13 @@ const fullLink = computed(() => {
 const userOwned = computed(() => {
     return userStore.matchesCurrentUsername(props.workflowInfo.owner);
 });
+
+const owner = computed(() => {
+    if (props.workflowInfo?.creator_deleted) {
+        return "Archived author";
+    }
+    return props.workflowInfo.owner;
+});
 </script>
 
 <template>
@@ -58,12 +65,15 @@ const userOwned = computed(() => {
         <div class="workflow-info-box">
             <hgroup class="mb-2">
                 <Heading h3 size="md" class="mb-0">Author</Heading>
-                <span class="ml-2">{{ workflowInfo.owner }}</span>
+                <span class="ml-2">{{ owner }}</span>
             </hgroup>
 
             <img alt="User Avatar" :src="gravatarSource" class="mb-2" />
 
-            <RouterLink :to="publishedByUser" :target="props.embedded ? '_blank' : ''">
+            <RouterLink
+                v-if="!props.workflowInfo?.creator_deleted"
+                :to="publishedByUser"
+                :target="props.embedded ? '_blank' : ''">
                 All published Workflows by {{ workflowInfo.owner }}
             </RouterLink>
         </div>

lib/galaxy/managers/pages.py

@@ -157,6 +157,10 @@ def index_query(
 
         stmt = select(self.model_class)
 
+        # Do not include pages authored by deleted users
+        if show_published:
+            stmt = stmt.join(Page.user).where(User.deleted == false())
+
         filters = []
         if show_own or (not show_published and not show_shared and not is_admin):
             filters = [self.model_class.user == user]

lib/galaxy/managers/workflows.py

@@ -197,6 +197,11 @@ def index_query(
             filters.append(StoredWorkflow.published == true())
 
         stmt = select(StoredWorkflow)
+
+        # Do not include workflows authored by deleted users
+        if show_published or show_shared:
+            stmt = stmt.join(StoredWorkflow.user).where(User.deleted == false())
+
         if show_shared:
             stmt = stmt.outerjoin(StoredWorkflow.users_shared_with)
         stmt = stmt.outerjoin(StoredWorkflow.tags)

lib/galaxy/model/__init__.py

@@ -7842,6 +7842,7 @@ def to_dict(self, view="collection", value_mapper=None):
         rval["latest_workflow_uuid"] = (lambda uuid: str(uuid) if self.latest_workflow.uuid else None)(
             self.latest_workflow.uuid
         )
+        rval["creator_deleted"] = self.user.deleted
         return rval
 
 
@@ -10462,6 +10463,7 @@ class Page(Base, HasTags, Dictifiable, RepresentById, UsesCreateAndUpdateTime):
         "deleted",
         "username",
         "email_hash",
+        "author_deleted",
         "create_time",
         "update_time",
     ]
@@ -10488,6 +10490,11 @@ def username(self):
     def email_hash(self):
         return md5_hash_str(self.user.email)
 
+    # needed to determine how to display page details
+    @property
+    def author_deleted(self):
+        return self.user.deleted
+
 
 class PageRevision(Base, Dictifiable, RepresentById):
     __tablename__ = "page_revision"

lib/galaxy/schema/schema.py

@@ -3812,6 +3812,11 @@ class PageSummary(PageSummaryBase, WithModelClass):
         title="Encoded email",
         description="The encoded email of the user.",
     )
+    author_deleted: bool = Field(
+        ...,  # Required
+        title="Author deleted",
+        description="Whether the author of this Page has been deleted.",
+    )
     published: bool = Field(
         ...,  # Required
         title="Published",

lib/galaxy/schema/workflows.py

@@ -225,6 +225,11 @@ class StoredWorkflowDetailed(StoredWorkflowSummary):
         title="Creator",
         description=("Additional information about the creator (or multiple creators) of this workflow."),
     )
+    creator_deleted: bool = Field(
+        ...,
+        title="Creator deleted",
+        description="Whether the creator of this Workflow has been deleted.",
+    )
     steps: Dict[
         int,
         Annotated[