From dcfe1bfa7dcb8408cf0e709689f996d2710bf54e Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Tue, 10 Dec 2024 13:54:50 -0500
Subject: [PATCH 1/4] Logged-out handling on document pages

---
 src/lib/components/documents/Header.svelte    | 17 ++++++++-------
 .../components/layouts/DocumentLayout.svelte  | 21 +++++++++++--------
 .../components/sidebar/ViewerActions.svelte   |  4 ++--
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/lib/components/documents/Header.svelte b/src/lib/components/documents/Header.svelte
index c654105bb..cfe152fd1 100644
--- a/src/lib/components/documents/Header.svelte
+++ b/src/lib/components/documents/Header.svelte
@@ -11,8 +11,9 @@
   import { _ } from "svelte-i18n";
 
   import { ALLOWED_TAGS, ALLOWED_ATTR } from "@/config/config.js";
-  import { remToPx } from "@/lib/utils/layout";
-  import Access, { getLevel } from "../common/Access.svelte";
+  import Access, { getLevel } from "$lib/components/common/Access.svelte";
+  import { remToPx } from "$lib/utils/layout";
+  import SignedIn from "../common/SignedIn.svelte";
 
   export let document: Document;
 
@@ -33,11 +34,13 @@
 </script>
 
 <header bind:clientWidth={width}>
