Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
041688b
change function get_project_entity_label
joschne Jul 3, 2024
dd3fd85
remove partitioning of table pgwar.entity_preview
joschne Jul 3, 2024
053018f
trigger for each statement after insert and update on pgwar.entity_pr…
joschne Jul 4, 2024
e7ac87f
trigger for each statement after inf.statement modifcation
joschne Jul 4, 2024
1e0a46d
switch community label generation to FOR EACH STATEMENT
joschne Jul 4, 2024
966ee9e
performance improvement
joschne Jul 4, 2024
e7008ea
make tests running
joschne Jul 5, 2024
c993768
fix MATERIALIZED VIEW pgwar.project_label_config
joschne Jul 7, 2024
273e4d5
revert the function pgwar.get_project_entity_label
joschne Jul 9, 2024
a52b89b
add inf.statement indexes
joschne Jul 9, 2024
0cfe712
change router link to href
joschne Jul 9, 2024
2c12285
chore(): update prerelease version
joschne Jul 9, 2024
03a496c
fix bug (add missing passive link directive)
joschne Jul 10, 2024
d255ffc
chore(): update prerelease version
joschne Jul 10, 2024
1711cf0
fix analysis save button
joschne Jul 10, 2024
598b584
chore(): update prerelease version
joschne Jul 10, 2024
a5b2697
make recursive query fast
joschne Jul 12, 2024
b3e40bc
add all scopes
joschne Jul 12, 2024
7648548
chore(): update prerelease version
joschne Jul 12, 2024
95c0cd7
Merge pull request #372 from geovistory/performance-improvements
dferhod Jul 15, 2024
2be5a52
chore(): update release version
dferhod Jul 15, 2024
d720b1d
add performance test
joschne Jul 16, 2024
9424daf
Merge branch 'main' into pg-field-loading
joschne Jul 16, 2024
c078e98
adjust performance test
joschne Jul 16, 2024
5cd1c1b
Adapt client to new field page response
joschne Jul 16, 2024
012dfc5
add test for empty field
joschne Jul 16, 2024
e0790c7
modify server part
joschne Jul 16, 2024
607b5b0
fix
joschne Jul 16, 2024
b09b086
remove startup functions
joschne Jul 17, 2024
f34d4ee
prevent infinite loops on circular dependency
joschne Jul 17, 2024
91e9669
Merge branch 'pg-warehouse' into pgwar-optimize-entity-labels-2
joschne Jul 17, 2024
dc19ef9
update the down migrations
joschne Jul 17, 2024
e8f0a31
loop over projects to init pgwar project entities
joschne Jul 18, 2024
c002c0d
simplify the setup
joschne Jul 18, 2024
c0ca7dc
update .env
gaetanmuck Jul 18, 2024
e33ba57
optimize function
joschne Jul 18, 2024
685cacb
add scripts to loop in parallel
joschne Jul 18, 2024
312d6aa
init-script works up to community statements
joschne Jul 19, 2024
62c4e8d
improve performance
joschne Jul 19, 2024
43b91b7
updated with proper handling of number of concurrent tasks with a con…
dferhod Jul 19, 2024
696ca46
need to add test for time span
dferhod Jul 26, 2024
8b4f180
need to add test for time span
dferhod Jul 26, 2024
0a7f690
chore(): update prerelease version
dferhod Jul 26, 2024
fad6f60
need to add test for time span
dferhod Jul 29, 2024
800ad3c
Merge remote-tracking branch 'origin/pgwar-optimize-entity-labels-2' …
dferhod Jul 30, 2024
fb95f85
work on integration test for time span still in progress
dferhod Jul 30, 2024
a1e5be9
Update time span test
Jul 30, 2024
b831c7f
work on integration test for time span still in progress
dferhod Jul 31, 2024
c32e156
Merge remote-tracking branch 'origin/pgwar-optimize-entity-labels-2' …
dferhod Jul 31, 2024
0090628
work on integration test for time span still in progress
dferhod Jul 31, 2024
56c46f3
work on integration test for time span done, all pass
dferhod Jul 31, 2024
7ffc81f
chore(): update prerelease version
dferhod Jul 31, 2024
612c895
removed version declaration (deprecated)
Jul 31, 2024
b08bb2a
chore(): update prerelease version
Jul 31, 2024
ff658df
removed comments
Jul 31, 2024
387c1fe
Merge remote-tracking branch 'origin/pgwar-optimize-entity-labels-2' …
Jul 31, 2024
f4c48ce
chore(): update prerelease version
Jul 31, 2024
538e549
Merge pull request #374 from geovistory/pgwar-optimize-entity-labels-2
dferhod Jul 31, 2024
f02259c
fixed warning in test.sh
Jul 31, 2024
4cecda2
Merge branch 'pg-warehouse' into pg-field-loading
dferhod Aug 1, 2024
8984d16
increase threshold from 80 to 110ms
dferhod Aug 1, 2024
e224075
chore(): update prerelease version
dferhod Aug 1, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
-------------------------------------------------------------------->
<as-split-area [size]="t.splitSizeLeft" class="d-flex flex-column">

