Browse Source

Merge with develop/3.5

pull/8181/head
Andrii Shvaika 3 years ago
parent
commit
c9b37237c1
  1. 4
      application/src/main/data/upgrade/3.4.4/schema_update.sql
  2. 2
      ui-ngx/src/app/core/utils.ts
  3. 2
      ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
  4. 2
      ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.ts
  5. 1
      ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts

4
application/src/main/data/upgrade/3.4.4/schema_update.sql

@ -23,7 +23,7 @@ UPDATE user_credentials
SET additional_info = json_build_object('userPasswordHistory', (u.additional_info::json -> 'userPasswordHistory'))
FROM tb_user u WHERE user_credentials.user_id = u.id AND u.additional_info::jsonb ? 'userPasswordHistory';
UPDATE tb_user SET additional_info = tb_user.additional_info::jsonb - 'userPasswordHistory';
UPDATE tb_user SET additional_info = tb_user.additional_info::jsonb - 'userPasswordHistory' WHERE additional_info::jsonb ? 'userPasswordHistory';
-- USER CREDENTIALS END
@ -346,4 +346,4 @@ BEGIN
END
$$;
-- ALARM FUNCTIONS END
-- ALARM FUNCTIONS END

2
ui-ngx/src/app/core/utils.ts

@ -304,7 +304,7 @@ export function deepClone<T>(target: T, ignoreFields?: string[]): T {
(target as any[]).forEach((v) => { cp.push(v); });
return cp.map((n: any) => deepClone<any>(n)) as any;
}
if (typeof target === 'object' && Object.keys(target).length) {
if (typeof target === 'object') {
const cp = {...(target as { [key: string]: any })} as { [key: string]: any };
Object.keys(cp).forEach(k => {
if (!ignoreFields || ignoreFields.indexOf(k) === -1) {

2
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts

@ -492,7 +492,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
const cssParser = new cssjs();
cssParser.testMode = false;
this.dashboardPageClass = 'tb-dashboard-page-css-' + guid();
cssParser.cssPreviewNamespace = this.dashboardPageClass;
cssParser.cssPreviewNamespace = 'tb-default .' + this.dashboardPageClass;
cssParser.createStyleElement(this.dashboardPageClass, cssString);
}
}

2
ui-ngx/src/app/modules/home/components/widget/lib/markdown-widget.component.ts

@ -80,7 +80,7 @@ export class MarkdownWidgetComponent extends PageComponent implements OnInit {
const cssParser = new cssjs();
cssParser.testMode = false;
this.markdownClass += '-' + hashCode(cssString);
cssParser.cssPreviewNamespace = this.markdownClass;
cssParser.cssPreviewNamespace = 'tb-default .' + this.markdownClass;
cssParser.createStyleElement(this.markdownClass, cssString);
}
const pageSize = isDefinedAndNotNull(this.ctx.widgetConfig.pageSize) &&

1
ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts

@ -457,6 +457,7 @@ export function constructTableCssString(widgetConfig: WidgetConfig): string {
'}\n' +
'.mat-mdc-table .mat-mdc-cell {\n' +
'color: ' + mdDark + ';\n' +
'background-color: rgba(0, 0, 0, 0);\n' +
'}\n' +
'.mat-mdc-table .mat-mdc-cell button.mat-mdc-icon-button mat-icon {\n' +
'color: ' + mdDarkSecondary + ';\n' +

Loading…
Cancel
Save