lsst-epo · blnkt · Jan 8, 2024 · Dec 26, 2023 · Dec 28, 2023 · Dec 28, 2023
diff --git a/Makefile b/Makefile
@@ -0,0 +1,8 @@
+start:
+	docker-compose -f docker-compose-local-db.yml up --build
+
+clean:
+	docker system prune -f && docker volume prune -f
+
+clean-images:
+	docker images prune
diff --git a/README.md b/README.md
@@ -30,6 +30,11 @@ docker-compose -f docker-compose-local-db.yml up
 8. Go to <http://localhost:8080/admin> to administer the site
 9. Default admin username and password, as included in the db.sql file, is `example / password`
 
+These and other most used docker commands for bringing containers up/down are aliased in a Makefile:
+ * `make start` is equivalent to `docker-compose -f docker-compose-local-db.yml up --build`
+ * `make clean` is equivalent to `docker system prune -f && docker volume prune -f`
+ * `make clean-images` is equivalent to `docker images prune`
+
 #### Useful docker commands for local development
 
 1. Cleaning house: `docker volume prune` `docker system prune`

diff --git a/api/composer.json b/api/composer.json
@@ -4,7 +4,7 @@
     "craftcms/cms": "4.5.6.1",
     "craftcms/redactor": "3.0.4",
     "jamesedmonston/graphql-authentication": "2.5.0",
-    "lsst-epo/canto-dam-assets": "^4.0.0",
+    "lsst-epo/canto-dam-assets": "4.0.11",
     "sebastianlenz/linkfield": "^2.1.4",
     "spicyweb/craft-neo": "3.9.5",
     "verbb/super-table": "^3.0",