<gv-detail-top-bar [openRightAreaBtn]="t.layoutMode=='left-only'" [closeLeftAreaBtn]="t.layoutMode=='both'"
<gv-detail-top-bar [openRightAreaBtn]="t.layoutMode==='left-only'" [closeLeftAreaBtn]="t.layoutMode==='both'"
(closeLeft)="t.setLayoutMode('right-only')" (openRight)="t.setLayoutMode('both'); run();">

<!-- Details -->
Expand All @@ -20,14 +20,14 @@

<ng-content select="[settingsTopBar]"> </ng-content>

<button mat-button class="ml-auto border-right-0" color="primary" *ngIf="!pkAnalysis"
[disabled]="a.saving" (click)="create()">
<button mat-button class="ml-auto border-right-0" color="primary" *ngIf="!pkAnalysis" [disabled]="a.saving"
(click)="create()">
<mat-icon svgIcon="content-save-outline" color="primary"></mat-icon>
Save...
</button>

<!-- Save button -->
<button mat-button class="ml-auto border-right-0" *ngIf="pkAnalysis" [matMenuTriggerFor]="appMenu">
<button mat-button class="ml-auto border-right-0" *ngIf="pkAnalysis" (click)="save()">
<mat-icon svgIcon="content-save-outline"></mat-icon>
Save
</button>
Expand Down Expand Up @@ -62,9 +62,9 @@
<!-------------------------------------------------------------------
Analysis Results
-------------------------------------------------------------------->
<as-split-area [size]="t.splitSizeRight" *ngIf="!(t.layoutMode=='left-only')" class="d-flex flex-column">
<as-split-area [size]="t.splitSizeRight" *ngIf="!(t.layoutMode==='left-only')" class="d-flex flex-column">

<gv-detail-top-bar [openLeftAreaBtn]="t.layoutMode=='right-only'" [closeRightAreaBtn]="t.layoutMode=='both'"
<gv-detail-top-bar [openLeftAreaBtn]="t.layoutMode==='right-only'" [closeRightAreaBtn]="t.layoutMode==='both'"
(closeRight)="t.setLayoutMode('left-only')" (openLeft)="t.setLayoutMode('both');">
<span class="ml-2 mat-caption mat-text-secondary">
Analysis Results
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
import { AsyncPipe, NgClass, NgFor, NgIf } from '@angular/common';
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, Inject, Input, OnInit, Optional } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { MatTooltipModule } from '@angular/material/tooltip';
import { ActiveProjectPipesService, Field, FieldPage, GvFieldTargets, InformationPipesService, StateFacade } from '@kleiolab/lib-redux';
import { GvFieldPage, GvFieldPageReq, GvFieldPageScope, GvFieldSourceEntity } from '@kleiolab/lib-sdk-lb4';
import { values } from 'ramda';
import { Observable, Subject, firstValueFrom } from 'rxjs';
import { first, map, takeUntil } from 'rxjs/operators';
import { P_1879_HAS_VALUE_ID } from '../../../lib/constants/ontome-ids';
import { ActiveProjectService } from '../../../services/active-project.service';
import { EditModeService } from '../../../services/edit-mode.service';
import { PaginationService } from '../../../services/pagination.service';
import { READ_ONLY } from '../../../tokens/READ_ONLY';
import { ClassInfoComponent } from '../../misc/class-info/class-info.component';
import { EntityPreviewComponent } from '../../misc/entity-preview/entity-preview.component';
import { OntoPropertyInfoComponent } from '../../misc/onto-property-info/onto-property-info.component';
import { FieldLabelComponent } from '../field-label/field-label.component';
import { ViewFieldDialogComponent, ViewFieldDialogData } from '../view-field-dialog/view-field-dialog.component';
import {AsyncPipe, NgClass, NgFor, NgIf} from '@angular/common';
import {ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, Inject, Input, OnInit, Optional} from '@angular/core';
import {MatDialog} from '@angular/material/dialog';
import {MatTooltipModule} from '@angular/material/tooltip';
import {ActiveProjectPipesService, Field, FieldPage, GvFieldTargets, InformationPipesService, StateFacade} from '@kleiolab/lib-redux';
import {GvFieldPage, GvFieldPageReq, GvFieldPageScope, GvFieldSourceEntity} from '@kleiolab/lib-sdk-lb4';
import {values} from 'ramda';
import {Observable, Subject, firstValueFrom} from 'rxjs';
import {first, map, takeUntil} from 'rxjs/operators';
import {PassiveLinkDirective} from '../../../directives/passive-link/passive-link.directive';
import {P_1879_HAS_VALUE_ID} from '../../../lib/constants/ontome-ids';
import {ActiveProjectService} from '../../../services/active-project.service';
import {EditModeService} from '../../../services/edit-mode.service';
import {PaginationService} from '../../../services/pagination.service';
import {READ_ONLY} from '../../../tokens/READ_ONLY';
import {ClassInfoComponent} from '../../misc/class-info/class-info.component';
import {EntityPreviewComponent} from '../../misc/entity-preview/entity-preview.component';
import {OntoPropertyInfoComponent} from '../../misc/onto-property-info/onto-property-info.component';
import {FieldLabelComponent} from '../field-label/field-label.component';
import {ViewFieldDialogComponent, ViewFieldDialogData} from '../view-field-dialog/view-field-dialog.component';

