Skip to content

Commit

Permalink
integrated undo/redo logic and bug-fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabriele Panico committed Oct 18, 2023
1 parent 2ffa4a9 commit 30e8b2d
Show file tree
Hide file tree
Showing 76 changed files with 2,508 additions and 2,416 deletions.
6 changes: 0 additions & 6 deletions .../cds-dashboard/cds-canvas/actions/list/cds-action-askgpt/cds-action-askgpt.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@
// gap: 10px;
}

.title-label {
color: white;
font-size: 14px;
margin-bottom: 6px;
}

.select-box {
margin-bottom: 24px;
}
Expand Down
183 changes: 30 additions & 153 deletions ...io/cds-dashboard/cds-canvas/actions/list/cds-action-askgpt/cds-action-askgpt.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { KnowledgeBaseService } from 'src/app/services/knowledge-base.service';
import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
import { AppConfigService } from 'src/app/services/app-config';
import { Subscription } from 'rxjs/internal/Subscription';

@Component({
selector: 'cds-action-askgpt',
Expand All @@ -32,7 +33,8 @@ export class CdsActionAskgptComponent implements OnInit {
isConnectedTrue: boolean = false;
isConnectedFalse: boolean = false;
connector: any;

private subscriptionChangedConnector: Subscription;

kbs_list = [];
kb_selected_id: string = null;
status_code: number;
Expand Down Expand Up @@ -60,11 +62,8 @@ export class CdsActionAskgptComponent implements OnInit {

ngOnInit(): void {
this.logger.debug("[ACTION-ASKGPT] action detail: ", this.action);
console.log("[ACTION-ASKGPT] action detail: ", this.action);
console.log("[ACTION-ASKGPT] action kbid: ", this.action.kbid);
console.log("[ACTION-ASKGPT] action kbname: ", this.action.kbName);

this.intentService.isChangedConnector$.subscribe((connector: any) => {
this.subscriptionChangedConnector = this.intentService.isChangedConnector$.subscribe((connector: any) => {
this.logger.debug('[ACTION-ASKGPT] isChangedConnector -->', connector);
this.connector = connector;
this.updateConnector();
Expand Down Expand Up @@ -92,6 +91,13 @@ export class CdsActionAskgptComponent implements OnInit {
}


/** */
ngOnDestroy() {
if (this.subscriptionChangedConnector) {
this.subscriptionChangedConnector.unsubscribe();
}
}

initializeConnector() {
this.idIntentSelected = this.intentSelected.intent_id;
this.idConnectorTrue = this.idIntentSelected+'/'+this.action._tdActionId + '/true';
Expand All @@ -114,7 +120,9 @@ export class CdsActionAskgptComponent implements OnInit {
this.action.falseIntent = null
this.isConnectedFalse = false;
}
this.updateAndSaveAction.emit();
// if(this.connector.notify)
if(this.connector.save)this.updateAndSaveAction.emit(this.connector);
// this.updateAndSaveAction.emit();
} else {
// TODO: verificare quale dei due connettori è stato aggiunto (controllare il valore della action corrispondente al true/false intent)
// ADD / EDIT
Expand All @@ -124,15 +132,19 @@ export class CdsActionAskgptComponent implements OnInit {
this.isConnectedTrue = true;
if(this.action.trueIntent !== '#'+this.connector.toId){
this.action.trueIntent = '#'+this.connector.toId;
this.updateAndSaveAction.emit();
// if(this.connector.notify)
if(this.connector.save)this.updateAndSaveAction.emit(this.connector);
// this.updateAndSaveAction.emit();
}
}
if(array[array.length -1] === 'false'){
// this.action.falseIntent = '#'+this.connector.toId;
this.isConnectedFalse = true;
if(this.action.falseIntent !== '#'+this.connector.toId){
this.action.falseIntent = '#'+this.connector.toId;
this.updateAndSaveAction.emit();
// if(this.connector.notify)
if(this.connector.save)this.updateAndSaveAction.emit(this.connector);
// this.updateAndSaveAction.emit();
}
}
}
Expand Down Expand Up @@ -213,17 +225,17 @@ export class CdsActionAskgptComponent implements OnInit {
onChangeBlockSelect(event:{name: string, value: string}, type: 'trueIntent' | 'falseIntent') {
if(event){
this.action[type]=event.value
}

switch(type){
case 'trueIntent':
this.onConnectorChange.emit({ type: 'create', fromId: this.idConnectorTrue, toId: this.action.trueIntent})
break;
case 'falseIntent':
this.onConnectorChange.emit({ type: 'create', fromId: this.idConnectorFalse, toId: this.action.falseIntent})
break;
switch(type){
case 'trueIntent':
this.onConnectorChange.emit({ type: 'create', fromId: this.idConnectorTrue, toId: this.action.trueIntent})
break;
case 'falseIntent':
this.onConnectorChange.emit({ type: 'create', fromId: this.idConnectorFalse, toId: this.action.falseIntent})
break;
}
this.updateAndSaveAction.emit();
}
this.updateAndSaveAction.emit();
}

onResetBlockSelect(event:{name: string, value: string}, type: 'trueIntent' | 'falseIntent') {
Expand Down Expand Up @@ -260,7 +272,7 @@ export class CdsActionAskgptComponent implements OnInit {
// }

goToKNB(){
let url = this.appConfigService.getConfig().dashboardBaseUrl + 'dashboard/#/project/' + this.project_id +'/knowledge-bases'
let url = this.appConfigService.getConfig().DASHBOARD_BASE_URL + 'dashboard/#/project/' + this.project_id +'/knowledge-bases'
window.open(url, '_blank')
}

Expand All @@ -271,139 +283,4 @@ export class CdsActionAskgptComponent implements OnInit {
}
}


// -----------------
// TO CHECK / DELETE
// -----------------


// getAllOpenaiKbs() {
// this.openaikbService.getAllOpenaikbs().subscribe((kbs: any[]) => {
// this.kbs_list = kbs.map(t => {
// t.icon = "language"
// return t;
// })
// if (this.action.kbid) {
// this.kb_selected_id = this.kbs_list.find(k => k.url === this.action.kbid)._id;
// this.kb_selected_name = this.kbs_list.find(k => k.url === this.action.kbid).name;
// //this.checkKbStatus(this.action.kbid);
// }
// //this.checkLimit();
// }, (error) => {
// this.logger.error("[ACTION ASKGPT] ERROR get openai kbs: ", error);
// }, () => {
// this.logger.info("[ACTION ASKGPT] get openai kbs *COMPLETED*");
// })
// }

// openAddKbDialog() {
// const dialogRef = this.dialog.open(AddkbDialogComponent, {
// panelClass: 'custom-dialog-container',
// data: { name: '', url: '' }
// });
// dialogRef.afterClosed().subscribe(result => {
// this.logger.info("[ACTION ASKGPT] Dialog result - new openai kb: ", result);
// if (result && result.name && result.url) {
// this.saveOpenaiKb(result);
// }
// });
// }

// saveOpenaiKb(new_kb) {
// this.openaikbService.addOpenaiKb(new_kb).subscribe((savedKb) => {
// this.getAllOpenaiKbs();
// }, (error) => {
// this.logger.error("[ACTION ASKGPT] ERROR add new kb: ", error);
// }, () => {
// this.logger.info("[ACTION ASKGPT] add new kb *COMPLETED*");
// })
// }

// onDeleteSelect(id) {
// this.openDeleteDialog(id);
// }

// openDeleteDialog(id) {
// const dialogRef = this.dialog.open(DialogYesNoComponent, {
// panelClass: 'custom-dialog-container',
// data: { title: 'Delete Knowledge base', text: 'Are you sure you want to delete permanently this Knwoledge base?', yes: 'Delete', no: 'Cancel' }
// })
// dialogRef.afterClosed().subscribe(result => {
// if (result && result !== undefined && result !== false) {
// this.deleteKb(id);
// }
// })
// }

// deleteKb(id: string) {
// if (this.kb_selected_id === id) {
// this.action.kbid = null;
// this.kb_selected_id = null;
// this.status_code = null;
// }
// this.openaikbService.deleteOpenaiKb(id).subscribe((deletedKb) => {
// this.logger.info("deletedKb response ", deletedKb);
// this.logger.log("deletedKb response ", deletedKb);
// this.getAllOpenaiKbs();
// }, (error) => {
// this.logger.error("[ACTION ASKGPT] ERROR delete kb: ", error);
// }, () => {
// this.logger.info("[ACTION ASKGPT] delete kb *COMPLETE*");
// })
// }

// checkKbStatus(kbid) {
// let data = {
// full_url: kbid
// }
// this.gptService.checkScrapingStatus(data).subscribe((status: any) => {
// this.spinner = false;
// this.logger.log("[ACTION ASKGPT] Scraping status: ", status);
// this.status_code = status.status_code;;
// }, (error) => {
// this.logger.error("[ACTION ASKGPT] error getting scraping status: ", error);
// }, () => {
// this.logger.log("[ACTION ASKGPT] get scraping status *COMPLETE*")
// })
// }

// startKbIndexing() {

// this.spinner = true;
// if (!this.action.gptkey) {
// this.indexing_hint = "Missing GPT Key"
// this.spinner = false;
// } else {
// let data = {
// full_url: this.action.kbid,
// gptkey: this.action.gptkey
// }

// this.gptService.startScraping(data).subscribe((response: any) => {
// if (response.message === 'Invalid Openai API key') {
// this.indexing_hint = response.message;
// }
// this.checkKbStatus(this.action.kbid);
// }, (error) => {
// this.logger.error("[ACTION ASKGPT] error start indexing: ", error);
// this.indexing_hint = error.message;
// this.spinner = false;
// }, () => {
// this.logger.log("[ACTION ASKGPT] start indexing *COMPLETE*");
// })
// }
// }

// checkLimit() {
// if (this.kbs_list.length >= 3) {
// this.buttonDisabled = true;
// this.buttonIcon = null;
// this.buttonText = "Maximum number of Knwoledge Bases reached"
// } else {
// this.buttonDisabled = false;
// this.buttonIcon = "add";
// this.buttonText = "Add Knowledge Bases"
// }
// }

}
6 changes: 0 additions & 6 deletions ...-canvas/actions/list/cds-action-assign-function/cds-action-assign-function.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@
gap: 10px;
}

.title-label {
color: white;
font-size: 18px;
margin-bottom: 0px;

}

.material-icons{
color: $icon-color;
Expand Down
25 changes: 3 additions & 22 deletions ...-canvas/actions/list/cds-action-assign-variable/cds-action-assign-variable.component.scss
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
@import "./src/assets/sass/cds/_variables.scss";

.content-action {
margin-top: 10px;
height: 50px;
// float: left;
width: calc(100% - 250px);
}

.content {
padding: 20px 0 30px 0;
margin-left: 30px;
margin-right: 30px;
}

.text-editor-wrapper {
font-size: $font-size-base;
Expand All @@ -28,19 +16,12 @@
flex-direction: column;
// width: 70%;
min-width: 90px;
gap: 10px;
}

.title-label {
color: white;
font-size: 18px;
margin-bottom: 0px;

gap: 5px;
}

.material-icons {
color: $icon-color;
font-size: 18px;
color: $blu;
font-size: 16px;
}

div.value-wrp {
Expand Down
1 change: 0 additions & 1 deletion ...ds-canvas/actions/list/cds-action-assign-variable/cds-action-assign-variable.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export class CdsActionAssignVariableComponent implements OnInit, OnChanges {
TYPE_MATH_OPERATOR_LIST = TYPE_MATH_OPERATOR_LIST

private logger: LoggerService = LoggerInstance.getInstance();

constructor() { }

ngOnInit(): void {
Expand Down
18 changes: 15 additions & 3 deletions ...shboard/cds-canvas/actions/list/cds-action-assign-variable/operand/operand.component.scss
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
@import "./src/assets/sass/cds/_variables.scss";

:host{
--icon-color: #{$blu};
--textColor: #{$blu};
--backGroundColor: #{$blu-light-04};
--hoverBackgroundColor: #{$blu-light-03};

--content-background: rgb(244, 246, 251, 0.4);
--border-radius-base: 8px

}

div.operand-wrp {
display: grid;
align-items: center;
grid-template-columns: 11fr 1fr;
grid-column-gap: 0px;
grid-row-gap: 10px;
background: rgb(66,85,117);
background-color: var(--content-background);
border: 1px solid $gray-light-02;
padding: 10px 10px 20px;
border-radius: 5px;
border-radius: 4px;
&.opened {
.select-function{
display:block;
Expand All @@ -20,7 +32,7 @@ div.operand-wrp {

.material-icons {
font-size: 25px;
color: #8ab4f8;
color: var(--icon-color);
display: flex;
justify-content: center;
align-items: center;
Expand Down
Loading

0 comments on commit 30e8b2d

Please sign in to comment.