@selfcommunity/react-templates 0.4.0-live.81 → 0.4.0-live.85

package/lib/cjs/components/Event/Event.js

@@ -6,6 +6,7 @@ const styles_1 = require("@mui/material/styles");
 const material_1 = require("@mui/material");
 const react_ui_1 = require("@selfcommunity/react-ui");
 const react_core_1 = require("@selfcommunity/react-core");
+const types_1 = require("@selfcommunity/types");
 const Skeleton_1 = tslib_1.__importDefault(require("./Skeleton"));
 const system_1 = require("@mui/system");
 const classnames_1 = tslib_1.__importDefault(require("classnames"));
@@ -54,7 +55,11 @@ function Event(inProps) {
     const { id = 'event', className, event, eventId, widgets, FeedObjectProps, FeedSidebarProps, EventFeedProps = {}, EventHeaderProps = {} } = props;
     // HOOKS
     const { scEvent } = (0, react_core_1.useSCFetchEvent)({ id: eventId, event });
-    if (!scEvent) {
+    const scUserContext = (0, react_core_1.useSCUser)();
+    if (scUserContext.user === undefined ||
+        !scEvent ||
+        (scEvent.privacy === types_1.SCEventPrivacyType.PUBLIC && !scEvent.subscription_status) ||
+        scEvent.subscription_status === types_1.SCEventSubscriptionStatusType.INVITED) {
         return (0, jsx_runtime_1.jsx)(Skeleton_1.default, {});
     }
     return ((0, jsx_runtime_1.jsxs)(Root, Object.assign({ id: id, className: (0, classnames_1.default)(classes.root, className) }, { children: [(0, jsx_runtime_1.jsx)(react_ui_1.EventHeader, Object.assign({ event: scEvent }, EventHeaderProps)), (0, jsx_runtime_1.jsx)(EventFeed_1.default, Object.assign({ className: classes.feed, event: scEvent, widgets: widgets, FeedObjectProps: FeedObjectProps, FeedSidebarProps: FeedSidebarProps }, EventFeedProps))] })));

package/lib/cjs/components/EventFeed/EventFeed.js

@@ -91,12 +91,12 @@ function EventFeed(inProps) {
     // REF
     const feedRef = (0, react_1.useRef)();
     // Hooks
-    const { scEvent, setSCEvent } = (0, react_core_1.useSCFetchEvent)({ id: eventId, event });
+    const { scEvent } = (0, react_core_1.useSCFetchEvent)({ id: eventId, event });
     // HANDLERS
     const handleComposerSuccess = (feedObject) => {
         var _a;
         enqueueSnackbar((0, jsx_runtime_1.jsx)(react_intl_1.FormattedMessage, { id: "ui.composerIconButton.composer.success", defaultMessage: "ui.composerIconButton.composer.success" }), {
-            action: (snackbarId) => ((0, jsx_runtime_1.jsx)(react_core_1.Link, Object.assign({ to: scRoutingContext.url(react_core_1.SCRoutes[`${feedObject.type.toUpperCase()}_ROUTE_NAME`], react_ui_1.ContributionUtils.getRouteData(feedObject)) }, { children: (0, jsx_runtime_1.jsx)(react_intl_1.FormattedMessage, { id: "ui.composerIconButton.composer.viewContribute", defaultMessage: "ui.composerIconButton.composer.viewContribute" }) }))),
+            action: () => ((0, jsx_runtime_1.jsx)(react_core_1.Link, Object.assign({ to: scRoutingContext.url(react_core_1.SCRoutes[`${feedObject.type.toUpperCase()}_ROUTE_NAME`], react_ui_1.ContributionUtils.getRouteData(feedObject)) }, { children: (0, jsx_runtime_1.jsx)(react_intl_1.FormattedMessage, { id: "ui.composerIconButton.composer.viewContribute", defaultMessage: "ui.composerIconButton.composer.viewContribute" }) }))),
             variant: 'success',
             autoHideDuration: 7000
         });
@@ -114,16 +114,19 @@ function EventFeed(inProps) {
     // WIDGETS
     const _widgets = (0, react_1.useMemo)(() => widgets.map((w) => {
         if (scEvent) {
-            return Object.assign(Object.assign({}, w), { componentProps: Object.assign(Object.assign({}, w.componentProps), { eventId: scEvent.id }) });
+            return Object.assign(Object.assign({}, w), { componentProps: Object.assign(Object.assign({}, w.componentProps), { event: scEvent }) });
         }
         return w;
     }), [widgets, scEvent]);
-    if (!scEvent || (scEvent && ((eventId !== undefined && scEvent.id !== eventId) || (event && scEvent.id !== event.id)))) {
+    if (scUserContext.user === undefined ||
+        !scEvent ||
+        scEvent.subscription_status === types_1.SCEventSubscriptionStatusType.INVITED ||
+        (scEvent.privacy === types_1.SCEventPrivacyType.PUBLIC && !scEvent.subscription_status) ||
+        (scEvent && ((eventId !== undefined && scEvent.id !== eventId) || (event && scEvent.id !== event.id)))) {
         return (0, jsx_runtime_1.jsx)(Skeleton_1.default, {});
     }
     else if (scEvent.privacy === types_1.SCEventPrivacyType.PRIVATE &&
         scEvent.subscription_status !== types_1.SCEventSubscriptionStatusType.SUBSCRIBED &&
-        scEvent.subscription_status !== types_1.SCEventSubscriptionStatusType.INVITED &&
         scEvent.subscription_status !== types_1.SCEventSubscriptionStatusType.GOING &&
         scEvent.subscription_status !== types_1.SCEventSubscriptionStatusType.NOT_GOING) {
         return ((0, jsx_runtime_1.jsx)(material_1.Box, Object.assign({ mt: 2 }, { children: (0, jsx_runtime_1.jsx)(react_ui_1.EventInfoWidget, { className: classes.root, event: scEvent }) })));
@@ -142,7 +145,6 @@ function EventFeed(inProps) {
                     ((!scUserContext.user && scEvent.privacy === types_1.SCEventPrivacyType.PUBLIC) ||
                         (scUserContext.user &&
                             (scEvent.subscription_status === types_1.SCEventSubscriptionStatusType.SUBSCRIBED ||
-                                scEvent.subscription_status === types_1.SCEventSubscriptionStatusType.INVITED ||
                                 scEvent.subscription_status === types_1.SCEventSubscriptionStatusType.GOING ||
                                 scEvent.subscription_status === types_1.SCEventSubscriptionStatusType.NOT_GOING)))) && ((0, jsx_runtime_1.jsx)(react_ui_1.InlineComposerWidget, { onSuccess: handleComposerSuccess, defaultValue: { event: scEvent }, label: (0, jsx_runtime_1.jsx)(react_intl_1.FormattedMessage, { id: "templates.eventFeed.composer.label", defaultMessage: "templates.eventFeed.composer.label" }), feedType: types_1.SCFeedTypologyType.EVENT }))] }), CustomAdvProps: { position: types_1.SCCustomAdvPosition.POSITION_FEED, groupsId: [scEvent.id] }, enabledCustomAdvPositions: [
             types_1.SCCustomAdvPosition.POSITION_FEED_SIDEBAR,

package/lib/cjs/components/FeedObjectDetail/FeedObjectDetail.js

@@ -97,6 +97,6 @@ function FeedObjectDetail(inProps) {
     if (!obj) {
         return (0, jsx_runtime_1.jsx)(Skeleton_1.default, {});
     }
-    return ((0, jsx_runtime_1.jsx)(Root, Object.assign({ id: id, className: (0, classnames_1.default)(classes.root, className) }, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, Object.assign({ container: true, spacing: 2 }, { children: [(0, jsx_runtime_1.jsxs)(material_1.Grid, Object.assign({ item: true, xs: 12, md: 7 }, { children: [(0, jsx_runtime_1.jsx)(react_ui_1.FeedObject, Object.assign({}, FeedObjectProps, { feedObject: obj, template: react_ui_1.SCFeedObjectTemplateType.DETAIL, onReply: handleReply })), renderAdvertising(), (0, jsx_runtime_1.jsx)(react_ui_1.CommentsFeedObject, Object.assign({ showTitle: true, feedObject: obj, comments: comments }, CommentsFeedObjectProps), `comments_${obj.id}`)] })), (0, jsx_runtime_1.jsx)(material_1.Grid, Object.assign({ item: true, xs: 12, md: 5 }, { children: (0, jsx_runtime_1.jsx)(material_1.Hidden, Object.assign({ mdDown: true }, { children: (0, jsx_runtime_1.jsx)(react_ui_1.StickyBox, Object.assign({}, FeedSidebarProps, { children: (0, jsx_runtime_1.jsx)(react_ui_1.RelatedFeedObjectsWidget, Object.assign({ feedObject: obj }, RelatedFeedObjectProps), `related_${obj.id}`) })) })) }))] })) })));
+    return ((0, jsx_runtime_1.jsx)(Root, Object.assign({ id: id, className: (0, classnames_1.default)(classes.root, className) }, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, Object.assign({ container: true, spacing: 2 }, { children: [(0, jsx_runtime_1.jsxs)(material_1.Grid, Object.assign({ item: true, xs: 12, md: 7 }, { children: [(0, jsx_runtime_1.jsx)(react_ui_1.FeedObject, Object.assign({}, FeedObjectProps, { feedObject: obj, template: react_ui_1.SCFeedObjectTemplateType.DETAIL, onReply: handleReply })), renderAdvertising(), (0, jsx_runtime_1.jsx)(react_ui_1.CommentsFeedObject, Object.assign({ showTitle: true, feedObject: obj, comments: comments }, CommentsFeedObjectProps), `comments_${obj.id}`)] })), (0, jsx_runtime_1.jsx)(material_1.Grid, Object.assign({ item: true, xs: 12, md: 5 }, { children: (0, jsx_runtime_1.jsx)(material_1.Hidden, Object.assign({ mdDown: true }, { children: (0, jsx_runtime_1.jsx)(react_ui_1.StickyBox, Object.assign({}, FeedSidebarProps, { children: (0, jsx_runtime_1.jsx)(react_ui_1.RelatedFeedObjectsWidget, Object.assign({ feedObject: obj, feedObjectId: obj.id }, RelatedFeedObjectProps), `related_${obj.id}`) })) })) }))] })) })));
 }
 exports.default = FeedObjectDetail;

package/lib/esm/components/Event/Event.js

@@ -2,7 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { styled } from '@mui/material/styles';
 import { Box } from '@mui/material';
 import { EventHeader } from '@selfcommunity/react-ui';
-import { useSCFetchEvent } from '@selfcommunity/react-core';
+import { useSCFetchEvent, useSCUser } from '@selfcommunity/react-core';
+import { SCEventPrivacyType, SCEventSubscriptionStatusType } from '@selfcommunity/types';
 import EventSkeletonTemplate from './Skeleton';
 import { useThemeProps } from '@mui/system';
 import classNames from 'classnames';
@@ -51,7 +52,11 @@ export default function Event(inProps) {
     const { id = 'event', className, event, eventId, widgets, FeedObjectProps, FeedSidebarProps, EventFeedProps = {}, EventHeaderProps = {} } = props;
     // HOOKS
     const { scEvent } = useSCFetchEvent({ id: eventId, event });
-    if (!scEvent) {
+    const scUserContext = useSCUser();
+    if (scUserContext.user === undefined ||
+        !scEvent ||
+        (scEvent.privacy === SCEventPrivacyType.PUBLIC && !scEvent.subscription_status) ||
+        scEvent.subscription_status === SCEventSubscriptionStatusType.INVITED) {
         return _jsx(EventSkeletonTemplate, {});
     }
     return (_jsxs(Root, Object.assign({ id: id, className: classNames(classes.root, className) }, { children: [_jsx(EventHeader, Object.assign({ event: scEvent }, EventHeaderProps)), _jsx(EventFeed, Object.assign({ className: classes.feed, event: scEvent, widgets: widgets, FeedObjectProps: FeedObjectProps, FeedSidebarProps: FeedSidebarProps }, EventFeedProps))] })));

package/lib/esm/components/EventFeed/EventFeed.js

@@ -88,12 +88,12 @@ export default function EventFeed(inProps) {
     // REF
     const feedRef = useRef();
     // Hooks
-    const { scEvent, setSCEvent } = useSCFetchEvent({ id: eventId, event });
+    const { scEvent } = useSCFetchEvent({ id: eventId, event });
     // HANDLERS
     const handleComposerSuccess = (feedObject) => {
         var _a;
         enqueueSnackbar(_jsx(FormattedMessage, { id: "ui.composerIconButton.composer.success", defaultMessage: "ui.composerIconButton.composer.success" }), {
-            action: (snackbarId) => (_jsx(Link, Object.assign({ to: scRoutingContext.url(SCRoutes[`${feedObject.type.toUpperCase()}_ROUTE_NAME`], ContributionUtils.getRouteData(feedObject)) }, { children: _jsx(FormattedMessage, { id: "ui.composerIconButton.composer.viewContribute", defaultMessage: "ui.composerIconButton.composer.viewContribute" }) }))),
+            action: () => (_jsx(Link, Object.assign({ to: scRoutingContext.url(SCRoutes[`${feedObject.type.toUpperCase()}_ROUTE_NAME`], ContributionUtils.getRouteData(feedObject)) }, { children: _jsx(FormattedMessage, { id: "ui.composerIconButton.composer.viewContribute", defaultMessage: "ui.composerIconButton.composer.viewContribute" }) }))),
             variant: 'success',
             autoHideDuration: 7000
         });
@@ -111,16 +111,19 @@ export default function EventFeed(inProps) {
     // WIDGETS
     const _widgets = useMemo(() => widgets.map((w) => {
         if (scEvent) {
-            return Object.assign(Object.assign({}, w), { componentProps: Object.assign(Object.assign({}, w.componentProps), { eventId: scEvent.id }) });
+            return Object.assign(Object.assign({}, w), { componentProps: Object.assign(Object.assign({}, w.componentProps), { event: scEvent }) });
         }
         return w;
     }), [widgets, scEvent]);
-    if (!scEvent || (scEvent && ((eventId !== undefined && scEvent.id !== eventId) || (event && scEvent.id !== event.id)))) {
+    if (scUserContext.user === undefined ||
+        !scEvent ||
+        scEvent.subscription_status === SCEventSubscriptionStatusType.INVITED ||
+        (scEvent.privacy === SCEventPrivacyType.PUBLIC && !scEvent.subscription_status) ||
+        (scEvent && ((eventId !== undefined && scEvent.id !== eventId) || (event && scEvent.id !== event.id)))) {
         return _jsx(EventFeedSkeleton, {});
     }
     else if (scEvent.privacy === SCEventPrivacyType.PRIVATE &&
         scEvent.subscription_status !== SCEventSubscriptionStatusType.SUBSCRIBED &&
-        scEvent.subscription_status !== SCEventSubscriptionStatusType.INVITED &&
         scEvent.subscription_status !== SCEventSubscriptionStatusType.GOING &&
         scEvent.subscription_status !== SCEventSubscriptionStatusType.NOT_GOING) {
         return (_jsx(Box, Object.assign({ mt: 2 }, { children: _jsx(EventInfoWidget, { className: classes.root, event: scEvent }) })));
@@ -139,7 +142,6 @@ export default function EventFeed(inProps) {
                     ((!scUserContext.user && scEvent.privacy === SCEventPrivacyType.PUBLIC) ||
                         (scUserContext.user &&
                             (scEvent.subscription_status === SCEventSubscriptionStatusType.SUBSCRIBED ||
-                                scEvent.subscription_status === SCEventSubscriptionStatusType.INVITED ||
                                 scEvent.subscription_status === SCEventSubscriptionStatusType.GOING ||
                                 scEvent.subscription_status === SCEventSubscriptionStatusType.NOT_GOING)))) && (_jsx(InlineComposerWidget, { onSuccess: handleComposerSuccess, defaultValue: { event: scEvent }, label: _jsx(FormattedMessage, { id: "templates.eventFeed.composer.label", defaultMessage: "templates.eventFeed.composer.label" }), feedType: SCFeedTypologyType.EVENT }))] }), CustomAdvProps: { position: SCCustomAdvPosition.POSITION_FEED, groupsId: [scEvent.id] }, enabledCustomAdvPositions: [
             SCCustomAdvPosition.POSITION_FEED_SIDEBAR,

package/lib/esm/components/FeedObjectDetail/FeedObjectDetail.js

@@ -94,5 +94,5 @@ export default function FeedObjectDetail(inProps) {
     if (!obj) {
         return _jsx(FeedObjectDetailSkeleton, {});
     }
-    return (_jsx(Root, Object.assign({ id: id, className: classNames(classes.root, className) }, { children: _jsxs(Grid, Object.assign({ container: true, spacing: 2 }, { children: [_jsxs(Grid, Object.assign({ item: true, xs: 12, md: 7 }, { children: [_jsx(FeedObject, Object.assign({}, FeedObjectProps, { feedObject: obj, template: SCFeedObjectTemplateType.DETAIL, onReply: handleReply })), renderAdvertising(), _jsx(CommentsFeedObject, Object.assign({ showTitle: true, feedObject: obj, comments: comments }, CommentsFeedObjectProps), `comments_${obj.id}`)] })), _jsx(Grid, Object.assign({ item: true, xs: 12, md: 5 }, { children: _jsx(Hidden, Object.assign({ mdDown: true }, { children: _jsx(StickyBox, Object.assign({}, FeedSidebarProps, { children: _jsx(RelatedFeedObjectsWidget, Object.assign({ feedObject: obj }, RelatedFeedObjectProps), `related_${obj.id}`) })) })) }))] })) })));
+    return (_jsx(Root, Object.assign({ id: id, className: classNames(classes.root, className) }, { children: _jsxs(Grid, Object.assign({ container: true, spacing: 2 }, { children: [_jsxs(Grid, Object.assign({ item: true, xs: 12, md: 7 }, { children: [_jsx(FeedObject, Object.assign({}, FeedObjectProps, { feedObject: obj, template: SCFeedObjectTemplateType.DETAIL, onReply: handleReply })), renderAdvertising(), _jsx(CommentsFeedObject, Object.assign({ showTitle: true, feedObject: obj, comments: comments }, CommentsFeedObjectProps), `comments_${obj.id}`)] })), _jsx(Grid, Object.assign({ item: true, xs: 12, md: 5 }, { children: _jsx(Hidden, Object.assign({ mdDown: true }, { children: _jsx(StickyBox, Object.assign({}, FeedSidebarProps, { children: _jsx(RelatedFeedObjectsWidget, Object.assign({ feedObject: obj, feedObjectId: obj.id }, RelatedFeedObjectProps), `related_${obj.id}`) })) })) }))] })) })));
 }