@asd20/ui 3.2.889 → 3.2.891
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/organisms/Asd20PrimaryHeader/index.vue +1 -1
- package/src/components/templates/Asd20DistrictHomeTemplate/index.stories.js +7 -3
- package/src/components/templates/Asd20DistrictHomeTemplate/index.vue +15 -14
- package/src/helpers/expandEvents.js +2 -2
- package/src/mixins/userProfileMixin.js +5 -2
package/package.json
CHANGED
|
@@ -42,7 +42,7 @@ export default {
|
|
|
42
42
|
detailLink: { type: String, default: '' },
|
|
43
43
|
detailLinkLabel: { type: String, default: '' },
|
|
44
44
|
userGivenName: { type: String, default: '' },
|
|
45
|
-
userGroupsList: { type:
|
|
45
|
+
userGroupsList: { type: Array, default: () => [] },
|
|
46
46
|
},
|
|
47
47
|
computed: {
|
|
48
48
|
mq() {
|
|
@@ -32,9 +32,13 @@ const wrapper = {
|
|
|
32
32
|
userGroups: {
|
|
33
33
|
type: Array,
|
|
34
34
|
default: () => [
|
|
35
|
-
{
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
{
|
|
36
|
+
value: [
|
|
37
|
+
{ displayName: 'Admin Group' },
|
|
38
|
+
{ displayName: 'Developers Group' },
|
|
39
|
+
{ displayName: 'ea-Communication' },
|
|
40
|
+
],
|
|
41
|
+
},
|
|
38
42
|
],
|
|
39
43
|
},
|
|
40
44
|
isInLeadershipGroup: {
|
|
@@ -95,20 +95,21 @@
|
|
|
95
95
|
/>
|
|
96
96
|
<asd20-secondary-header v-if="messages.length > 1" :messages="messages" />
|
|
97
97
|
<asd20-tertiary-header v-if="messages.length > 2" :messages="messages" />
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
98
|
+
<client-only>
|
|
99
|
+
<asd20-feeds-section
|
|
100
|
+
:announcements="announcements"
|
|
101
|
+
:announcements-feed-props="announcementsFeedProps"
|
|
102
|
+
@announcements-in-view="$emit('announcements-in-view')"
|
|
103
|
+
:stories="stories"
|
|
104
|
+
:stories-feed-props="storiesFeedProps"
|
|
105
|
+
@stories-in-view="$emit('stories-in-view')"
|
|
106
|
+
:events="events"
|
|
107
|
+
:events-feed-props="eventsFeedProps"
|
|
108
|
+
@events-in-view="$emit('events-in-view')"
|
|
109
|
+
:organizationId="organization.id"
|
|
110
|
+
:hasProtectedContent="hasProtectedContent"
|
|
111
|
+
></asd20-feeds-section>
|
|
112
|
+
</client-only>
|
|
112
113
|
|
|
113
114
|
<!-- <asd20-factoids-section
|
|
114
115
|
v-if="factoids && factoids.length > 0"
|
|
@@ -21,7 +21,7 @@ export default function expandEvents(events) {
|
|
|
21
21
|
// Normalize today's date to ignore time
|
|
22
22
|
const today = new Date()
|
|
23
23
|
today.setHours(0, 0, 0, 0)
|
|
24
|
-
console.log('Today:', today)
|
|
24
|
+
// console.log('Today:', today)
|
|
25
25
|
|
|
26
26
|
const diffTime = Math.abs(end.getTime() - start.getTime())
|
|
27
27
|
const diffHours = Math.ceil(diffTime / (1000 * 60 * 60))
|
|
@@ -59,7 +59,7 @@ export default function expandEvents(events) {
|
|
|
59
59
|
// Normalize start date for single-day events
|
|
60
60
|
const normalizedStart = new Date(start)
|
|
61
61
|
normalizedStart.setHours(0, 0, 0, 0)
|
|
62
|
-
console.log('normailizedStart:', normalizedStart)
|
|
62
|
+
// console.log('normailizedStart:', normalizedStart)
|
|
63
63
|
|
|
64
64
|
if (normalizedStart >= today) {
|
|
65
65
|
a.push({
|
|
@@ -40,8 +40,11 @@ export default {
|
|
|
40
40
|
},
|
|
41
41
|
userGroupsList() {
|
|
42
42
|
return (this._userGroups && this._userGroups.length > 0)
|
|
43
|
-
? this._userGroups
|
|
44
|
-
|
|
43
|
+
? this._userGroups
|
|
44
|
+
.flatMap(group => group.value || [])
|
|
45
|
+
.map(item => item.displayName)
|
|
46
|
+
.filter(displayName => displayName)
|
|
47
|
+
: []
|
|
45
48
|
},
|
|
46
49
|
leadershipGroup() {
|
|
47
50
|
return this._isInLeadershipGroup
|