@Component({
selector: 'gv-entity-field',
templateUrl: './entity-field.component.html',
styleUrls: ['./entity-field.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [NgIf, NgClass, ClassInfoComponent, OntoPropertyInfoComponent, FieldLabelComponent, MatTooltipModule, NgFor, EntityPreviewComponent, AsyncPipe]
imports: [NgIf, NgClass, ClassInfoComponent, OntoPropertyInfoComponent, FieldLabelComponent, MatTooltipModule, NgFor, EntityPreviewComponent, AsyncPipe, PassiveLinkDirective]
})
export class EntityFieldComponent implements OnInit {
destroy$ = new Subject<boolean>();
Expand Down Expand Up @@ -95,7 +96,7 @@ export class EntityFieldComponent implements OnInit {
getFieldTargets(field: Field): GvFieldTargets {
const res: GvFieldTargets = {}
values(field.targets).forEach(t => {
res[t.targetClass] = t.viewType.nestedResource ? { entityPreview: 'true' } : t.viewType
res[t.targetClass] = t.viewType.nestedResource ? {entityPreview: 'true'} : t.viewType
})
return res
}
Expand Down Expand Up @@ -123,9 +124,9 @@ export class EntityFieldComponent implements OnInit {
page: {
isOutgoing: false,
limit: 1, offset: 0,
property: { fkProperty: P_1879_HAS_VALUE_ID },
scope: { inProject: pkProject },
source: { fkData: pkDigital }
property: {fkProperty: P_1879_HAS_VALUE_ID},
scope: {inProject: pkProject},
source: {fkData: pkDigital}
},
pkProject,
targets: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export class ViewFieldBodyComponent implements OnInit, OnDestroy {
* For UX-Performance: trigger field load with limit 0 to get the total count of statements
* in that field (without the need to query nested fields)
*/
this.loadFieldCount(until$);
// this.loadFieldCount(until$);

const page$ = pagination$.pipe(
delay(0),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<gv-navbar>
<ol class="breadcrumb">
<li class="breadcrumb-item"><a routerLink="/"><i class="fa fa-home"></i> Home</a></li>
<li class="breadcrumb-item"><a routerLink="/projects">Your Projects</a></li>
<li class="breadcrumb-item"><a href="/"><i class="fa fa-home"></i> Home</a></li>
<li class="breadcrumb-item"><a href="/projects">Your Projects</a></li>
<li class="breadcrumb-item">{{(projectLabel$|async)}}</li>
</ol>

Expand All @@ -15,8 +15,7 @@
<mat-drawer-container class="gv-flex-fh">

<!-- Main Categories (Sources, Entities …) -->
<mat-drawer class="gv-main-drawer" mode="side" [opened]=true [disableClose]="true"
style="width: 80px">
<mat-drawer class="gv-main-drawer" mode="side" [opened]=true [disableClose]="true" style="width: 80px">

<div class="h-100 d-flex flex-column mat-bg-grey-200">

Expand Down Expand Up @@ -180,4 +179,4 @@


</mat-drawer-content>
</mat-drawer-container>
</mat-drawer-container>
Loading