[C] integrate changes

lsst-epo · Oct 24, 2023 · 55c8da7 · 55c8da7
1 parent 4786fde
commit 55c8da7
Show file tree

Hide file tree

Showing 8 changed files with 523 additions and 339 deletions.
diff --git a/api/config/project/fields/preSelectedColor--d0f08c4c-40d1-444d-9a32-b1264d617636.yaml b/api/config/project/fields/preSelectedColor--d0f08c4c-40d1-444d-9a32-b1264d617636.yaml
@@ -15,7 +15,7 @@ settings:
           - Violet
         -
           - value
-          - '#ee82ee'
+          - violet
         -
           - default
           - ''
@@ -26,7 +26,7 @@ settings:
           - Blue
         -
           - value
-          - '#0019FF'
+          - blue
         -
           - default
           - ''
@@ -37,7 +37,7 @@ settings:
           - Green
         -
           - value
-          - '#6BD853'
+          - green
         -
           - default
           - ''
@@ -48,7 +48,7 @@ settings:
           - Yellow
         -
           - value
-          - '#FFDD15'
+          - yellow
         -
           - default
           - ''
@@ -59,7 +59,7 @@ settings:
           - Orange
         -
           - value
-          - '#F18922'
+          - orange
         -
           - default
           - ''
@@ -70,7 +70,7 @@ settings:
           - Red
         -
           - value
-          - '#EC1C24'
+          - red
         -
           - default
           - ''
@@ -81,7 +81,7 @@ settings:
           - none
         -
           - value
-          - transparent
+          - none
         -
           - default
           - '1'

diff --git a/api/config/project/matrixBlockTypes/tableCell--7c04d87d-2b5d-4ba8-841a-2d4f2a1047dd.yaml b/api/config/project/matrixBlockTypes/tableCell--7c04d87d-2b5d-4ba8-841a-2d4f2a1047dd.yaml
@@ -7,7 +7,7 @@ fieldLayouts:
         elements:
           -
             elementCondition: null
-            fieldUid: 3173102a-6f80-4a4f-954b-1d3e151fb21a # Cell Content
+            fieldUid: 3173102a-6f80-4a4f-954b-1d3e151fb21a
             instructions: null
             label: null
             required: false
@@ -48,7 +48,7 @@ fields:
     translationKeyFormat: null
     translationMethod: none
     type: craft\fields\Lightswitch
-  3173102a-6f80-4a4f-954b-1d3e151fb21a: # Cell Content
+  3173102a-6f80-4a4f-954b-1d3e151fb21a:
     columnSuffix: qmgrhddl
     contentColumnType: text
     fieldGroup: null

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
@@ -1,6 +1,6 @@
 childBlocks: null
 conditions: null
-description: "Interactive tool for displaying the range of each filter in the Rubin Observatory LSST camera"
+description: 'Interactive tool for displaying the range of each filter in the Rubin Observatory LSST camera'
 enabled: true
 field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks
 group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets
@@ -14,6 +14,6 @@ maxSiblingBlocks: 0
 minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
-name: "Camera Filter Tool"
+name: 'Camera Filter Tool'
 sortOrder: 13
 topLevel: true
diff --git a/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml b/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml
@@ -11,7 +11,7 @@ fieldLayouts:
         elements:
           -
             elementCondition: null
-            fieldUid: c6109150-a89c-4f0b-aa79-8c1ca78be0ec # Template
+            fieldUid: c6109150-a89c-4f0b-aa79-8c1ca78be0ec
             instructions: null
             label: null
             required: false
@@ -39,7 +39,7 @@ fieldLayouts:
               conditionRules:
                 -
                   class: craft\fields\conditions\OptionsFieldConditionRule
-                  fieldUid: c6109150-a89c-4f0b-aa79-8c1ca78be0ec # Template
+                  fieldUid: c6109150-a89c-4f0b-aa79-8c1ca78be0ec
                   operator: in
                   uid: c0f19587-32fa-4c3e-969f-09c42cf85cd8
                   values:
