Skip to content

Commit 42c8e46

Browse files
durgatechvardurgatechvar
committed
eslint fix
2 parents db4621a + a112d6f commit 42c8e46

16 files changed

Lines changed: 220 additions & 227 deletions

File tree

‎src/components.d.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export namespace Components {
7979

8080
onSort?: (key: string) => Promise<void>;
8181
onFilter?: (column) => Promise<void>;
82-
onRowClick?: (id: string | number, key: string, value: any) => Promise<void>;
82+
onRowClick?: (rowId: string | number, columnId: string | number, key: string, value: any) => Promise<void>;
8383
customColumnComponent?: (name: string) => any;
8484
customRowComponent?: (value: any) => any;
8585

@@ -309,7 +309,7 @@ export namespace Components {
309309
}
310310
interface SaveQueryModal {
311311
"deleteQueryData": (deleteId: number) => void;
312-
"queryDataFetcher": () => void;
312+
"queryDataFetcher": () => Promise<void>;
313313
}
314314
interface SideBar {
315315
"permissions": string;
@@ -872,7 +872,7 @@ declare namespace LocalJSX {
872872

873873
onSort?: (key: string) => Promise<void>;
874874
onFilter?: (column) => Promise<void>;
875-
onRowClick?: (id: string | number, key: string, value: any) => Promise<void>;
875+
onRowClick?: (rowId: string | number, columnId: string | number, key: string, value: any) => Promise<void>;
876876
customColumnComponent?: (name: string) => any;
877877
customRowComponent?: (value: any) => any;
878878

@@ -1102,7 +1102,7 @@ declare namespace LocalJSX {
11021102
}
11031103
interface SaveQueryModal {
11041104
"deleteQueryData"?: (deleteId: number) => void;
1105-
"queryDataFetcher"?: () => void;
1105+
"queryDataFetcher"?: () => Promise<void>;
11061106
}
11071107
interface SideBar {
11081108
"permissions"?: string;

‎src/components/common/buttons/icon-button-basic/readme.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
- [editor-page](../../../editorPage/editor-page)
3131
- [insert-node-modal](../../../editorPage/insert-node-modal)
3232
- [save-query-modal](../../../editorPage/save-query-modal)
33-
- [side-bar](../../../settingsPage/side-bar)
3433

3534
### Graph
3635
```mermaid
@@ -40,7 +39,6 @@ graph TD;
4039
editor-page --> icon-button-basic
4140
insert-node-modal --> icon-button-basic
4241
save-query-modal --> icon-button-basic
43-
side-bar --> icon-button-basic
4442
style icon-button-basic fill:#f9f,stroke:#333,stroke-width:4px
4543
```
4644

‎src/components/common/items/data-table/data-table.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type TColumn = {
3434

3535
onSort?: (id: number | string, name: string) => Promise<void>;
3636
onFilter?: (column: TColumn) => Promise<void>;
37-
onRowClick?: (id: string | number, key: string, value: any) => Promise<void>;
37+
onRowClick?: (rowId: string | number, columnId: string | number, key: string, value: any) => Promise<void>;
3838
customColumnComponent?: (name: string) => any;
3939
customRowComponent?: (value: any) => any;
4040

@@ -78,7 +78,7 @@ export class DataTable {
7878

7979
onSort?: (key: string) => Promise<void>;
8080
onFilter?: (column) => Promise<void>;
81-
onRowClick?: (id: string | number, key: string, value: any) => Promise<void>;
81+
onRowClick?: (rowId: string | number, columnId: string | number, key: string, value: any) => Promise<void>;
8282
customColumnComponent?: (name: string) => any;
8383
customRowComponent?: (value: any) => any;
8484

@@ -327,7 +327,7 @@ export class DataTable {
327327
class={`py-3 whitespace-nowrap text-sm text-gray-900 ${column.customStyle?.cellClass}`}
328328
style={{ cursor: column.onRowClick ? 'pointer' : 'auto', ...(column.customStyle?.cellStyle || {}) }}
329329
onClick={() => {
330-
return column.onRowClick ? column.onRowClick(column.id, keyName, fieldValue) : null;
330+
return column.onRowClick ? column.onRowClick(rowId, column.id, keyName, fieldValue) : null;
331331
}}
332332
>
333333
{column.customRowComponent ? column.customRowComponent(fieldValue) : this.formatData(fieldValue, column)}

‎src/components/common/items/data-table/readme.md‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
# data-table
22

3-
4-
53
<!-- Auto Generated Below -->
64

7-
85
## Properties
96

107
| Property | Attribute | Description | Type | Default |
@@ -25,29 +22,31 @@
2522
| `supportedLimit` | -- | | `number[]` | `[]` |
2623
| `total` | `total` | | `number` | `0` |
2724

28-
2925
## Dependencies
3026

3127
### Used by
3228

33-
- [editor-res](../../../editorPage/editor-res)
34-
- [last-logs](../../../userProfilePage/last-logs)
35-
- [permission-table](../../../userProfilePage/permission-table)
29+
- [editor-res](../../../editorPage/editor-res)
30+
- [last-logs](../../../userProfilePage/last-logs)
31+
- [permission-table](../../../userProfilePage/permission-table)
32+
- [save-query-modal](../../../editorPage/save-query-modal)
3633

3734
### Depends on
3835

3936
- [plain-button](../../plain-button)
4037

4138
### Graph
39+
4240
```mermaid
4341
graph TD;
4442
data-table --> plain-button
4543
editor-res --> data-table
4644
last-logs --> data-table
4745
permission-table --> data-table
46+
save-query-modal --> data-table
4847
style data-table fill:#f9f,stroke:#333,stroke-width:4px
4948
```
5049

51-
----------------------------------------------
50+
---
5251

53-
*Built with [StencilJS](https://stenciljs.com/)*
52+
_Built with [StencilJS](https://stenciljs.com/)_

‎src/components/editorPage/code-editor/code-editor.tsx‎

Lines changed: 29 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,14 @@
11
import { Component, h, Element, State, Prop, Host } from '@stencil/core';
22
import { EditorState } from '@codemirror/basic-setup';
3-
import { Compartment } from '@codemirror/state';
3+
44
import { EditorView, keymap } from '@codemirror/view';
55
import { java } from '@codemirror/lang-java';
66
import { json } from '@codemirror/lang-json';
77
import Swal from 'sweetalert2';
88
import state from '../store';
99
import { customSetup } from '../../customSetup';
10+
import axios from 'axios';
1011

11-
let myTheme = EditorView.theme(
12-
{
13-
'&': {
14-
color: 'white',
15-
backgroundColor: '#034',
16-
},
17-
'.cm-content': {
18-
caretColor: '#0e9',
19-
},
20-
'&.cm-focused .cm-cursor': {
21-
borderLeftColor: '#0e9',
22-
},
23-
'&.cm-focused .cm-selectionBackground, ::selection': {
24-
backgroundColor: '#074',
25-
},
26-
'.cm-gutters': {
27-
backgroundColor: '#045',
28-
color: '#ddd',
29-
border: 'none',
30-
},
31-
},
32-
{ dark: true },
33-
);
34-
35-
const themeConfig = new Compartment();
3612
const TAB_LIST = [
3713
{ name: 'Query', className: 'editor' },
3814
{ name: 'Parameter', className: 'parameter' },
@@ -69,10 +45,6 @@ export class CodeEditor {
6945
}),
7046
];
7147
const parameterExtensions = [customSetup, json(), this.onCtrlShiftEnter()];
72-
if (localStorage.getItem('themesArray') === 'dark') {
73-
editorExtensions.push(themeConfig.of([myTheme]));
74-
parameterExtensions.push(themeConfig.of([myTheme]));
75-
}
7648
state.stateQuery = EditorState.create({
7749
doc: state.query,
7850
extensions: editorExtensions,
@@ -115,105 +87,40 @@ export class CodeEditor {
11587
},
11688
]);
11789
}
118-
saveQueryHandler() {
119-
const dbName: string = 'neptuneQueryDB';
120-
const dbVersion: number = 1;
121-
122-
const request: IDBOpenDBRequest = indexedDB.open(dbName, dbVersion);
123-
124-
request.onerror = function (event: Event): void {
125-
console.log('Database error: ' + (event.target as any).errorCode);
126-
};
127-
128-
request.onupgradeneeded = function (event: IDBVersionChangeEvent): void {
129-
const db: IDBDatabase = (event.target as any).result;
130-
const objectStore: IDBObjectStore = db.createObjectStore('savedQueries', { keyPath: 'id', autoIncrement: true });
131-
objectStore.createIndex('id', 'id', { unique: false });
132-
};
13390

134-
request.onsuccess = function (event: Event): void {
135-
const db: IDBDatabase = (event.target as any).result;
136-
137-
// Add data to the database
138-
const transaction: IDBTransaction = db.transaction(['savedQueries'], 'readwrite');
139-
const objectStore: IDBObjectStore = transaction.objectStore('savedQueries');
140-
141-
const data: any = { title: state.saveTitle, query: state.query, parameter: state.queryParameter };
142-
state.saveTitle = '';
143-
const addRequest: IDBRequest = objectStore.add(data);
144-
addRequest.onerror = function (event: Event): void {
145-
console.log('Error adding data: ' + (event.target as any).errorCode);
146-
};
147-
148-
addRequest.onsuccess = function (): void {
149-
console.log('Data added successfully');
150-
};
151-
};
152-
this.isSaveModalOpen = false;
91+
async retriveQueryData() {
92+
try {
93+
const res = await axios.get("/api/editor/saved-queries");
94+
state.queryHistory = res.data;
95+
} catch (error) {
96+
console.log(error);
97+
}
15398
}
154-
retriveQueryData() {
155-
const dbName: string = 'neptuneQueryDB';
156-
const dbVersion: number = 1;
15799

158-
const request: IDBOpenDBRequest = indexedDB.open(dbName, dbVersion);
159-
160-
request.onerror = function (event: Event): void {
161-
console.log('Database error: ' + (event.target as any).errorCode);
162-
};
163-
164-
request.onupgradeneeded = function (event: IDBVersionChangeEvent): void {
165-
const db: IDBDatabase = (event.target as any).result;
166-
const objectStore: IDBObjectStore = db.createObjectStore('savedQueries', { keyPath: 'id', autoIncrement: true });
167-
objectStore.createIndex('id', 'id', { unique: false });
168-
};
169-
170-
request.onsuccess = function (event: Event): void {
171-
const db: IDBDatabase = (event.target as any).result;
172-
// Retrieve data from the database
173-
const transaction2: IDBTransaction = db.transaction(['savedQueries'], 'readonly');
174-
const objectStore2: IDBObjectStore = transaction2.objectStore('savedQueries');
175-
const index: IDBIndex = objectStore2.index('id');
176-
const getRequest: IDBRequest = index.getAll();
177-
getRequest.onerror = function (event: Event): void {
178-
console.log('Error retrieving data: ' + (event.target as any).errorCode);
179-
};
100+
async saveQueryHandler() {
101+
try {
102+
let transactionQuery = state.viewQuery.state.update();
103+
const query = transactionQuery.state.doc.toString().trim();
104+
let transactionParameter = state.viewParameter.state.update();
105+
const parameters = transactionParameter.state.doc.toString().trim();
106+
const data: any = { queryTitle: state.saveTitle, queryText: query, queryParameter: parameters };
107+
state.saveTitle = '';
108+
await axios.post(`/api/editor/saved-queries`, data);
109+
this.retriveQueryData();
110+
} catch (error) {
111+
console.log(error);
180112

181-
getRequest.onsuccess = function (event: Event): void {
182-
state.queryHistory = (event.target as any).result;
183-
};
184-
};
113+
}
185114
}
186-
deleteQueryData(deleteId: number) {
187-
const dbName: string = 'neptuneQueryDB';
188-
const dbVersion: number = 1;
189115

190-
const request: IDBOpenDBRequest = indexedDB.open(dbName, dbVersion);
191-
192-
request.onerror = function (event: Event): void {
193-
console.log('Database error: ' + (event.target as any).errorCode);
194-
};
195-
196-
request.onupgradeneeded = function (event: IDBVersionChangeEvent): void {
197-
const db: IDBDatabase = (event.target as any).result;
198-
const objectStore: IDBObjectStore = db.createObjectStore('savedQueries', { keyPath: 'id', autoIncrement: true });
199-
objectStore.createIndex('id', 'id', { unique: false });
200-
};
201-
202-
request.onsuccess = function (event: Event): void {
203-
const db: IDBDatabase = (event.target as any).result;
204-
// Delete data from the database
205-
const transaction2: IDBTransaction = db.transaction(['savedQueries'], 'readwrite');
206-
const objectStore2: IDBObjectStore = transaction2.objectStore('savedQueries');
207-
208-
const deleteRequest: IDBRequest = objectStore2.delete(deleteId);
209-
deleteRequest.onerror = function (event: Event): void {
210-
console.log('Error deleting data: ' + (event.target as any).errorCode);
211-
};
116+
async deleteQueryData(deleteId: number) {
117+
try {
118+
const res = await axios.delete(`/api/editor/saved-queries/${deleteId}`);
119+
return res
120+
} catch (error) {
121+
console.log(error);
212122

213-
deleteRequest.onsuccess = function (): void {
214-
console.log('Data deleted successfully');
215-
};
216-
};
123+
}
217124
}
218125
saveSubmitHandler() {
219126
try {

‎src/components/editorPage/code-editor/readme.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ graph TD;
4242
code-editor --> text-field
4343
code-editor --> loader-component
4444
save-query-modal --> icon-button-basic
45+
save-query-modal --> data-table
4546
save-query-modal --> icon-label-submit-button
47+
data-table --> plain-button
4648
insert-node-modal --> icon-button-basic
4749
insert-node-modal --> custom-drop-down
4850
insert-node-modal --> basic-dropdown

‎src/components/editorPage/editor-page/readme.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ graph TD;
3939
code-editor --> text-field
4040
code-editor --> loader-component
4141
save-query-modal --> icon-button-basic
42+
save-query-modal --> data-table
4243
save-query-modal --> icon-label-submit-button
44+
data-table --> plain-button
4345
insert-node-modal --> icon-button-basic
4446
insert-node-modal --> custom-drop-down
4547
insert-node-modal --> basic-dropdown
@@ -58,7 +60,6 @@ graph TD;
5860
edit-table-modal --> icon-label-submit-button
5961
table-search-modal-form --> radio-button-multiple
6062
table-search-modal-form --> icon-label-submit-button
61-
data-table --> plain-button
6263
style editor-page fill:#f9f,stroke:#333,stroke-width:4px
6364
```
6465

‎src/components/editorPage/save-query-modal/readme.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| Property | Attribute | Description | Type | Default |
1111
| ------------------ | --------- | ----------- | ---------------------------- | ----------- |
1212
| `deleteQueryData` | -- | | `(deleteId: number) => void` | `undefined` |
13-
| `queryDataFetcher` | -- | | `() => void` | `undefined` |
13+
| `queryDataFetcher` | -- | | `() => Promise<void>` | `undefined` |
1414

1515

1616
## Dependencies
@@ -22,13 +22,16 @@
2222
### Depends on
2323

2424
- [icon-button-basic](../../common/buttons/icon-button-basic)
25+
- [data-table](../../common/items/data-table)
2526
- [icon-label-submit-button](../../common/buttons/icon-label-submit-button)
2627

2728
### Graph
2829
```mermaid
2930
graph TD;
3031
save-query-modal --> icon-button-basic
32+
save-query-modal --> data-table
3133
save-query-modal --> icon-label-submit-button
34+
data-table --> plain-button
3235
code-editor --> save-query-modal
3336
style save-query-modal fill:#f9f,stroke:#333,stroke-width:4px
3437
```

0 commit comments

Comments
 (0)