Merge branch 'main' into remove-context-menu-for-inbox

athensresearch · Sep 9, 2022 · efd0768 · efd0768
2 parents 305704e + d7274a9
commit efd0768
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 36 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -73,30 +73,30 @@ jobs:
        #   run: yarn server:test:fluree
 
 
-   e2e:
-     runs-on: ubuntu-latest
-     steps:
-       - uses: actions/checkout@v2
-       - uses: ./.github/custom-actions/clojure-env
-       - uses: ./.github/custom-actions/node-env
-
-       # Caching the build is generally a terrible idea, but e2e is really slow
-       # and shadow-cljs is usually pretty good at cache invalidation.
-       # Still, if you think this cache is breaking builds, just bump the version number.
-       - name: Restore shadow-cljs build cache
-         uses: actions/cache@v2
-         id: restore-shadow-cljs-build-cache
-         with:
-           path: ./.shadow-cljs
-           key: ${{ runner.os }}-v2-shadow-cljs-build-cache-${{ hashFiles('yarn.lock') }}
-           restore-keys: |
-             ${{ runner.os }}-v2-shadow-cljs-build-cache
-
-       - name: Compile JS assets for dev
-         run: yarn client:dev-build
-
-       - name: Run client e2e tests over dev build
-         run: yarn client:e2e
+  #  e2e:
+  #    runs-on: ubuntu-latest
+  #    steps:
+  #      - uses: actions/checkout@v2
+  #      - uses: ./.github/custom-actions/clojure-env
+  #      - uses: ./.github/custom-actions/node-env
+
+  #      # Caching the build is generally a terrible idea, but e2e is really slow
+  #      # and shadow-cljs is usually pretty good at cache invalidation.
+  #      # Still, if you think this cache is breaking builds, just bump the version number.
+  #      - name: Restore shadow-cljs build cache
+  #        uses: actions/cache@v2
+  #        id: restore-shadow-cljs-build-cache
+  #        with:
+  #          path: ./.shadow-cljs
+  #          key: ${{ runner.os }}-v2-shadow-cljs-build-cache-${{ hashFiles('yarn.lock') }}
+  #          restore-keys: |
+  #            ${{ runner.os }}-v2-shadow-cljs-build-cache
+
+  #      - name: Compile JS assets for dev
+  #        run: yarn client:dev-build
+
+  #      - name: Run client e2e tests over dev build
+  #        run: yarn client:e2e
 
 
    build-app:
@@ -114,8 +114,8 @@ jobs:
            SENTRY_DSN: ${{ secrets.sentry_dsn }}
            COMMIT_URL: "https://github.com/${{github.repository}}/commit/${{github.sha}}"
 
-       - name: Run client e2e tests over the prod build
-         run: yarn client:e2e
+      #  - name: Run client e2e tests over the prod build
+      #    run: yarn client:e2e
 
        - name: Upload built app for release-web, release-electron
          uses: actions/upload-artifact@v2

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -43,7 +43,6 @@ services:
     depends_on:
       athens:
         condition: service_healthy
-    restart: always
     ports:
       - 80:80
 

diff --git a/script/docker-run-lan-party.sh b/script/docker-run-lan-party.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-java -Xms512m -Xmx2048m -verbose:gc -XX:-UseParallelGC \
+java -Xms512m -Xmx2560m -verbose:gc -XX:-UseParallelGC \
      -XX:OnOutOfMemoryError="kill -9 %p" -XX:+HeapDumpOnOutOfMemoryError \
      -XX:HeapDumpPath=/srv/athens/logs/ \
      -XX:ErrorFile=/srv/athens/logs/java_athens_hs_err_pid%p.log \

diff --git a/src/cljs/athens/types/tasks/view.cljs b/src/cljs/athens/types/tasks/view.cljs
@@ -645,13 +645,20 @@
 
 
   (supported-transclusion-scopes
-    [_this])
+    [_this]
+    #{:embed})
 
 
   (transclusion-view
-    [_this _block-el block-uid _callback _transclusion-scope]
-    (let [block (reactive/get-reactive-block-document [block-uid])]
-      [task-el _this block true]))
+    [this _block-el block-uid _callback transclusion-scope]
+    (let [supported-trans (types/supported-transclusion-scopes this)]
+      (if-not (contains? supported-trans transclusion-scope)
+        (throw (ex-info (str "Invalid transclusion scope: " (pr-str transclusion-scope)
+                             ". Supported transclusion types: " (pr-str supported-trans))
+                        {:supported-transclusion-scopes supported-trans
+                         :provided-transclusion-scope   transclusion-scope}))
+        (let [block (reactive/get-reactive-block-document [:block/uid block-uid])]
+          [task-el this block true]))))
 
 
   (zoomed-in-view

diff --git a/src/js/components/Layout/RightSidebar.tsx b/src/js/components/Layout/RightSidebar.tsx
@@ -106,6 +106,11 @@ export const SidebarItem = ({ title, type, isOpen, onToggle, onRemove, onNavigat
       position="relative"
       spacing={0}
       ml="1px" // Account for the floating separator
+      sx={{
+        "--page-padding": "0rem",
+        "--page-left-gutter-width": "1em",
+        "--page-right-gutter-width": "3em",
+      }}
       _notFirst={{
         borderTop: "1px solid",
         borderColor: "separator.divider"

diff --git a/src/js/components/Page/Page.tsx b/src/js/components/Page/Page.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import {
   Button, VStack, Divider, Center, Box, Heading, Image, IconButton, ButtonGroup, FormControl, Input,
-  Tooltip, FormLabel, BoxProps, MenuGroup, MenuItem, MenuDivider, Text
+  Tooltip, FormLabel, BoxProps, Text
 } from '@chakra-ui/react';
-import { ArrowRightOnBoxIcon, ArrowLeftOnBoxIcon, CalendarCircleFillIcon, CalendarTomorrowIcon, TemplateIcon, LinkedIcon, CalendarIcon } from '@/Icons/Icons';
+import { ArrowRightOnBoxIcon, ArrowLeftOnBoxIcon, CalendarIcon } from '@/Icons/Icons';
 import { useInView } from 'react-intersection-observer';
 import { withErrorBoundary } from "react-error-boundary";
 
@@ -151,8 +151,6 @@ export const PageBody = ({ children }) => <Box
   className="page-body"
   // outset slightly for block toggles and refs and such
   px="calc(var(--page-padding) - 1em)"
-
-  // pr="calc((max(0, var(--page-padding) - 3em)))"
   pr="calc(var(--page-padding) - var(--page-right-gutter-width) + 1.5em)"
   gridArea="content"
 >