@@ -63,7 +63,7 @@ fieldLayouts:
               conditionRules:
                 -
                   class: craft\fields\conditions\OptionsFieldConditionRule
-                  fieldUid: c6109150-a89c-4f0b-aa79-8c1ca78be0ec # Template
+                  fieldUid: c6109150-a89c-4f0b-aa79-8c1ca78be0ec
                   operator: in
                   uid: 4a741494-eae5-4407-b1ec-715379e26d0a
                   values:

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
@@ -1,14 +1,16 @@
 childBlocks: null
 conditions: null
-description: ""
+description: ''
 enabled: true
 field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks
 fieldLayouts:
   0cb3dfd9-78c6-4481-932b-129f7d027bf2:
     tabs:
-      - elementCondition: null
+      -
+        elementCondition: null
         elements:
-          - elementCondition: null
+          -
+            elementCondition: null
             fieldUid: d0f08c4c-40d1-444d-9a32-b1264d617636 # Pre-selected Color
             instructions: null
             label: null
@@ -19,7 +21,8 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 75
-          - elementCondition: null
+          -
+            elementCondition: null
             fieldUid: 131ceffb-300f-415d-8cd5-a932d7529287 # Read Only
             instructions: null
             label: null
@@ -44,6 +47,6 @@ maxSiblingBlocks: 0
 minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
-name: "Filter Tool"
+name: 'Filter Tool'
 sortOrder: 11
 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
@@ -1,14 +1,16 @@
 childBlocks: null
 conditions: null
-description: ""
+description: ''
 enabled: true
 field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks
 fieldLayouts:
   d7754bfd-0a9d-40f0-8905-1f81146fe74b:
     tabs:
-      - elementCondition: null
+      -
+        elementCondition: null
         elements:
-          - elementCondition: null
+          -
+            elementCondition: null
             fieldUid: c430001c-4bfc-4154-9e13-f5ada3b4a22d # Text
             instructions: null
             label: Title
@@ -19,7 +21,8 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 100
-          - elementCondition: null
+          -
+            elementCondition: null
             fieldUid: d9df041c-3556-450e-94e1-f37369daf5f3 # X-axis Label
             instructions: null
             label: null
@@ -30,7 +33,8 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 50
-          - elementCondition: null
+          -
+            elementCondition: null
             fieldUid: 852df24b-f90e-486b-a371-b47ca241a84e # Y-axis Label
             instructions: null
             label: null
@@ -41,7 +45,8 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 50
-          - elementCondition: null
+          -
+            elementCondition: null
             fieldUid: 31815ced-cfa3-4ed2-a002-5705a2c6be4b # X-axis Minimum
             instructions: null
             label: null
@@ -52,7 +57,8 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 50
-          - elementCondition: null
+          -
+            elementCondition: null
             fieldUid: 61e0fe59-d439-429c-b783-2d71fe4c5d44 # Y-axis Maximum
             instructions: null
             label: null
@@ -63,7 +69,8 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 50
-          - elementCondition: null
+          -
+            elementCondition: null
             fieldUid: a72ca793-6ee2-4a6f-b47e-06a35cf61e06 # Scatterplot Items
             instructions: null
             label: null
@@ -88,6 +95,6 @@ maxSiblingBlocks: 0
 minBlocks: 0
 minChildBlocks: 0
 minSiblingBlocks: 0
-name: "Scatterplot Tool"
+name: 'Scatterplot Tool'
 sortOrder: 12
 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
@@ -11,7 +11,7 @@ fieldLayouts:
         elements:
           -
             elementCondition: null
-            fieldUid: 0d335b99-111b-4f79-ab51-e890179b337c # Heading
+            fieldUid: 0d335b99-111b-4f79-ab51-e890179b337c
             instructions: null
             label: null
             required: false