Skip to content

Commit

Permalink
update , fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
trieu committed May 24, 2024
1 parent 294ddb8 commit 34a0360
Show file tree
Hide file tree
Showing 22 changed files with 41 additions and 27 deletions.
7 changes: 6 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
* How to setup LEO CDP
* How to monitor system

## [0.9.0] - 2024-05-15
## [0.9.0] - 2024-05-24

### Added

- [Core] add core AutomatedFlow Java models
- [Campaign] add MarketingAutomation, parsing JSON of Automated Flow Rules
- [Campaign UI] show automated flow using mermaid.js
- [Admin UI] show menu user guide
- [Campaign] UI to listing campaigns
Expand Down Expand Up @@ -67,6 +69,7 @@

### Fixed

- [Profile API] update error message
- [De-duplication] fix Top duplicate profiles and refactoring code
- [User Authorization]
- [Data Deduplication] improve UI UX in profile list and profile info
Expand Down Expand Up @@ -103,6 +106,8 @@

### Changed

- [Core] remove easy-rules java lib, add MVEL for dynamic rules in campaign
- [Campaign] refactoring model
- [Profile] UI of report
-[System User Login] update capcha text generation
- [Profile] improve UI UX of profile
Expand Down
Binary file removed deps/easy-rules-core-4.1.0.jar
Binary file not shown.
Binary file removed deps/easy-rules-mvel-4.1.0.jar
Binary file not shown.
Binary file removed deps/easy-rules-support-4.1.0.jar
Binary file not shown.
Binary file removed deps/jackson-dataformat-yaml-2.14.2.jar
Binary file not shown.
Binary file removed deps/mvel2-2.4.10.Final.jar
Binary file not shown.
Binary file added deps/mvel2-2.5.2.Final.jar
Binary file not shown.
Binary file added deps/snakeyaml-1.18.jar
Binary file not shown.
Binary file removed deps/snakeyaml-1.33.jar
Binary file not shown.
Binary file modified leo-data-processing-starter-v_0.9.0.jar
Binary file not shown.
Binary file modified leo-main-starter-v_0.9.0.jar
Binary file not shown.
Binary file modified leo-observer-starter-v_0.9.0.jar
Binary file not shown.
Binary file modified leo-scheduler-starter-v_0.9.0.jar
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title text-center"> <i class="fa fa-commenting-o"></i> Leo Chatbot - Your Personal Assistant</h4>
<h4 class="modal-title text-center"> <i class="fa fa-commenting-o"></i> AI Chatbot - Your Personal Assistant</h4>
</div>
<div class="modal-body row">
<div class="col-md-9" >
Expand Down
2 changes: 1 addition & 1 deletion resources/app-templates/leocdp-admin/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
<script src="https://{{baseStaticUrl}}/mediaplayer/mediaplayer.one.min.js" async="true"></script>

<!-- mermaid-js: create diagrams and visualizations using text and code -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/10.9.0/mermaid.min.js" crossorigin="anonymous" referrerpolicy="no-referrer" async="true"></script>
<script src="https://gcore.jsdelivr.net/npm/mermaid@10.9.1/dist/mermaid.min.js" crossorigin="anonymous" referrerpolicy="no-referrer" async="true"></script>

<!-- marked.js to parse markdown code into HTML -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/marked/12.0.2/marked.min.js" crossorigin="anonymous" referrerpolicy="no-referrer" async="true"></script>
Expand Down
4 changes: 2 additions & 2 deletions resources/app-templates/leocdp-admin/main-view.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<!-- Top User Menu -->
<ul class="nav navbar-right top-nav">
<li>
<a href="javascript: initLeoChatBot('global')" title="Leo Chatbot" data-container="body" data-toggle="popover" data-placement="bottom" data-content="Your personal AI assistant on the CDP" >
<i class="fa fa-commenting-o"></i> Leo Chatbot
<a href="javascript: initLeoChatBot('global')" title="AI Chatbot" data-container="body" data-toggle="popover" data-placement="bottom" data-content="Your personal AI assistant on the CDP" >
<i class="fa fa-commenting-o"></i> AI Chatbot
</a>
</li>
<li class="dropdown" style="min-width:168px!important;">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,6 @@ <h5 class="page-header" id="page_breadcrumb"></h5>
<div class="panel-body">
<textarea id="mermaidInput" cols="30" rows="10" style="display: none;">

