Skip to content

Fields display #1260

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
lyubov-voloshko merged 5 commits into from
Jul 18, 2025
Merged

Fields display #1260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f420c79
create display components, rename edit componetns
lyubov-voloshko Jul 16, 2025
0448095
Merge branch 'main' into fields-display
lyubov-voloshko Jul 17, 2025
11e3063
fix table cell display components
lyubov-voloshko Jul 17, 2025
3ab2a8f
table cell display: copy button
lyubov-voloshko Jul 18, 2025
df438d0
fix unit tests
lyubov-voloshko Jul 18, 2025
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
2 changes: 1 addition & 1 deletion ...src/app/components/dashboard/db-table-filters-dialog/db-table-filters-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { MatSelectModule } from '@angular/material/select';
import { TablesService } from 'src/app/services/tables.service';
import { TableField, TableForeignKey, Widget } from 'src/app/models/table';
import { ConnectionsService } from 'src/app/services/connections.service';
import { UIwidgets } from 'src/app/consts/field-types';
import { UIwidgets } from 'src/app/consts/record-edit-types';
import { filterTypes } from 'src/app/consts/filter-types';
import { ActivatedRoute } from '@angular/router';
import { getComparatorsFromUrl, getFiltersFromUrl } from 'src/app/lib/parse-filter-params';
Expand Down
32 changes: 16 additions & 16 deletions frontend/src/app/components/dashboard/db-table-widgets/db-table-widgets.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,85 +71,85 @@

<div class="widget-examples">
<div class="widget-example">
<app-row-text
<app-edit-text
key="password-original-example"
label="Password"
value="MySuper-Secret-Password_12345678"
[required]="false"
[readonly]="false"
[disabled]="false">
</app-row-text>
</app-edit-text>
<mat-icon class="examples-arrow">arrow_downward</mat-icon>
<app-row-password
<app-edit-password
key="password-example"
label="Password"
value="MySuper-Secret-Password_12345678"
[required]="false"
[readonly]="false"
[disabled]="false">
</app-row-password>
</app-edit-password>
</div>

<div class="widget-example widget-example_row-2">
<app-row-text
<app-edit-text
key="select-original-example"
label="Color"
value="💜 Purple"
[required]="false"
[readonly]="false"
[disabled]="false">
</app-row-text>
</app-edit-text>
<mat-icon class="examples-arrow">arrow_downward</mat-icon>
<app-row-select
<app-edit-select
key="select-example"
label="Color"
value="purple"
[widgetStructure]="{widget_params: {options: [{value: 'red', label: '❤️ Red'}, {value: 'green', label: '💚 Green'}, {value: 'blue', label: '💙 Blue'}, {value: 'purple', label: '💜 Purple'}]}}"
[required]="false"
[readonly]="false"
[disabled]="false">
</app-row-select>
</app-edit-select>
</div>

<div class="widget-example widget-example_row-1-2">
<app-row-text
<app-edit-text
key="image-original-example"
label="Image"
value="https://app.rocketadmin.com/assets/main-table-reg-image.svg"
[required]="false"
[readonly]="false"
[disabled]="false">
</app-row-text>
</app-edit-text>
<mat-icon class="examples-arrow">arrow_downward</mat-icon>
<app-image
<app-edit-image
key="image-example"
label="Image"
value="https://app.rocketadmin.com/assets/main-table-reg-image.svg"
[required]="false"
[readonly]="false"
[disabled]="false">
</app-image>
</app-edit-image>
</div>

<div class="widget-example widget-example_row-1-2">
<app-row-long-text
<app-edit-long-text
key="long-text-original-example"
label="code"
[value]="widgetCodeEample"
[required]="false"
[readonly]="false"
[disabled]="false">
</app-row-long-text>
</app-edit-long-text>
<mat-icon class="examples-arrow">arrow_downward</mat-icon>
<app-code
<app-edit-code
key="code-example"
label="Code"
[value]="widgetCodeEample"
[widgetStructure]="{widget_params: {language: 'html'}}"
[required]="false"
[readonly]="false"
[disabled]="false">
</app-code>
</app-edit-code>
</div>
</div>

Expand Down
28 changes: 14 additions & 14 deletions frontend/src/app/components/dashboard/db-table-widgets/db-table-widgets.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@ import { TableField, Widget } from 'src/app/models/table';