-  {#if access}
-    <div class="access">
-      <Access level={access} />
-    </div>
-  {/if}
+  <SignedIn>
+    {#if access}
+      <div class="access">
+        <Access level={access} />
+      </div>
+    {/if}
+  </SignedIn>
   <h1 class="title">{document.title}</h1>
   {#if description}
     <div class="description" class:twoColumn={BREAKPOINTS.TWO_COLUMN}>
diff --git a/src/lib/components/layouts/DocumentLayout.svelte b/src/lib/components/layouts/DocumentLayout.svelte
index 79ceaac11..9278f4df0 100644
--- a/src/lib/components/layouts/DocumentLayout.svelte
+++ b/src/lib/components/layouts/DocumentLayout.svelte
@@ -22,6 +22,7 @@ Assumes it's a child of a ViewerContext
   import { getCurrentUser } from "$lib/utils/permissions";
   import { isOrg } from "$lib/api/accounts";
   import { getDocument, getText } from "../viewer/ViewerContext.svelte";
+  import SignedIn from "../common/SignedIn.svelte";
 
   const me = getCurrentUser();
 
@@ -34,11 +35,13 @@ Assumes it's a child of a ViewerContext
 </script>
 
 <SidebarLayout>
-  <nav class="column" slot="navigation">
-    <Projects {projects} {document} />
-    <Data {document} />
-    <Notes {document} />
-  </nav>
+  <SignedIn>
+    <nav class="column" slot="navigation">
+      <Projects {projects} {document} />
+      <Data {document} />
+      <Notes {document} />
+    </nav>
+  </SignedIn>
 
   <article slot="content">
     <header><DocumentHeader {document} /></header>
@@ -55,10 +58,10 @@ Assumes it's a child of a ViewerContext
           </Flex>
         </Metadata>
       {/if}
-      {#if $me}
-        <ViewerActions {document} user={$me} {action} />
-      {/if}
-      <AddOns query="+document:{document.id}" />
+      <ViewerActions {document} user={$me} {action} />
+      <SignedIn>
+        <AddOns query="+document:{document.id}" />
+      </SignedIn>
     </Flex>
     {#await text then text}
       <DocumentMetadata {document} {text} />
diff --git a/src/lib/components/sidebar/ViewerActions.svelte b/src/lib/components/sidebar/ViewerActions.svelte
index 69b4c93ab..378655391 100644
--- a/src/lib/components/sidebar/ViewerActions.svelte
+++ b/src/lib/components/sidebar/ViewerActions.svelte
@@ -1,7 +1,7 @@
 <!-- Assumes its a child of ViewerContext -->
 
 <script lang="ts">
-  import type { Document, Org, User } from "$lib/api/types";
+  import type { Document, Nullable, Org, User } from "$lib/api/types";
 
   import { _ } from "svelte-i18n";
   import {
@@ -33,7 +33,7 @@
   import { getCurrentPage } from "../viewer/ViewerContext.svelte";
 
   export let document: Document;
-  export let user: User;
+  export let user: Nullable<User>;
   export let action: string = "";
 
   const page = getCurrentPage();

From d4876f42f6e1dd4608c93cbd66ab4e5ed746699a Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Tue, 10 Dec 2024 14:09:47 -0500
Subject: [PATCH 2/4] Add published URL and source to document metadata

---
 src/lib/components/documents/Metadata.svelte  | 20 ++++++++++++
 .../documents/stories/Metadata.stories.svelte | 31 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 src/lib/components/documents/stories/Metadata.stories.svelte

diff --git a/src/lib/components/documents/Metadata.svelte b/src/lib/components/documents/Metadata.svelte
index 69983a0f9..1d2f357ea 100644
--- a/src/lib/components/documents/Metadata.svelte
+++ b/src/lib/components/documents/Metadata.svelte
@@ -15,6 +15,7 @@
   import { LANGUAGE_MAP } from "@/config/config.js";
   import { userOrgString } from "$lib/api/documents";
   import Metadata from "../common/Metadata.svelte";
+  import { LinkExternal16 } from "svelte-octicons";
 
   export let document: Document;
   export let text: Maybe<DocumentText>;
@@ -44,6 +45,19 @@
 </script>
 
 <div class="meta">
+  {#if document.published_url}
+    <Metadata key={$_("edit.fields.published_url")}>
+      <a href={document.published_url} class="publishedUrl" target="_blank">
+        {new URL(document.published_url).hostname}
+        <LinkExternal16 height={12} width={12} />
+      </a>
+    </Metadata>
+  {/if}
+  {#if document.source}
+    <Metadata key={$_("edit.fields.source")}>
+      {document.source}
+    </Metadata>
+  {/if}
   <Metadata key={$_("sidebar.contributed")}>
     {userOrgString(document)}
   </Metadata>
@@ -70,4 +84,10 @@
     gap: 1rem;
     padding: 0 0.5rem 1rem 0;
   }
+  .publishedUrl {
+    display: flex;
+    align-items: center;
+    fill: var(--blue-3);
+    gap: 0.25rem;
+  }
 </style>
diff --git a/src/lib/components/documents/stories/Metadata.stories.svelte b/src/lib/components/documents/stories/Metadata.stories.svelte
new file mode 100644
index 000000000..2eee9eebc
--- /dev/null
+++ b/src/lib/components/documents/stories/Metadata.stories.svelte
@@ -0,0 +1,31 @@
+<script context="module" lang="ts">
+  import { Story, Template } from "@storybook/addon-svelte-csf";
+  import MetadataComponent from "../Metadata.svelte";
+  import type { Document } from "@/lib/api/types";
+
+  import doc from "@/test/fixtures/documents/document-expanded.json";
+  const document = doc as Document;
+
+  export const meta = {
+    title: "Components / Documents / Metadata",
+    component: MetadataComponent,
+    parameters: {
+      layout: "centered",
+    },
+  };
+
+  const args = {
+    document: {
+      ...document,
+      source: "NYPD",
+      published_url:
+        "https://www.nytimes.com/live/2024/12/10/nyregion/unitedhealthcare-ceo-luigi-mangione",
+    },
+  };
+</script>
+
+<Template let:args>
+  <MetadataComponent {...args} />
+</Template>
+
+<Story name="Metadata" {args} />

From 1ec8a75b0893c365d9092b0826cb25c196dd84c2 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Tue, 10 Dec 2024 14:25:03 -0500
Subject: [PATCH 3/4] Adjust sidebar slot

---
 src/lib/components/layouts/DocumentLayout.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/layouts/DocumentLayout.svelte b/src/lib/components/layouts/DocumentLayout.svelte
index 9278f4df0..a16cee4c1 100644
--- a/src/lib/components/layouts/DocumentLayout.svelte
+++ b/src/lib/components/layouts/DocumentLayout.svelte
@@ -35,8 +35,8 @@ Assumes it's a child of a ViewerContext
 </script>
 
 <SidebarLayout>
-  <SignedIn>
-    <nav class="column" slot="navigation">
+  <SignedIn slot="navigation">
+    <nav class="column">
       <Projects {projects} {document} />
       <Data {document} />
       <Notes {document} />

From 2feb26356f59c384f9361098bf5cecf37eaca2f0 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Tue, 10 Dec 2024 14:26:38 -0500
Subject: [PATCH 4/4] Different approach to hiding nav

---
 src/lib/components/layouts/DocumentLayout.svelte | 14 ++++++--------
 src/lib/components/layouts/SidebarLayout.svelte  |  7 +++++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/lib/components/layouts/DocumentLayout.svelte b/src/lib/components/layouts/DocumentLayout.svelte
index a16cee4c1..56248a6ed 100644
--- a/src/lib/components/layouts/DocumentLayout.svelte
+++ b/src/lib/components/layouts/DocumentLayout.svelte
@@ -34,14 +34,12 @@ Assumes it's a child of a ViewerContext
   $: projects = (document.projects ?? []) as Project[];
 </script>
 
-<SidebarLayout>
-  <SignedIn slot="navigation">
-    <nav class="column">
-      <Projects {projects} {document} />
-      <Data {document} />
-      <Notes {document} />
-    </nav>
-  </SignedIn>
+<SidebarLayout hideNavigation={!$me}>
+  <nav class="column" slot="navigation">
+    <Projects {projects} {document} />
+    <Data {document} />
+    <Notes {document} />
+  </nav>
 
   <article slot="content">
     <header><DocumentHeader {document} /></header>
diff --git a/src/lib/components/layouts/SidebarLayout.svelte b/src/lib/components/layouts/SidebarLayout.svelte
index 5c0d9a839..a779d1036 100644
--- a/src/lib/components/layouts/SidebarLayout.svelte
+++ b/src/lib/components/layouts/SidebarLayout.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
   import Sidebar from "./Sidebar.svelte";
+
+  export let hideNavigation = false;
+  export let hideActions = false;
 </script>
 
 <div class="sidebarLayoutContainer">
-  {#if $$slots.navigation}
+  {#if $$slots.navigation && !hideNavigation}
     <Sidebar position="left" id="navigation">
       <slot name="navigation" />
     </Sidebar>
@@ -13,7 +16,7 @@
     <slot name="content" />
   </div>
 
-  {#if $$slots.action}
+  {#if $$slots.action && !hideActions}
     <Sidebar position="right" id="action">
       <slot name="action" />
     </Sidebar>