Skip to content

Commit 8b26ac0

Browse files
gugugugu
authored
Merge branch 'main' into fix/setup-route-missing-password-provider
2 parents da3f283 + 286ca37 commit 8b26ac0

10 files changed

Lines changed: 22 additions & 20 deletions

File tree

‎frontend/src/app/components/audit/info-dialog/info-dialog.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<h1 mat-dialog-title>Log details</h1>
22
<mat-dialog-content>
3-
<p class="mat-body-1" data-block="preamble" data-hj-suppress>
3+
<p class="mat-body-1" data-block="preamble" data-ph-no-capture>
44
{{ log.User }} {{ action }} in "{{ normalizedTableName }}" table on {{formattedCrreatedAt}} {{ log.Status }}.
55
</p>
66

@@ -10,10 +10,10 @@ <h1 mat-dialog-title>Log details</h1>
1010
class="mat-body"
1111
[ngClass]="{changed: isChangedFiled(field)}">
1212
<th>{{filedsNames[field]}}</th>
13-
<td data-hj-suppress *ngIf="log.currentValue[field] !== '* * * sensitive data, no logs stored * * *'">
13+
<td data-ph-no-capture *ngIf="log.currentValue[field] !== '* * * sensitive data, no logs stored * * *'">
1414
{{log.prevValue[field]}}
1515
</td>
16-
<td data-hj-suppress
16+
<td data-ph-no-capture
1717
[attr.colspan]="log.currentValue[field] === '* * * sensitive data, no logs stored * * *' ? '2' : '' "
1818
[ngClass]="{sensitive: log.currentValue[field] === '* * * sensitive data, no logs stored * * *'}">
1919
<div class="updated-cell">
@@ -35,7 +35,7 @@ <h1 mat-dialog-title>Log details</h1>
3535
class="mat-body"
3636
[ngClass]="{changed: isChangedFiled(field)}">
3737
<th>{{filedsNames[field.key]}}</th>
38-
<td data-hj-suppress *ngIf="log.currentValue[field] !== '* * * sensitive data, no logs stored * * *'">
38+
<td data-ph-no-capture *ngIf="log.currentValue[field] !== '* * * sensitive data, no logs stored * * *'">
3939
{{field.value}}
4040
</td>
4141
</tr>

‎frontend/src/app/components/charts/chart-edit/chart-edit.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h3>SQL Query</h3>
4747
{{ testing() ? 'Testing...' : 'Test Query' }}
4848
</button>
4949
</div>
50-
<div class="code-editor-box" data-hj-suppress>
50+
<div class="code-editor-box" data-ph-no-capture>
5151
<ngs-code-editor
5252
[theme]="codeEditorTheme"
5353
[codeModel]="codeModel()"

‎frontend/src/app/components/dashboard/db-table-view/db-table-row-view/db-table-row-view.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ <h2 class="mat-heading-2 row-preview-sidebar__title">Preview</h2>
8080
<ng-container *ngIf="selectedRow && selectedRow.record; else loadingContent">
8181
<div *ngFor="let column of columns; let i = index" class="row-preview-sidebar__field">
8282
<strong>{{column.normalizedTitle}}</strong>
83-
<div data-hj-suppress class="row-preview-sidebar__value">
83+
<div data-ph-no-capture class="row-preview-sidebar__value">
8484
<ng-container *ngIf="isForeignKey(column.title); else recordContent">
8585
<app-foreign-key-record-view
8686
link="/dashboard/{{selectedRow.connectionID}}/{{selectedRow.foreignKeys[column.title]?.referenced_table_name}}/entry"

‎frontend/src/app/components/dashboard/db-table-view/db-table-view.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
185185
</div>
186186

187187
<div *ngIf="getFiltersCount(activeFilters) !== 0 && !hasSavedFilterActive" class="active-filters">
188-
<mat-chip-row *ngFor="let activeFilter of activeFilters | keyvalue" data-hj-suppress
188+
<mat-chip-row *ngFor="let activeFilter of activeFilters | keyvalue" data-ph-no-capture
189189
class="db-table-active-filter-chip"
190190
(removed)="removeFilter.emit(activeFilter.key)"
191191
(click)="handleActiveFilterClick(activeFilter.key)">
@@ -282,7 +282,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
282282
</button>
283283
</mat-menu>
284284
</mat-header-cell>
285-
<mat-cell *matCellDef="let element; let i = index" [attr.data-label]="tableData.dataNormalizedColumns[column]" class="db-table-cell" data-hj-suppress>
285+
<mat-cell *matCellDef="let element; let i = index" [attr.data-label]="tableData.dataNormalizedColumns[column]" class="db-table-cell" data-ph-no-capture>
286286
<div class="table-cell-content">
287287
<ng-container *ngIf="isForeignKey(column); else contentCell">
288288
<app-display-foreign-key