import { AlertComponent } from '../../ui-components/alert/alert.component';
import { BreadcrumbsComponent } from '../../ui-components/breadcrumbs/breadcrumbs.component';
import { CodeRowComponent } from '../../ui-components/row-fields/code/code.component';
import { CodeEditComponent } from '../../ui-components/record-edit-fields/code/code.component';
import { CommonModule } from '@angular/common';
import { CompanyService } from 'src/app/services/company.service';
import { ConnectionsService } from 'src/app/services/connections.service';
import { FormsModule } from '@angular/forms';
import { ImageRowComponent } from '../../ui-components/row-fields/image/image.component';
import { ImageEditComponent } from '../../ui-components/record-edit-fields/image/image.component';
import { Location } from '@angular/common';
import { LongTextRowComponent } from '../../ui-components/row-fields/long-text/long-text.component';
import { LongTextEditComponent } from '../../ui-components/record-edit-fields/long-text/long-text.component';
import { MatButtonModule } from '@angular/material/button';
import { MatDialog } from '@angular/material/dialog';
import { MatDialogModule } from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select';
import { PasswordRowComponent } from '../../ui-components/row-fields/password/password.component';
import { PasswordEditComponent } from '../../ui-components/record-edit-fields/password/password.component';
import { PlaceholderTableWidgetsComponent } from '../../skeletons/placeholder-table-widgets/placeholder-table-widgets.component';
import { Router } from '@angular/router';
import { RouterModule } from '@angular/router';
import { SelectRowComponent } from '../../ui-components/row-fields/select/select.component';
import { SelectEditComponent } from '../../ui-components/record-edit-fields/select/select.component';
import { TablesService } from 'src/app/services/tables.service';
import { TextRowComponent } from '../../ui-components/row-fields/text/text.component';
import { TextEditComponent } from '../../ui-components/record-edit-fields/text/text.component';
import { Title } from '@angular/platform-browser';
import { UIwidgets } from "src/app/consts/field-types";
import { UIwidgets } from "src/app/consts/record-edit-types";
import { UiSettingsService } from 'src/app/services/ui-settings.service';
import { UrlRowComponent } from '../../ui-components/row-fields/url/url.component';
import { UrlEditComponent } from '../../ui-components/record-edit-fields/url/url.component';
import { WidgetComponent } from './widget/widget.component';
import { WidgetDeleteDialogComponent } from './widget-delete-dialog/widget-delete-dialog.component';
import { difference } from "lodash";
Expand All @@ -50,13 +50,13 @@ import { normalizeTableName } from 'src/app/lib/normalize';
AlertComponent,
PlaceholderTableWidgetsComponent,
BreadcrumbsComponent,
PasswordRowComponent,
ImageRowComponent,
CodeRowComponent,
PasswordEditComponent,
ImageEditComponent,
CodeEditComponent,
WidgetComponent,
TextRowComponent,
LongTextRowComponent,
SelectRowComponent,
TextEditComponent,
LongTextEditComponent,
SelectEditComponent,
Angulartics2OnModule
],
})
Expand Down
78 changes: 2 additions & 76 deletions frontend/src/app/components/dashboard/db-table/db-table.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,66 +444,18 @@ th.mat-header-cell, td.mat-cell {
}
}

.field-value {
position: relative;
display: inline-block;
width: 100%;
}