diff --git a/api/composer.lock b/api/composer.lock
diff --git a/api/config/general.php b/api/config/general.php
@@ -33,7 +33,7 @@
         'aliases' => [
             '@webroot' => dirname(__DIR__) . '/web',
             '@webBaseUrl' => App::env('WEB_BASE_URL'),
-            '@previewUrlFormat' => App::env('ALIAS_PREVIEW_URL_FORMAT'),
+            '@previewUrlFormat' => App::env('ALIAS_PREVIEW_URL_FORMAT') . '&secret=' . App::env('NEXT_SECRET_TOKEN'),
             '@assetsGeneralBaseURL' => sprintf(
                 $gcsBucketPathFormat,
                 App::env('GCS_GENERAL_BUCKET')

diff --git a/api/config/project/fields/latex--bf080076-0029-4fb7-9562-4da97d31c0b4.yaml b/api/config/project/fields/latex--bf080076-0029-4fb7-9562-4da97d31c0b4.yaml
@@ -0,0 +1,19 @@
+columnSuffix: jpgoyubw
+contentColumnType: text
+fieldGroup: 5599d188-862e-4717-b206-6aadd975c937 # Common
+handle: latex
+instructions: 'LaTeX format input'
+name: LaTeX
+searchable: false
+settings:
+  byteLimit: null
+  charLimit: null
+  code: true
+  columnType: null
+  initialRows: 4
+  multiline: false
+  placeholder: null
+  uiMode: normal
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\PlainText
diff --git a/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml b/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml
@@ -1,4 +1,4 @@
 alwaysShowDropdown: null
 field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks
 name: Widgets
-sortOrder: 11
+sortOrder: 12
diff --git a/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml b/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml
@@ -1,4 +1,4 @@
 alwaysShowDropdown: null
 field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks
 name: Containers
-sortOrder: 6
+sortOrder: 7
diff --git a/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml b/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml
@@ -96,5 +96,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Bar Graph Tool'
-sortOrder: 13
+sortOrder: 14
 topLevel: true
diff --git a/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml b/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml
@@ -15,5 +15,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Camera Filter Tool'
-sortOrder: 15
+sortOrder: 16
 topLevel: true
diff --git a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml
@@ -1,6 +1,7 @@
 childBlocks:
   - questionBlock
   - text
+  - equation
   - table
   - image
   - referenceModalBlock
@@ -26,5 +27,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Left Column'
-sortOrder: 9
+sortOrder: 10
 topLevel: false
diff --git a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml
@@ -1,6 +1,7 @@
 childBlocks:
   - questionBlock
   - text
+  - equation
   - table
   - image
   - referenceModalBlock
@@ -26,5 +27,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Right Column'
-sortOrder: 10
+sortOrder: 11
 topLevel: false
diff --git a/...fig/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml b/...fig/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml
@@ -44,5 +44,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Color Filter Tool Block'
-sortOrder: 16
+sortOrder: 17
 topLevel: true
diff --git a/api/config/project/neoBlockTypes/equation--dc1c3484-f028-4653-982b-a84e287d4c61.yaml b/api/config/project/neoBlockTypes/equation--dc1c3484-f028-4653-982b-a84e287d4c61.yaml
@@ -0,0 +1,40 @@
+childBlocks: null
+conditions: null
+description: 'Mathematical equation'
+enabled: true
+field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks
+fieldLayouts:
+  4317e51b-a554-4107-8929-70f27dbad4f6:
+    tabs:
+      -
+        elementCondition: null
+        elements:
+          -
+            elementCondition: null
+            fieldUid: bf080076-0029-4fb7-9562-4da97d31c0b4 # LaTeX
+            instructions: 'LaTeX format input, reference the Temml documentation for help formatting: https://temml.org/docs/en/supported'
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 4533dacc-7e3b-4879-95aa-3cb13c875278
+            userCondition: null
+            warning: null
+            width: 100
+        name: 'Tab 1'
+        uid: 66641481-a919-4ae4-9632-e146c1530f72
+        userCondition: null
+group: null
+groupChildBlockTypes: true
+handle: equation
+icon: null
+ignorePermissions: true
+maxBlocks: 0
+maxChildBlocks: 0
+maxSiblingBlocks: 0
+minBlocks: 0
+minChildBlocks: 0
+minSiblingBlocks: 0
+name: Equation
+sortOrder: 3
+topLevel: true
diff --git a/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml b/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml
@@ -48,5 +48,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Filter Tool'
-sortOrder: 12
+sortOrder: 13
 topLevel: true
diff --git a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml
@@ -1,6 +1,7 @@
 childBlocks:
   - questionBlock
   - text
+  - equation
   - table
   - image
   - referenceModalBlock
@@ -25,5 +26,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Interaction Group'
-sortOrder: 7
+sortOrder: 8
 topLevel: true
diff --git a/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml b/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml
@@ -60,5 +60,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: Image
-sortOrder: 4
+sortOrder: 5
 topLevel: true
diff --git a/...nfig/project/neoBlockTypes/referenceModalBlock--53df9537-d85e-4fd3-9e4c-b203594ada7c.yaml b/...nfig/project/neoBlockTypes/referenceModalBlock--53df9537-d85e-4fd3-9e4c-b203594ada7c.yaml
@@ -36,5 +36,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Reference Modal Block'
-sortOrder: 5
+sortOrder: 6
 topLevel: true
diff --git a/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml b/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml
@@ -96,5 +96,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Scatterplot Tool'
-sortOrder: 14
+sortOrder: 15
 topLevel: true
diff --git a/api/config/project/neoBlockTypes/table--7b30c218-6328-41a2-a3e3-2575559f4c9c.yaml b/api/config/project/neoBlockTypes/table--7b30c218-6328-41a2-a3e3-2575559f4c9c.yaml
@@ -60,5 +60,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: Table
-sortOrder: 3
+sortOrder: 4
 topLevel: true
diff --git a/api/config/project/neoBlockTypes/text--5548ce5c-5ad4-494e-93be-8ff129618d20.yaml b/api/config/project/neoBlockTypes/text--5548ce5c-5ad4-494e-93be-8ff129618d20.yaml
@@ -4,7 +4,7 @@ description: ''
 enabled: true
 field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks
 fieldLayouts:
-  a93487b5-2ef3-45c3-aedc-ded481b860a9:
+  99d26e6b-6e25-4045-8bda-933cc4e4ee2c:
     tabs:
       -
         elementCondition: null

diff --git a/...onfig/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml b/...onfig/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml
@@ -17,5 +17,5 @@ minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
 name: 'Two Column Container'
-sortOrder: 8
+sortOrder: 9
 topLevel: true
diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml
@@ -1,4 +1,4 @@
-dateModified: 1703112709
+dateModified: 1704736417
 elementSources:
   craft\elements\Entry:
     -
@@ -9,9 +9,9 @@ elementSources:
       key: 'section:1a93d10f-deca-4e6b-a3e8-9baae53e7c47' # Investigations
       tableAttributes:
         - postDate
-        - expiryDate
         - author
         - link
+        - parent
       type: native
     -
       defaultSort:
@@ -24,29 +24,41 @@ elementSources:
       type: native
     -
       defaultSort:
-        - structure
-        - asc
-      disabled: false
-      key: 'section:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages
+        - postDate
+        - desc
+      disabled: true
+      key: '*'
       tableAttributes:
+        - section
         - postDate
         - expiryDate
         - author
         - link
       type: native
     -
       defaultSort:
-        - postDate
-        - desc
+        - structure
+        - asc
       disabled: true
-      key: '*'
+      key: 'section:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages
       tableAttributes:
-        - section
         - postDate
         - expiryDate
         - author
         - link
       type: native
+    -
+      heading: ''
+      type: heading
+    -
+      key: 'section:9068dd8e-ad92-4925-ba1d-1fe180598462' # Questions
+      type: native
+    -
+      key: 'section:c2356ed1-1e49-4056-83c7-ed615a2694b1' # Reference Modals
+      type: native
+    -
+      key: 'section:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets
+      type: native
 email:
   fromEmail: $EMAIL_FROM_ADDRESS
   fromName: $EMAIL_SENDER_NAME
@@ -180,6 +192,7 @@ meta:
     ba6494d9-36e8-40ee-9284-c56783357043: 'Interaction Group' # Interaction Group
     bad8a706-ea60-4282-b1da-3c9ee5f2111a: Caption # Caption
     be5b1aeb-8cbb-4460-a87d-d1ebe0a4fbf8: 'Group Name' # Group Name
+    bf080076-0029-4fb7-9562-4da97d31c0b4: LaTeX # LaTeX
     bfaa63c2-dd2c-42c8-b68e-79d0180d5146: 'Investigation (Parent Entry)' # Investigation (Parent Entry)
     c1c8acb5-0649-4dca-a7c8-1d03e98097cf: 'Help URL' # Help URL
     c1d3dd5f-2677-4a76-8db8-9a2b4db13536: Min # Min
@@ -198,6 +211,7 @@ meta:
     d8be03ce-7aeb-4141-b40e-ec39ec1c796f: Educators # Educators
     d8ed7ca8-514f-4a3e-8675-c5a6e8d6c4f5: Min # Min
     d9df041c-3556-450e-94e1-f37369daf5f3: 'X-axis Label' # X-axis Label
+    dc1c3484-f028-4653-982b-a84e287d4c61: Equation # Equation
     dd3a1151-8de9-46f6-995f-c721fa29a07b: Option # Option
     dd4f7c39-ff32-47e4-b4eb-129bbf44b4a7: 'RTE Caption' # RTE Caption
     dd362aa4-c24c-4d2f-a867-d0baceacd50d: 'Object Name' # Object Name
@@ -807,7 +821,7 @@ plugins:
             - widgets
             - '1'
       nextApiBaseUrl: $NEXT_API_BASE_URL
-      nextSecretToken: $NEXT_REVALIDATE_SECRET_TOKEN
+      nextSecretToken: $NEXT_SECRET_TOKEN
   redactor:
     edition: standard
     enabled: true

diff --git a/api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml b/api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml
@@ -10,7 +10,7 @@ previewTargets:
         - 'Primary entry page'
       -
         - urlFormat
-        - '{url}'
+        - '@previewUrlFormat'
       -
         - refresh
         - '1'