Skip to content

Fix Agroal Dev UI table switching and move SQL input to the top #46762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2025
Merged

Fix Agroal Dev UI table switching and move SQL input to the top #46762

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 43 additions & 10 deletions extensions/agroal/deployment/src/main/resources/dev-ui/qwc-agroal-datasource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,26 @@ export class QwcAgroalDatasource extends QwcHotReloadElement {
display: flex;
justify-content: space-between;
gap: 10px;
align-items: center;
padding-bottom: 20px;
border-bottom-style: dotted;
border-bottom-color: var(--lumo-contrast-10pct);
}

.sqlInput .cm-content {
padding: 5px 0;
}

.font-large {
font-size: var(--lumo-font-size-l);
}

.cursor-text {
cursor: text;
}

.no-margin {
margin: 0;
}

#sql {
Expand Down Expand Up @@ -388,14 +408,14 @@ export class QwcAgroalDatasource extends QwcHotReloadElement {
_renderTableData(){
if(this._selectedTable && this._currentDataSet && this._currentDataSet.cols){
return html`<div class="data">
${this._renderSqlInput()}
<vaadin-grid .items="${this._currentDataSet.data}" theme="row-stripes no-border" class="fill" column-reordering-allowed>
${this._currentDataSet.cols.map((col) =>
this._renderTableHeader(col)
)}
<span slot="empty-state">No data.</span>
</vaadin-grid>
${this._renderPager()}
${this._renderSqlInput()}
</div>
`;
}else if(this._displaymessage){
Expand Down Expand Up @@ -457,15 +477,26 @@ export class QwcAgroalDatasource extends QwcHotReloadElement {
<vaadin-icon icon="font-awesome-solid:circle-chevron-right"></vaadin-icon>
</vaadin-button>`;
}

_renderSqlInput(){
if(this._allowSql){
return html`<div class="sqlInput">
<qui-code-block @shiftEnter=${this._shiftEnterPressed} content="${this._currentSQL}" id="sql" mode="sql" theme="dark" value='${this._currentSQL}' editable></qui-code-block>
<vaadin-icon class="sqlInputButton" title="Clear" icon="font-awesome-solid:broom" @click=${this._clearSqlInput}></vaadin-icon>
<vaadin-icon class="sqlInputButton" title="Run" icon="font-awesome-solid:person-running" @click=${this._executeClicked}></vaadin-icon>
</div>`;
}else {

_renderSqlInput() {
if (this._allowSql) {
return html`
<div class="sqlInput">
<qui-code-block @shiftEnter=${this._shiftEnterPressed} content="${this._currentSQL}"
class="font-large cursor-text" id="sql" mode="sql" theme="dark"
value='${this._currentSQL}' editable></qui-code-block>
<vaadin-button class="no-margin" slot="suffix" theme="icon" aria-label="Clear">
<vaadin-tooltip .hoverDelay=${500} slot="tooltip" text="Clear"></vaadin-tooltip>
<vaadin-icon class="small-icon" @click=${this._clearSqlInput}
icon="font-awesome-solid:trash"></vaadin-icon>
</vaadin-button>
<vaadin-button class="no-margin" slot="suffix" theme="icon" aria-label="Run">
<vaadin-tooltip .hoverDelay=${500} slot="tooltip" text="Run"></vaadin-tooltip>
<vaadin-icon class="small-icon" @click=${this._executeClicked}
icon="font-awesome-solid:play"></vaadin-icon>
</vaadin-button>
</div>`;
} else {
return html`<vaadin-button theme="small" @click="${this._handleAllowSqlChange}">Allow any SQL execution from here</vaadin-button>`;
}
}
Expand Down Expand Up @@ -575,6 +606,8 @@ export class QwcAgroalDatasource extends QwcHotReloadElement {

_executeCurrentSQL(){
if(this._currentSQL){
this._currentDataSet = null; // indicates loading

this.jsonRpc.executeSQL({
datasource:this._selectedDataSource.name,
sql:this._currentSQL,
Expand Down
Loading