@asd20/ui 3.2.379 → 3.2.382

package/package.json

@@ -5,7 +5,7 @@
     "*.scss",
     "*.vue"
   ],
-  "version": "3.2.379",
+  "version": "3.2.382",
   "private": false,
   "license": "MIT",
   "repository": {

package/src/components/organisms/Asd20FileList/index.vue

@@ -35,6 +35,7 @@ export default {
     url: { type: String, default: '' },
     groupByOwner: { type: Boolean, default: false },
     groupByCategory: { type: Boolean, default: false },
+    groupByCategoryDescending: { type: Boolean, default: false },
     groupByTag: { type: Boolean, default: false },
     groupByDate: { type: Boolean, default: false },
     maxHeight: { type: String, default: '320px' },
@@ -63,6 +64,8 @@ export default {
         return this.fileItemsGroupedByOwner
       } else if (this.groupByTag) {
         return this.fileItemsGroupedByTag
+      } else if (this.groupByCategoryDescending) {
+        return this.fileItemsGroupedByCategoryDescending
       }
       return this.fileItemsGroupedByCategory
     },
@@ -108,6 +111,47 @@ export default {
         })
     },
 
+    fileItemsGroupedByCategoryDescending() {
+      return this.computedFiles
+        .reduce((a, c) => {
+          let categories =
+            c.categories && c.categories.length > 0
+              ? c.categories
+              : ['Uncategorized']
+          for (const category of categories) {
+            if (a.indexOf(category) === -1) a.push(category)
+          }
+          return a
+        }, [])
+        .sort((a, b) => (a > b ? -1 : b > a ? 1 : 0))
+        .map(c => {
+          return {
+            name: c,
+            items: mapFilesToListItems(
+              this.computedFiles
+                .map(f => ({
+                  ...f,
+                  categories:
+                    f.categories && f.categories.length > 0
+                      ? f.categories
+                      : ['Uncategorized'],
+                }))
+                .filter(f => f.categories.indexOf(c) > -1)
+            )
+              .sort((a, b) =>
+                a.label > b.label ? 1 : b.label > a.label ? -1 : 0
+              )
+              .map(t => ({
+                ...t,
+                bordered: false,
+                alignTop: false,
+                condensed: false,
+                tags: [],
+              })),
+          }
+        })
+    },
+
     fileItemsGroupedByTag() {
       return this.computedFiles
         .reduce((a, t) => {

package/src/components/organisms/Asd20ImageGallery/index.vue

@@ -19,7 +19,9 @@
         target="_blank"
       >
         <img :src="image.thumbnailUrl" :alt="image.alt" />
-        <p class="grid-overlay">{{ truncatedDescription(image.credits) }}</p>
+        <p v-if="image.credits" class="grid-overlay">
+          {{ truncatedDescription(image.credits) }}
+        </p>
       </a>
     </asd20-grid>
 
@@ -39,7 +41,7 @@
           :key="index"
         >
           <img :src="image.url" :alt="image.alt" />
-          <p class="text-overlay">{{ image.credits }}</p>
+          <p v-if="image.credits" class="text-overlay">{{ image.credits }}</p>
         </asd20-swipe-item>
       </asd20-swipe>
     </transition>

package/src/components/templates/Asd20ProfileTemplate/index.vue

@@ -172,12 +172,16 @@
         <asd20-list
           v-if="organization.awardsHonors.length > 0"
           :items="
-            organization.awardsHonors.map(a => ({
-              label: a,
-              alignTop: true,
-              checked: true,
-              condensed: true,
-            }))
+            organization.awardsHonors
+              .map(a => ({
+                label: a,
+                alignTop: true,
+                checked: true,
+                condensed: true,
+              }))
+              .sort((a, b) =>
+                a.label > b.label ? 1 : b.label > a.label ? -1 : 0
+              )
           "
           class="asd20-school-details__awards-honors"
           icon="award"
@@ -187,12 +191,16 @@
         <asd20-list
           v-if="organization.uniqueOfferings.length > 0"
           :items="
-            organization.uniqueOfferings.map(u => ({
-              label: u,
-              alignTop: true,
-              checked: true,
-              condensed: true,
-            }))
+            organization.uniqueOfferings
+              .map(u => ({
+                label: u,
+                alignTop: true,
+                checked: true,
+                condensed: true,
+              }))
+              .sort((a, b) =>
+                a.label > b.label ? 1 : b.label > a.label ? -1 : 0
+              )
           "
           class="asd20-school-details__unique-offerings"
           headline="Unique Offerings"
@@ -374,7 +382,6 @@ export default {
             .map(oc => oc.category.title)
             .includes('Academics')
         )
-
         .map(a => ({
           label: a.offering.title,
           description: a.offering.description,
@@ -383,13 +390,13 @@ export default {
           condensed: true,
           checked: true,
         }))
+        .sort((a, b) => (a.label > b.label ? 1 : b.label > a.label ? -1 : 0))
     },
     artsListItems() {
       return this.organization.offerings
         .filter(o =>
           o.offering.categories.map(oc => oc.category.title).includes('Arts')
         )
-
         .map(a => ({
           label: a.offering.title,
           alignTop: true,
@@ -397,6 +404,7 @@ export default {
           condensed: true,
           checked: true,
         }))
+        .sort((a, b) => (a.label > b.label ? 1 : b.label > a.label ? -1 : 0))
     },
     athleticsListItems() {
       return this.organization.offerings
@@ -412,6 +420,7 @@ export default {
           condensed: true,
           checked: true,
         }))
+        .sort((a, b) => (a.label > b.label ? 1 : b.label > a.label ? -1 : 0))
     },
   },
 }

package/src/data/page-queries/filelist-page-query-result.json

@@ -1597,7 +1597,7 @@
             "id": "55ac8326-ae3c-4b6d-912b-46231ee2132c",
             "title": "File Feed",
             "type": "text",
-            "value": "[{\"title\":\"Related Files\",\"limit\":20,\"keywords\":\"\",\"owners\":[],\"categories\":[\"Food and Nutrition\"],\"tags\":[\"application,alternate application,information release\"],\"groupByDate\":false,\"groupByOwner\":false,\"groupByCategory\":true,\"groupByTag\":false}]",
+            "value": "[{\"title\":\"Related Files\",\"limit\":20,\"keywords\":\"\",\"owners\":[],\"categories\":[\"Food and Nutrition\"],\"tags\":[\"application,alternate application,information release\"],\"groupByDate\":false,\"groupByOwner\":false,\"groupByCategory\":false,\"groupByCategoryDescending\":true,\"groupByTag\":false}]",
             "validationPattern": null,
             "required": false
         },

package/src/data/page-queries/sublanding-page-query-result.json

@@ -92,8 +92,7 @@
                     }
                   ],
                   "metadata": {
-                    "alt": "This is ALT text.",
-                    "credits": "The Discovery Canyon Campus swimming pool."
+                    "alt": "This is ALT text."
                   }
                 }
               ],

package/src/helpers/mapPageQueryResultToPageTemplateProps.js

@@ -126,6 +126,8 @@ export default function mapPageQueryResultToPageTemplateProps(queryResult) {
       linkLabel: firstFilesFeedConfiguration.linkLabel || 'More Files',
       groupByOwner: firstFilesFeedConfiguration.groupByOwner || false,
       groupByCategory: firstFilesFeedConfiguration.groupByCategory || true,
+      groupByCategoryDescending:
+        firstFilesFeedConfiguration.groupByCategoryDescending || false,
       groupByTag: firstFilesFeedConfiguration.groupByTag || false,
       groupByDate: firstFilesFeedConfiguration.groupByDate || false,
     }