Skip to content

Commit

Permalink
Merge commit '48e9226f40067f777cc0299ede2d4e0210db50dc'
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabriele Panico committed Nov 8, 2023
2 parents 03a66fc + 48e9226 commit d508e6e
Show file tree
Hide file tree
Showing 8 changed files with 213 additions and 167 deletions.
2 changes: 1 addition & 1 deletion .../cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>


<div *ngIf="isStart" class="previewContent">
<div *ngIf="isStart" class="previewContent isStart">
<cds-connector class="connector"
[idConnector] = "idConnector"
[isConnected] = "isConnected">
Expand Down
10 changes: 10 additions & 0 deletions .../cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
justify-content: flex-end;
gap: 5px;
padding: 5px 10px;

top: calc(50% - 14px);

.connector {
position: absolute;
right: -12px;
Expand All @@ -30,6 +33,13 @@
top: calc(50% - 10px);
}
}
&.isStart{
.connector {
position: absolute;
right: -12px;
top: calc(50% - 13px);
}
}

.title-label{
color: #6c6859;
Expand Down
1 change: 1 addition & 0 deletions src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-canvas.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ export class CdsCanvasComponent implements OnInit {
delete connector['created'];
this.connectorService.deleteConnectorToList(connector.id);
this.intentService.onChangedConnector(connector);
this.IS_OPEN_PANEL_CONNECTOR_MENU = false;
},
true
);
Expand Down
305 changes: 154 additions & 151 deletions src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,161 +88,164 @@
'cds-no-featured-action': action._tdActionType !== TYPE_ACTION.REPLY,
'cds-last-action': last
}"
[class.isLast]="action.__isLast"
(keydown)="onKeydown($event)"
(click)="onSelectAction(action, i, action._tdActionId)">
<!-- [ngClass]="{'hide-drag-action-palceholder': hideActionDragPlaceholder}" -->
<!-- [ngStyle]="{'opacity':hideActionDragPlaceholder === true ? '1' : '0' }" -->

<div class="action-drag-placeholder" *cdkDragPlaceholder></div>

<cds-action-description
class="header-action"
cdkDragHandle
[elementType]="action._tdActionType">
</cds-action-description>

<div cdkDragDisabled class="body-action" [ngSwitch]="action._tdActionType">

<cds-action-controls
(onClickControl)="onClickControl($event, action, i)">
</cds-action-controls>


<cds-action-reply *ngSwitchCase="TYPE_ACTION.REPLY"
class="panel-response"
[intentSelected]="intent"
[connector]="connector"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-reply>

<cds-action-reply *ngSwitchCase="TYPE_ACTION.RANDOM_REPLY"
class="panel-response"
[intentSelected]="intent"
[connector]="connector"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-reply>

<cds-action-intent *ngSwitchCase="TYPE_ACTION.INTENT"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-intent>

<cds-action-email *ngSwitchCase="TYPE_ACTION.EMAIL"
class="panel-response"
[action]="action">
</cds-action-email>

<cds-action-online-agents *ngSwitchCase="TYPE_ACTION.ONLINE_AGENTS"
class="panel-response"
[connectorChanged]="connectorChanged"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-online-agents>

<cds-action-open-hours *ngSwitchCase="TYPE_ACTION.OPEN_HOURS"
class="panel-response"
[connectorChanged]="connectorChanged"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-open-hours>

<cds-action-agent *ngSwitchCase="TYPE_ACTION.AGENT"
class="panel-response"
[action]="action">
</cds-action-agent>

<cds-action-wait *ngSwitchCase="TYPE_ACTION.WAIT"
class="panel-response"
[action]="action">
</cds-action-wait>

<cds-action-change-department *ngSwitchCase="TYPE_ACTION.CHANGE_DEPARTMENT"
class="panel-response"
[action]="action">
</cds-action-change-department>

<cds-action-close *ngSwitchCase="TYPE_ACTION.CLOSE"
[action]="action">
</cds-action-close>

<cds-action-json-condition *ngSwitchCase="TYPE_ACTION.JSON_CONDITION"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-json-condition>

<cds-action-replace-bot *ngSwitchCase="TYPE_ACTION.REPLACE_BOT"
class="panel-response"
[action]="action">
</cds-action-replace-bot>

<cds-action-assign-variable *ngSwitchCase="TYPE_ACTION.ASSIGN_VARIABLE"
class="panel-response"
[action]="action">
</cds-action-assign-variable>

<cds-action-delete-variable *ngSwitchCase="TYPE_ACTION.DELETE_VARIABLE"
class="panel-response"
[action]="action">
</cds-action-delete-variable>

<cds-action-hide-message *ngSwitchCase="TYPE_ACTION.HIDE_MESSAGE"
class="panel-response"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-hide-message>

<cds-action-web-request *ngSwitchCase="TYPE_ACTION.WEB_REQUEST"
class="panel-response"
[action]="action">
</cds-action-web-request>

<cds-action-web-request-v2 *ngSwitchCase="TYPE_ACTION.WEB_REQUESTV2"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-web-request-v2>

<cds-action-whatsapp-attribute *ngSwitchCase="TYPE_ACTION.WHATSAPP_ATTRIBUTE"
class="panel-response"
[action]="action">
</cds-action-whatsapp-attribute>

<cds-action-whatsapp-static *ngSwitchCase="TYPE_ACTION.WHATSAPP_STATIC"
class="panel-response"
[action]="action">
</cds-action-whatsapp-static>

<cds-action-askgpt *ngSwitchCase="TYPE_ACTION.ASKGPT"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-askgpt>