flowchart
S_2a7hPxmTiyLYoTe1TTTkvU[Targeted Segment: hot_lead <img class="targetedSegmentIcon" src='https://cdn-icons-png.flaticon.com/128/4577/4577216.png' style="width:90px" />] --> C_isProfitableCustomer{Next Best Actions are <br><br> order-checkout, purchase}
C_isProfitableCustomer -->|Yes| A_personalizationForContents[ <img class="actionIcon" src="https://cdn-icons-png.flaticon.com/128/4413/4413780.png" /> Content Personalization <br> with Asset Group <br><br> Retail HCM Stores ]
C_isProfitableCustomer ---->|No| END[<img src="https://cdn-icons-png.flaticon.com/128/5277/5277603.png" />]
A_personalizationForContents --> C_isRightTimeToSend{"Is right time for activation ? <br><br> $Now.Date == 10/05/2024"}
C_isRightTimeToSend -->|Yes| A_sendEmail[Send Email <img class="actionIcon" src="https://cdn-icons-png.flaticon.com/128/3062/3062634.png" />]
C_isRightTimeToSend ---->|No| END[<img src="https://cdn-icons-png.flaticon.com/128/5277/5277603.png" />]

click S_2a7hPxmTiyLYoTe1TTTkvU href "javascript:automatedFlowNodeClick('S_2a7hPxmTiyLYoTe1TTTkvU');"
click C_isProfitableCustomer href "javascript:automatedFlowNodeClick('C_isProfitableCustomer');"

</textarea>
<div id="ma_flow_container">
<div id="mermaidOutput" </div>
Expand Down Expand Up @@ -120,19 +109,32 @@ <h5 class="page-header" id="page_breadcrumb"></h5>
top: 0;
text-align: center;
}
#mermaidOutput svg {
transform: scale(1)
}
#ma_flow_container {
height: calc(100% - 100px) !important;
min-height: 1400px !important;
position: relative;
}
#mermaidOutput img.targetedSegmentIcon {
width: 120px !important;
margin: 16px auto;
}
#mermaidOutput img.actionIcon {
width: 90px !important;
margin: 10px auto;
}
#mermaidOutput img.actionIcon {
width: 80px !important;
margin: 5px auto;
}
#mermaidOutput img.questionIcon {
width: 80px !important;
margin: 5px auto;
}
#mermaidOutput .nodeInfo {
margin-top: 8px;
color: red;
}


#mermaidOutput span.nodeLabel {
color: blue;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h4> <i class="fa fa-cogs" aria-hidden="true"></i> Automated Campaigns </h4>

<th>Updated at</th>
<th>Last run </th>
<th>Owner Name</th>
<th>Owner User Login</th>
<th>Actions</th>
</tr>
</thead>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ <h4 class="highlight_text" > <i class="fa fa-sticky-note-o" aria-hidden="true"><
<div class="tab-pane" id="panel_duplicate_profiles" >

<h4 class="highlight_text" > <i class="fa fa-list-ol" aria-hidden="true"></i> Top duplicate profiles
<button id="btn_profile_deduplicate" type="button" class="btn btn-sm btn-primary data-control-edit" title="Do data deduplication" style="float: right;" >
<button id="btn_profile_deduplicate" type="button" class="btn btn-sm btn-info data-control-edit" title="Do data deduplication" style="float: right;" >
<i class="fa fa-compress" aria-hidden="true"></i> Deduplicate
</button>
</h4>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h5 class="page-header" id="page_breadcrumb" > </h5>
<button type="button" class="btn btn-do-now" onclick="refreshAllProfiles()" title="Refresh Profile List" >
<i class="fa fa-refresh" aria-hidden="true"></i> Refresh
</button>
<button type="button" class="btn btn-success data-control-update" onclick="showMergeDuplicateProfileDialog()" title="Process all duplicated profiles into a single profile" >
<button type="button" class="btn btn-info data-control-update" onclick="showMergeDuplicateProfileDialog()" title="Process all duplicated profiles into a single profile" >
<i class="fa fa-compress" aria-hidden="true"></i> Deduplicate All
</button>
<button type="button" class="btn btn-import-data data-control-update" onclick="importProfileHandler()" title="Import Profile from uploaded CSV file" >
Expand Down

0 comments on commit 34a0360

Please sign in to comment.