‎frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
</div>
180180
</form>
181181
<div class="static-filters" *ngIf="savedFilterMap[selectedFilterSetId]?.staticFilters?.length">
182-
<mat-chip *ngFor="let filter of savedFilterMap[selectedFilterSetId]?.staticFilters" class="static-filter-chip" data-hj-suppress>
182+
<mat-chip *ngFor="let filter of savedFilterMap[selectedFilterSetId]?.staticFilters" class="static-filter-chip" data-ph-no-capture>
183183
{{ getFilter(filter) }}
184184
</mat-chip>
185185
</div>

‎frontend/src/app/components/ui-components/record-edit-fields/code/code.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<span class="mat-body-1">{{ normalizedLabel }} {{ required ? '*' : '' }}</span>
22

3-
<div class="code-editor-box" data-hj-suppress>
3+
<div class="code-editor-box" data-ph-no-capture>
44
<ngs-code-editor
55
[theme]="codeEditorTheme"
66
[codeModel]="mutableCodeModel"

‎frontend/src/app/components/ui-components/record-edit-fields/json-editor/json-editor.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<span class="mat-body-1">{{ normalizedLabel }} {{ required ? '*' : '' }}</span>
22

3-
<div class="code-editor-box" data-hj-suppress>
3+
<div class="code-editor-box" data-ph-no-capture>
44
<ngs-code-editor
55
theme="vs"
66
[codeModel]="mutableCodeModel"

‎frontend/src/app/components/ui-components/record-edit-fields/markdown/markdown.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<span class="mat-body-1">{{ normalizedLabel }} {{ required ? '*' : '' }}</span>
22

3-
<div class="code-editor-box" data-hj-suppress>
3+
<div class="code-editor-box" data-ph-no-capture>
44
<ngs-code-editor
55
[theme]="codeEditorTheme"
66
[codeModel]="mutableCodeModel"

‎frontend/src/app/services/connections.service.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ export class ConnectionsService {
163163
});
164164
} else {
165165
this.isCustomAccentedColor = false;
166-
this._themeService.updateColors({ palettes: { primaryPalette: '#2563eb', accentedPalette: '#2563eb' } });
166+
this._themeService.updateColors({ palettes: { primaryPalette: '#212121', accentedPalette: '#2563eb' } });
167167
}
168168
});
169169
} else {
170170
this.connection = { ...this.connectionInitialState };
171171
this.isCustomAccentedColor = false;
172-
this._themeService.updateColors({ palettes: { primaryPalette: '#2563eb', accentedPalette: '#2563eb' } });
172+
this._themeService.updateColors({ palettes: { primaryPalette: '#212121', accentedPalette: '#2563eb' } });
173173
}
174174

175175
console.log('this.defaultDisplayTable');
@@ -275,7 +275,7 @@ export class ConnectionsService {
275275
});
276276
} else {
277277
this.defaultDisplayTable = null;
278-
this._themeService.updateColors({ palettes: { primaryPalette: '#2563eb', accentedPalette: '#2563eb' } });
278+
this._themeService.updateColors({ palettes: { primaryPalette: '#212121', accentedPalette: '#2563eb' } });
279279
}
280280
return { ...res, connection };
281281
}),

‎frontend/src/main.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const saasExtraProviders = (environment as any).saas
4545
: [];
4646
const colorConfig: IColorConfig<Palettes, Colors> = {
4747
palettes: {
48-
primaryPalette: '#2563eb',
48+
primaryPalette: '#212121',
4949
accentedPalette: '#2563eb',
5050
warnPalette: '#B71C1C',
5151
whitePalette: '#FFFFFF',
@@ -85,10 +85,12 @@ if ((environment as any).saas) {
8585
});
8686
}
8787

88-
posthog.init('phc_VPnWHIMj9UjhRLPr7shATjgL0J4KrWWOHkK3JwZbnkw', {
89-
api_host: 'https://us.i.posthog.com',
90-
defaults: '2025-11-30',
91-
});
88+
if ((environment as any).saas) {
89+
posthog.init('phc_VPnWHIMj9UjhRLPr7shATjgL0J4KrWWOHkK3JwZbnkw', {
90+
api_host: 'https://us.i.posthog.com',
91+
defaults: '2025-11-30',
92+
});
93+
}
9294

9395
bootstrapApplication(AppComponent, {
9496
providers: [

0 commit comments

Comments
 (0)