Skip to content

table list: fix Collapse button alignment #1377

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 2 commits into from
Sep 26, 2025
Merged

table list: fix Collapse button alignment #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55b8049
table list: fix Collapse button alignment
lyubov-voloshko Sep 26, 2025
1088a6b
Merge branch 'main' into fixes
lyubov-voloshko Sep 26, 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
11 changes: 3 additions & 8 deletions frontend/src/app/components/dashboard/dashboard.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,9 @@
padding: 0 24px;
}

.toggle-button-position {
display: flex;
justify-content: center;
margin-top: 24px;
}

.toggle-button_opened {
width: calc(100% - 32px);
.toggle-button {
margin-top: 8px;
margin-left: 12px;
}

.dashboard {
Expand Down
31 changes: 15 additions & 16 deletions frontend/src/app/components/dashboard/dashboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,26 @@ <h3 class='mat-subheading-2'>Rocketadmin can not find any tables</h3>
<mat-sidenav #sideList mode="side" [(opened)]="shownTableTitles"
class="table-list-sidenav"
[ngClass]="{'side-bar_collapsed': !shownTableTitles}">
<div class="toggle-button-position">
<button mat-button type="button" *ngIf="shownTableTitles; else collapsedButton"
class="toggle-button_opened"
<button mat-button type="button" *ngIf="shownTableTitles; else collapsedButton"
class="toggle-button"
(click)="toggleSideBar()"
angulartics2On="click"
angularticsAction="Dashboard: toggle sidebar"
[angularticsProperties]="{'collapsed': !shownTableTitles}">
Collapse
<mat-icon>chevron_left</mat-icon>
</button>

<ng-template #collapsedButton>
<button mat-icon-button type="button"
class="toggle-button"
(click)="toggleSideBar()"
angulartics2On="click"
angularticsAction="Dashboard: toggle sidebar"
[angularticsProperties]="{'collapsed': !shownTableTitles}">
Collapse
<mat-icon>chevron_left</mat-icon>
<mat-icon>chevron_right</mat-icon>
</button>

<ng-template #collapsedButton>
<button mat-icon-button type="button"
(click)="toggleSideBar()"
angulartics2On="click"
angularticsAction="Dashboard: toggle sidebar"
[angularticsProperties]="{'collapsed': !shownTableTitles}">
<mat-icon>chevron_right</mat-icon>
</button>
</ng-template>
</div>
</ng-template>
<app-db-tables-list
[collapsed]="!shownTableTitles"
[tables]="tablesList"
Expand Down
4 changes: 2 additions & 2 deletions ...app/components/dashboard/db-table-view/db-table-row-view/db-table-row-view.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ <h2 class="mat-heading-2 row-preview-sidebar__title">Preview</h2>
<ng-container *ngIf="selectedRow && selectedRow.record; else loadingContent">
<div *ngFor="let column of columns; let i = index" class="row-preview-sidebar__field">
<strong>{{column.normalizedTitle}}</strong>
<ng-container *ngIf="isForeignKey(column.title); else recordContent">
<ng-container *ngIf="isForeignKey(column.title); else recordContent" data-hj-suppress>
<app-foreign-key-record-view
[key]="i"
link="/dashboard/{{selectedRow.connectionID}}/{{selectedRow.foreignKeys[column.title]?.referenced_table_name}}/entry"
Expand All @@ -92,7 +92,7 @@ <h2 class="mat-heading-2 row-preview-sidebar__title">Preview</h2>
</app-foreign-key-record-view>
</ng-container>

<ng-template #recordContent>
<ng-template #recordContent data-hj-suppress>
<ndc-dynamic *ngIf="isWidget(column.title) && selectedRow.widgets[column.title].widget_type; else simpleValue"
[ndcDynamicComponent]="UIwidgets[selectedRow.widgets[column.title].widget_type]"
[ndcDynamicInputs]="{
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/components/dashboard/db-table-view/db-table-view.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
</div>

<div *ngIf="getFiltersCount(activeFilters) !== 0 && !hasSavedFilterActive" class="active-filters">
<mat-chip-row *ngFor="let activeFilter of activeFilters | keyvalue"
<mat-chip-row *ngFor="let activeFilter of activeFilters | keyvalue" data-hj-suppress
(removed)="removeFilter.emit(activeFilter.key)">
{{ getFilter(activeFilter) }}
<button matChipRemove>
Expand Down
2 changes: 1 addition & 1 deletion ...components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</div>
</form>
<div class="static-filters">
<mat-chip *ngFor="let filter of savedFilterMap[selectedFilterSetId]?.staticFilters" class="static-filter-chip">
<mat-chip *ngFor="let filter of savedFilterMap[selectedFilterSetId]?.staticFilters" class="static-filter-chip" data-hj-suppress>
{{ getFilter(filter) }}
</mat-chip>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/components/dashboard/db-tables-list/db-tables-list.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

.search-input {
background-color: transparent;
margin-top: 12px;
margin-top: 4px;
margin-left: 16px;
margin-bottom: -24px;
width: calc(100% - 32px);
Expand Down