feat: expand calendar function to generic element

Refs: #1585
ComPlat · Oct 24, 2023 · 48aef3b · 48aef3b
1 parent 3ef1129
commit 48aef3b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/packs/src/components/calendar/CalendarEntryEditor.js b/app/packs/src/components/calendar/CalendarEntryEditor.js
@@ -46,8 +46,7 @@ export default class CalendarEntryEditor extends React.Component {
 
     const e = { type: eventableType, params: {} };
     e.params[`${eventableType}ID`] = eventableId;
-
-    if (eventableType === 'element') {
+    if (/\blabimotion\b/.test(eventableType)) {
       e.klassType = 'GenericEl';
     }
 

diff --git a/app/packs/src/components/generic/GenericElDetails.js b/app/packs/src/components/generic/GenericElDetails.js
@@ -32,6 +32,7 @@ import { notification, FlowViewerBtn, renderFlowModal } from 'src/apps/generic/U
 import GenericAttachments from 'src/components/generic/GenericAttachments';
 import { SegmentTabs } from 'src/components/generic/SegmentDetails';
 import RevisionViewerBtn from 'src/components/generic/RevisionViewerBtn';
+import OpenCalendarButton from 'src/components/calendar/OpenCalendarButton';
 
 const onNaviClick = (type, id) => {
   const { currentCollection, isSync } = UIStore.getState();
@@ -397,6 +398,9 @@ export default class GenericElDetails extends Component {
             <i className="fa fa-floppy-o" aria-hidden="true" />
           </Button>
         </OverlayTrigger>
+        {genericEl.isNew
+          ? null
+          : <OpenCalendarButton isPanelHeader eventableId={genericEl.id} eventableType="Labimotion::Element" />}
       </div>
     );
   }

diff --git a/app/packs/src/components/navigation/search/Search.js b/app/packs/src/components/navigation/search/Search.js
@@ -93,6 +93,7 @@ export default class Search extends React.Component {
       searchName: genericEl.search_name,
       searchShowLabel: genericEl.search_short_label,
       genericElName: genericEl.name,
+      genericKlassId: genericEl.id,
       search_by_method: genericEl.name,
       genericElProperties: genericEl.properties,
       searchProperties: genericEl.search_properties,