<cds-action-gpt-task *ngSwitchCase="TYPE_ACTION.GPT_TASK"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onSaveIntent($event)">
</cds-action-gpt-task>

<cds-action-capture-user-reply *ngSwitchCase="TYPE_ACTION.CAPTURE_USER_REPLY"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-capture-user-reply>

</div>
<span *ngIf="!action.__isLast" class="action-element">
<div class="action-drag-placeholder" *cdkDragPlaceholder></div>

<cds-action-description
class="header-action"
cdkDragHandle
[elementType]="action._tdActionType">
</cds-action-description>

<div cdkDragDisabled class="body-action" [ngSwitch]="action._tdActionType">

<cds-action-controls
(onClickControl)="onClickControl($event, action, i)">
</cds-action-controls>


<cds-action-reply *ngSwitchCase="TYPE_ACTION.REPLY"
class="panel-response"
[intentSelected]="intent"
[connector]="connector"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-reply>

<cds-action-reply *ngSwitchCase="TYPE_ACTION.RANDOM_REPLY"
class="panel-response"
[intentSelected]="intent"
[connector]="connector"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-reply>

<cds-action-intent *ngSwitchCase="TYPE_ACTION.INTENT"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-intent>

<cds-action-email *ngSwitchCase="TYPE_ACTION.EMAIL"
class="panel-response"
[action]="action">
</cds-action-email>

<cds-action-online-agents *ngSwitchCase="TYPE_ACTION.ONLINE_AGENTS"
class="panel-response"
[connectorChanged]="connectorChanged"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-online-agents>

<cds-action-open-hours *ngSwitchCase="TYPE_ACTION.OPEN_HOURS"
class="panel-response"
[connectorChanged]="connectorChanged"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-open-hours>

<cds-action-agent *ngSwitchCase="TYPE_ACTION.AGENT"
class="panel-response"
[action]="action">
</cds-action-agent>

<cds-action-wait *ngSwitchCase="TYPE_ACTION.WAIT"
class="panel-response"
[action]="action">
</cds-action-wait>

<cds-action-change-department *ngSwitchCase="TYPE_ACTION.CHANGE_DEPARTMENT"
class="panel-response"
[action]="action">
</cds-action-change-department>

<cds-action-close *ngSwitchCase="TYPE_ACTION.CLOSE"
[action]="action">
</cds-action-close>

<cds-action-json-condition *ngSwitchCase="TYPE_ACTION.JSON_CONDITION"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-json-condition>

<cds-action-replace-bot *ngSwitchCase="TYPE_ACTION.REPLACE_BOT"
class="panel-response"
[action]="action">
</cds-action-replace-bot>

<cds-action-assign-variable *ngSwitchCase="TYPE_ACTION.ASSIGN_VARIABLE"
class="panel-response"
[action]="action">
</cds-action-assign-variable>

<cds-action-delete-variable *ngSwitchCase="TYPE_ACTION.DELETE_VARIABLE"
class="panel-response"
[action]="action">
</cds-action-delete-variable>

<cds-action-hide-message *ngSwitchCase="TYPE_ACTION.HIDE_MESSAGE"
class="panel-response"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-hide-message>

<cds-action-web-request *ngSwitchCase="TYPE_ACTION.WEB_REQUEST"
class="panel-response"
[action]="action">
</cds-action-web-request>

<cds-action-web-request-v2 *ngSwitchCase="TYPE_ACTION.WEB_REQUESTV2"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-web-request-v2>

<cds-action-whatsapp-attribute *ngSwitchCase="TYPE_ACTION.WHATSAPP_ATTRIBUTE"
class="panel-response"
[action]="action">
</cds-action-whatsapp-attribute>

<cds-action-whatsapp-static *ngSwitchCase="TYPE_ACTION.WHATSAPP_STATIC"
class="panel-response"
[action]="action">
</cds-action-whatsapp-static>

<cds-action-askgpt *ngSwitchCase="TYPE_ACTION.ASKGPT"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-askgpt>

<cds-action-gpt-task *ngSwitchCase="TYPE_ACTION.GPT_TASK"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onSaveIntent($event)">
</cds-action-gpt-task>

<cds-action-capture-user-reply *ngSwitchCase="TYPE_ACTION.CAPTURE_USER_REPLY"
class="panel-response"
[intentSelected]="intent"
[action]="action"
(updateAndSaveAction)="onUpdateAndSaveAction($event)">
</cds-action-capture-user-reply>

</div>
</span>


<!-- [ngStyle]="{'display':isDragging === false ? 'block' : 'none' }" -->
<cds-action-arrow id="action-arrow-{{i}}" *ngIf="!last" class="cds-action-arrow">
Expand Down
15 changes: 14 additions & 1 deletion src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@
}



.action-intent {
padding: 0 12px 0 0;
margin: 7px 0 -4px 0;
display: block;
}

.action-element{
width: 100%;
}


.panel-intent-content {
transition: background-color 0.15s ease 0s;
width: 264px;
Expand Down Expand Up @@ -278,7 +284,11 @@
border-radius: var(--base-border-radius-preview);
border: 2px solid rgb(255, 255, 255);
// padding: 0 10px 10px 10px;
background-color: var(--action-background)
background-color: var(--action-background);
&.isLast{
// height: 1px!important;
display: none;
}
}

/* Drag placeholder
Expand Down Expand Up @@ -381,6 +391,9 @@
// border-radius: 6px;
// background-color: rgb(255 255 255 / 50%);
// box-shadow: rgba(0, 0, 0, 0.06) 0px 0px 0px 1px;
&.isLast{
display: none;
}
}

.icon-action {
Expand Down
Loading

0 comments on commit d508e6e

Please sign in to comment.