@media (prefers-color-scheme: light) {
.field-value {
.table-cell-content {
color: rgba(0, 0, 0, 0.64)
}
}

@media (prefers-color-scheme: dark) {
.field-value {
.table-cell-content {
color: rgba(255, 255, 255, 0.64)
}
}

.field-image {
display: block;
height: var(--height);
margin: 12px 0;
}

.field-link {
display: flex;
align-items: center;
gap: 4px;
color: var(--color-primaryPalette-500);
}

.field-link__icon {
flex-shrink: 0;
margin-bottom: -2px;
width: 16px;
height: 16px;
font-size: 16px;
}

.field-value-copy-button {
position: absolute;
right: -6px;
top: 50%;
display: none;
transform: translate(0, -50%) scale(0.85);
background-color: var(--hover-color);
}

@media (prefers-color-scheme: dark) {
.field-value-copy-button {
--hover-color: var(--color-primaryPalette-800);
}
}

@media (prefers-color-scheme: light) {
.field-value-copy-button {
--hover-color: var(--color-primaryPalette-50);
}
}

.db-table-cell:hover .field-value-copy-button {
display: initial;
}
Expand Down Expand Up @@ -533,32 +485,6 @@ tr.mat-row:hover {
top: 40px;
}

.foreign-key-button {
background: transparent;
border: 1px solid transparent;
border-radius: 12px;
color: var(--color-accentedPalette-500);
cursor: pointer;
font-size: inherit;
padding: 2px 8px;
overflow: hidden;
text-overflow: ellipsis;
text-align: left;
max-width: 100%;
transition: background 100ms, border-color 100ms;
}

.foreign-key-button:hover{
background-color: var(--color-accentedPalette-100);
border: 1px solid var(--color-accentedPalette-300);
}

.foreign-key-button_selected {
background-color: var(--color-accentedPalette-100);
border-radius: 12px;
border: 1px solid var(--color-accentedPalette-300);
}

.empty-table {
display: flex;
flex-direction: column;
Expand Down
104 changes: 31 additions & 73 deletions frontend/src/app/components/dashboard/db-table/db-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,81 +216,39 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
<mat-header-cell *matHeaderCellDef mat-sort-header [disabled]="!isSortable(column)"> {{ tableData.dataNormalizedColumns[column] }} </mat-header-cell>
<mat-cell *matCellDef="let element; let i = index" [attr.data-label]="tableData.dataNormalizedColumns[column]" class="db-table-cell" data-hj-suppress>
<div class="table-cell-content">
<span *ngIf="isForeignKey(column); else contentCell" class="field-value field-value_foreign-key">
<!--<a routerLink="/dashboard/{{connectionID}}/{{tableData.foreignKeys[column].referenced_table_name}}/entry"
class="foreign-key-link"
[queryParams]="getForeignKeyQueryParams(tableData.foreignKeys[column], element[column])">
{{ getCellValue(tableData.foreignKeys[column], element[column]) }}
</a>-->
<button class="foreign-key-button" type="button"
[ngClass]="{'foreign-key-button_selected': isForeignKeySelected(element[column], tableData.foreignKeys[column])}"
(click)="handleForeignKeyView($event, tableData.foreignKeys[column], element[column])">
{{ getCellValue(tableData.foreignKeys[column], element[column]) }}
</button>
<button type="button" mat-icon-button
class="field-value-copy-button"
matTooltip="Copy"
[cdkCopyToClipboard]="getCellValue(tableData.foreignKeys[column], element[column])"
(click)="$event.stopPropagation()"
(cdkCopyToClipboardCopied)="showCopyNotification('Field value was copied to clipboard.')">
<mat-icon>content_copy</mat-icon>
</button>
</span>
<ng-container *ngIf="isForeignKey(column); else contentCell">
<app-display-foreign-key
[key]="i"
[relations]="tableData.foreignKeys[column]"
[value]="getCellValue(tableData.foreignKeys[column], element[column])"
[isSelected]="isForeignKeySelected(element[column], tableData.foreignKeys[column])"
(onForeignKeyClick)="handleForeignKeyView(tableData.foreignKeys[column], element[column])"
(onCopyToClipboard)="showCopyNotification('Field value was copied to clipboard.')">
</app-display-foreign-key>
</ng-container>
<ng-template #contentCell>
<div *ngIf="isWidget(column); else simpleValue" class="field-value">
<img *ngIf="tableData.widgets[column].widget_type === 'Image' && element[column]"
[src]="element[column]"
[style.--height.px]="tableData.widgets[column].widget_params.height"
class="field-image">

<a *ngIf="tableData.widgets[column].widget_type === 'URL' && element[column]"
target="_blank"
[href]="element[column]"
class="field-link"
(click)="$event.stopPropagation()"
>
<mat-icon class="field-link__icon" fontSet="material-icons-outlined">link</mat-icon>
<span>{{element[column]}}</span>
</a>

<span *ngIf="tableData.widgets[column].widget_type !== 'URL'">{{ getWidgetValue(column, element[column]) }}</span>

<button type="button" mat-icon-button
class="field-value-copy-button"
matTooltip="Copy"
[cdkCopyToClipboard]="getWidgetValue(column, element[column])"
(click)="$event.stopPropagation()"
(cdkCopyToClipboardCopied)="showCopyNotification('Field value was copied to clipboard.')">
<mat-icon>content_copy</mat-icon>
</button>
</div>
<ndc-dynamic *ngIf="isWidget(column) && tableData.widgets[column].widget_type; else simpleValue"
[ndcDynamicComponent]="UIwidgets[tableData.widgets[column].widget_type]"
[ndcDynamicInputs]="{
key: i,
value: element[column],
widgetStructure: tableData.widgets[column]
}"
[ndcDynamicOutputs]="{
onCopyToClipboard: { handler: showCopyNotification, args: ['$event'] }
}">
</ndc-dynamic>
<ng-template #simpleValue>
<span *ngIf="tableData.keyAttributes[0]?.column_name === column; else nonPrimaryKey"
attr.data-testid="table-primary-key-{{i}}-cell"
class="field-value">
{{element[column] || '—'}}
<button type="button" mat-icon-button
class="field-value-copy-button"
matTooltip="Copy"
[cdkCopyToClipboard]="element[column]"
(click)="$event.stopPropagation()"
(cdkCopyToClipboardCopied)="showCopyNotification('Field value was copied to clipboard.')">
<mat-icon>content_copy</mat-icon>
</button>
</span>
<ng-template #nonPrimaryKey>
<span class="field-value">
{{element[column] || '—'}}
<button type="button" mat-icon-button
class="field-value-copy-button"
matTooltip="Copy"
[cdkCopyToClipboard]="element[column]"
(click)="$event.stopPropagation()"
(cdkCopyToClipboardCopied)="showCopyNotification('Field value was copied to clipboard.')">
<mat-icon>content_copy</mat-icon>
</button>
</span>
</ng-template>
<ndc-dynamic
[ndcDynamicComponent]="displayCellComponents[tableData.tableTypes[column]]"
[ndcDynamicInputs]="{
key: i,
value: element[column]
}"
[ndcDynamicOutputs]="{
onCopyToClipboard: { handler: showCopyNotification, args: [ '$event' ] }
}">
</ndc-dynamic>
</ng-template>
</ng-template>
</div>
Expand Down
Loading