Skip to content

Fix views #1255

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 3 commits into from
Jul 15, 2025
Merged

Fix views #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c0f598
add ARRAY type for postgres
lyubov-voloshko Jul 14, 2025
2b74114
record view: fix display field name for related records list
lyubov-voloshko Jul 15, 2025
61c65f7
icon picker: always set icon value in Another icon field
lyubov-voloshko Jul 15, 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
4 changes: 2 additions & 2 deletions frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ export class DbTableRowViewComponent implements OnInit, OnDestroy {
foreignKeyMap[fk.column_name] = fk.referenced_column_name;
}

const tableWidgetsNameMap = Object.keys(res.widgets).reduce((acc, key) => {
acc[key] = res.widgets[key].name;
const tableWidgetsNameMap = res.widgets.reduce((acc, widget: Widget) => {
acc[widget.field_name] = widget.name;
return acc;
}, {});

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ export class DbTableRowEditComponent implements OnInit {

//parse json fields
const jsonFields = Object.entries(this.tableTypes)
.filter(([key, value]) => value === 'json' || value === 'jsonb' || value === 'array' || value === 'object')
.filter(([key, value]) => value === 'json' || value === 'jsonb' || value === 'array' || value === 'ARRAY' || value === 'object')
.map(jsonField => jsonField[0]);
if (jsonFields.length) {
for (const jsonField of jsonFields) {
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/components/ui-components/icon-picker/icon-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core

import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatMenuModule } from '@angular/material/menu';
import { MatMenuTrigger } from '@angular/material/menu';
import { MatTooltipModule } from '@angular/material/tooltip';
import { MatButtonModule } from '@angular/material/button';

@Component({
selector: 'app-icon-picker',
Expand Down Expand Up @@ -38,7 +38,7 @@ export class IconPickerComponent {
constructor() { console.log(this.resetButtonShown, 'resetButtonShown'); }

ngOnInit() {
console.log(this.resetButtonShown, 'resetButtonShown');
this.customIcon = this.icon || '';
}

applyIcon() {
Expand Down
17 changes: 9 additions & 8 deletions frontend/src/app/consts/field-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import { BinaryDataCaptionRowComponent } from '../components/ui-components/row-fields/binary-data-caption/binary-data-caption.component';
import { BooleanRowComponent } from 'src/app/components/ui-components/row-fields/boolean/boolean.component'
import { CodeRowComponent } from '../components/ui-components/row-fields/code/code.component';
import { CountryRowComponent } from '../components/ui-components/row-fields/country/country.component';
import { DateRowComponent } from '../components/ui-components/row-fields/date/date.component';
import { DateTimeRowComponent } from '../components/ui-components/row-fields/date-time/date-time.component';
import { FileRowComponent } from '../components/ui-components/row-fields/file/file.component';
import { ForeignKeyRowComponent } from '../components/ui-components/row-fields/foreign-key/foreign-key.component';
import { IdRowComponent } from '../components/ui-components/row-fields/id/id.component';
import { ImageRowComponent } from '../components/ui-components/row-fields/image/image.component';
import { JsonEditorRowComponent } from '../components/ui-components/row-fields/json-editor/json-editor.component';
import { LongTextRowComponent } from 'src/app/components/ui-components/row-fields/long-text/long-text.component'
import { MoneyRowComponent } from '../components/ui-components/row-fields/money/money.component';
import { NumberRowComponent } from 'src/app/components/ui-components/row-fields/number/number.component';
import { PasswordRowComponent } from '../components/ui-components/row-fields/password/password.component';
import { PhoneRowComponent } from '../components/ui-components/row-fields/phone/phone.component';
import { PointRowComponent } from 'src/app/components/ui-components/row-fields/point/point.component';
import { SelectRowComponent } from '../components/ui-components/row-fields/select/select.component';
import { StaticTextRowComponent } from '../components/ui-components/row-fields/static-text/static-text.component';
import { TextRowComponent } from 'src/app/components/ui-components/row-fields/text/text.component';
import { TimeRowComponent } from '../components/ui-components/row-fields/time/time.component';
import { TimeIntervalRowComponent } from '../components/ui-components/row-fields/time-interval/time-interval.component';
import { IdRowComponent } from '../components/ui-components/row-fields/id/id.component';
import { FileRowComponent } from '../components/ui-components/row-fields/file/file.component';
import { CodeRowComponent } from '../components/ui-components/row-fields/code/code.component';
import { ImageRowComponent } from '../components/ui-components/row-fields/image/image.component';
import { TimeRowComponent } from '../components/ui-components/row-fields/time/time.component';
import { UrlRowComponent } from '../components/ui-components/row-fields/url/url.component';
import { CountryRowComponent } from '../components/ui-components/row-fields/country/country.component';
import { PhoneRowComponent } from '../components/ui-components/row-fields/phone/phone.component';
import { MoneyRowComponent } from '../components/ui-components/row-fields/money/money.component';

export const timestampTypes = ['timestamp without time zone', 'timestamp with time zone', 'timestamp', 'date', 'time without time zone', 'time with time zone' , 'time', 'datetime', 'date time', 'datetime2', 'datetimeoffset', 'curdate', 'curtime', 'now', 'localtime', 'localtimestamp'];
export const defaultTimestampValues = {
Expand Down Expand Up @@ -92,6 +92,7 @@ export const fieldTypes = {
// json-editor
json: JsonEditorRowComponent, //json-editor
jsonb: JsonEditorRowComponent, //json-editor
ARRAY: JsonEditorRowComponent,

//file
bytea: FileRowComponent,
Expand Down