Is this the problem? (#817)

* Is this the problem? * Just confirming something * No SSR the description * Is it the header? * dispatch * Clean field description * href * remove preview config * code * Update src/routes/(app)/add-ons/[owner]/[repo]/+page.ts Co-authored-by: Allan Lasser <[email protected]> --------- Co-authored-by: Allan Lasser <[email protected]>
MuckRock · Nov 8, 2024 · f5d7c31 · f5d7c31
1 parent 972c354
commit f5d7c31
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 72 deletions.
diff --git a/Makefile b/Makefile
@@ -13,12 +13,12 @@ build-browser-test:
 dev:
 	docker compose -f local.yml up documentcloud_frontend
 
+preview:
+	docker compose -f local.yml up preview
+
 down:
 	docker compose -f local.yml down
 
-build-serve:
-	docker compose -f local.yml up documentcloud_frontend_build
-
 clean:
 	@echo deleting Webpack chunks
 	rm -f public/index.html public/[0-9]*.*.* public/bundle.*.js public/bundle.*.css public/bundle.*.txt public/*.map public/*.*.js

diff --git a/local.yml b/local.yml
@@ -19,67 +19,25 @@ services:
       DOCKER: true
       NODE_TLS_REJECT_UNAUTHORIZED: 0 # todo: solve local certificate chain issues
       NODE_ENV: development
-      PUPPETEER_SKIP_DOWNLOAD: true
 
-  documentcloud_frontend_app:
+  preview:
     image: node:20
     volumes:
       - nodemodules:/app/node_modules
       - .:/app
     working_dir: /app
-    command: npm run dev
-    networks:
-      default:
-        aliases:
-          - internal.www.dev.documentcloud.org
-      squarelet_default:
-        aliases:
-          - internal.www.dev.documentcloud.org
-
-  documentcloud_frontend_embed:
-    image: node:20
-    volumes:
-      - nodemodules:/app/node_modules
-      - .:/app
-    working_dir: /app
-    command: npm run dev
-    networks:
-      default:
-        aliases:
-          - internal.www.dev.documentcloud.org
-      squarelet_default:
-        aliases:
-          - internal.www.dev.documentcloud.org
-
-  documentcloud_frontend_build:
-    image: node:20
-    volumes:
-      - nodemodules:/app/node_modules
-      - .:/app
-    working_dir: /app
-    command: npm run build-serve
-    networks:
-      default:
-        aliases:
-          - internal.www.dev.documentcloud.org
-      squarelet_default:
-        aliases:
-          - internal.www.dev.documentcloud.org
-
-  documentcloud_frontend_analyze:
-    image: node:20
-    volumes:
-      - nodemodules:/app/node_modules
-      - .:/app
-    working_dir: /app
-    command: npm run build-analyze
+    command: npm run preview
     networks:
       default:
         aliases:
           - internal.www.dev.documentcloud.org
       squarelet_default:
         aliases:
           - internal.www.dev.documentcloud.org
+    environment:
+      DOCKER: true
+      NODE_TLS_REJECT_UNAUTHORIZED: 0 # todo: solve local certificate chain issues
+      NODE_ENV: development
 
 volumes:
   nodemodules:

diff --git a/src/lib/components/accounts/Mailkey.svelte b/src/lib/components/accounts/Mailkey.svelte
@@ -62,12 +62,12 @@
     </p>
   {/if}
   <Flex gap={1} wrap justify="center">
-    <Button mode="primary" on:click={create}
-      >{$_("mailkey.create.button")}</Button
-    >
-    <Button mode="danger" on:click={destroy}
-      >{$_("mailkey.destroy.button")}</Button
-    >
+    <Button mode="primary" on:click={create}>
+      {$_("mailkey.create.button")}
+    </Button>
+    <Button mode="danger" on:click={destroy}>
+      {$_("mailkey.destroy.button")}
+    </Button>
   </Flex>
 </Modal>
 

diff --git a/src/lib/components/addons/AddOnMeta.svelte b/src/lib/components/addons/AddOnMeta.svelte
@@ -6,7 +6,7 @@
   import { MarkGithub16 } from "svelte-octicons";
 
   import Button from "$lib/components/common/Button.svelte";
-  import Flex from "@/lib/components/common/Flex.svelte";
+  import Flex from "$lib/components/common/Flex.svelte";
   import Metadata from "../common/Metadata.svelte";
 
   import { ALLOWED_TAGS, ALLOWED_ATTR } from "@/config/config.js";
@@ -15,9 +15,6 @@
 
   $: repo = new URL(addon.repository, "https://github.com/").href;
   $: github_org = addon.repository.split("/")[0];
-  $: description = addon.parameters.description
-    ? clean(addon.parameters.description)
-    : "";
   $: instructions = addon.parameters.instructions
     ? clean(addon.parameters.instructions)
     : "";
@@ -30,7 +27,7 @@
 <div class="container">
   <h2 class="name">{addon.name}</h2>
   <div class="description">
-    {@html description}
+    {@html addon.parameters?.description}
   </div>
   {#if instructions}
     <div class="instructions">

diff --git a/src/lib/components/inputs/Field.svelte b/src/lib/components/inputs/Field.svelte
@@ -1,9 +1,18 @@
 <script lang="ts">
+  import DOMPurify from "isomorphic-dompurify";
+
   export let title: string = "";
   export let description: string = "";
   export let inline = false;
   export let required = false;
   export let sronly = false;
+
+  function clean(html: string): string {
+    return DOMPurify.sanitize(html, {
+      ALLOWED_TAGS: ["a", "strong", "em", "code"],
+      ALLOWED_ATTR: ["href"],
+    });
+  }
 </script>
 
 <div class="field" class:inline class:required>
@@ -14,7 +23,7 @@
     <slot />
   </label>
   {#if description}
-    <p class="help">{@html description}</p>
+    <p class="help">{@html clean(description ?? "")}</p>
   {/if}
   <slot name="error" />
 </div>

diff --git a/src/lib/components/navigation/Breadcrumbs.svelte b/src/lib/components/navigation/Breadcrumbs.svelte
@@ -15,18 +15,17 @@
 
   export let trail: Breadcrumb[] = [];
 
-  let width: number;
-  $: BREAKPOINTS = {
-    SHOW_BREADCRUMBS: width > remToPx(32),
-  };
+  let width: number = 1000;
+
+  $: SHOW_BREADCRUMBS = width > remToPx(32);
 </script>
 
 <div class="breadcrumbs" bind:clientWidth={width}>
   <Flex gap={0.375} align="center">
     <slot name="root">
       <a href="/" class="logo crumb"><Logo /></a>
     </slot>
-    {#if BREAKPOINTS.SHOW_BREADCRUMBS}
+    {#if SHOW_BREADCRUMBS}
       {#each trail as { href, title }}
         <span class="divider"><TriangleRight16 fill="var(--gray-3)" /></span>
         {#if href}

diff --git a/src/routes/(app)/add-ons/[owner]/[repo]/+page.ts b/src/routes/(app)/add-ons/[owner]/[repo]/+page.ts
@@ -1,5 +1,3 @@
-import type { DocumentResults } from "$lib/api/types";
-
 import { error } from "@sveltejs/kit";
 
 import * as addons from "$lib/api/addons";

diff --git a/src/routes/(app)/add-ons/[owner]/[repo]/[event]/+page.ts b/src/routes/(app)/add-ons/[owner]/[repo]/[event]/+page.ts
@@ -1,5 +1,3 @@
-import type { DocumentResults } from "$lib/api/types";
-
 import { error } from "@sveltejs/kit";
 
 import * as addons from "$lib/api/addons";