Skip to content
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.

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

fix: replace resource image (DEV-3679) #1614

Merged
Changes from all commits
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
6787aa7
fix: remove change detection in resource component
derschnee68 May 15, 2024
39b72a2
fix: remove unused event
derschnee68 May 15, 2024
aff5abc
fix: remove unused code
derschnee68 May 15, 2024
7a4fe09
fix
derschnee68 May 15, 2024
5cd6489
fix: remove unused code
derschnee68 May 15, 2024
bf50d6e
fix: remove unused code
derschnee68 May 15, 2024
d6221dd
fix: remove unused code
derschnee68 May 15, 2024
c0dc1a2
fix: remove unused code
derschnee68 May 15, 2024
465afa6
fix: remove unused code
derschnee68 May 15, 2024
e6b882f
fix: remove unused code
derschnee68 May 15, 2024
0586ad8
fix: remove splitsizechanged in resource component
derschnee68 May 15, 2024
af6ff36
fix: remove unused code
derschnee68 May 15, 2024
1a214e0
fix: remove unused code
derschnee68 May 15, 2024
908dd34
fix: remove unused code
derschnee68 May 15, 2024
504a2e3
feat: create resource info bar
derschnee68 May 15, 2024
ca9c2a6
Merge remote-tracking branch 'origin/main' into julien/remove-unused-…
derschnee68 May 15, 2024
0c4d21d
wip
derschnee68 May 15, 2024
8381293
feat: add resource header
derschnee68 May 15, 2024
469c1b4
Merge remote-tracking branch 'origin/main' into julien/representation…
derschnee68 May 15, 2024
6731ee1
fix
derschnee68 May 15, 2024
325d810
feat: add resource-tabs
derschnee68 May 15, 2024
f63a751
fix: remove two ways of getting resource
derschnee68 May 15, 2024
df8d623
feat: add resource page 2
derschnee68 May 15, 2024
9e50a00
fix
derschnee68 May 15, 2024
a2f69b0
feat: add resource-parent
derschnee68 May 15, 2024
2e91a81
wip: split compound in service
derschnee68 May 15, 2024
3df7592
feat: add annotation tab
derschnee68 May 15, 2024
e15e0ef
feat: remove incomingLink method from incomingRepresentationService
derschnee68 May 15, 2024
fccaa9f
fix
derschnee68 May 15, 2024
de95d5d
fix
derschnee68 May 15, 2024
c4cf8be
fix
derschnee68 May 15, 2024
8c3c6b9
fix
derschnee68 May 16, 2024
8cc9ed2
Merge remote-tracking branch 'origin/main' into julien/init-resource
derschnee68 May 16, 2024
93d1d17
Merge remote-tracking branch 'origin/main' into julien/init-resource
derschnee68 May 17, 2024
883533f
feat: remove all change detection strategies
derschnee68 May 17, 2024
045463f
fix
derschnee68 May 17, 2024
794ba91
fix
derschnee68 May 17, 2024
4cfbfe9
fix
derschnee68 May 17, 2024
2af3223
fix
derschnee68 May 17, 2024
b4ccf45
fix
derschnee68 May 17, 2024
3f80e35
wip
derschnee68 May 17, 2024
446c9fb
fix
derschnee68 May 17, 2024
abd6297
wip
derschnee68 May 17, 2024
e8d58ff
wip: see my notes to understand the issue
derschnee68 May 17, 2024
00cad9c
fix: display image with css class
derschnee68 May 21, 2024
137f345
fix
derschnee68 May 21, 2024
39dd44f
Merge remote-tracking branch 'origin/main' into julien/compound
derschnee68 May 21, 2024
07bd1fe
Revert "feat: remove all change detection strategies"
derschnee68 May 21, 2024
32cfeca
fix
derschnee68 May 21, 2024
59cc649
feat: add resource page nx folder
derschnee68 May 21, 2024
0c655eb
feat: move resource components
derschnee68 May 21, 2024
9076704
fix: rename resource-toolbar
derschnee68 May 21, 2024
bd88736
fix: move to nx
derschnee68 May 21, 2024
29ad742
fix: improve for linting
derschnee68 May 21, 2024
1a0b205
fix
derschnee68 May 21, 2024
f97d887
fix
derschnee68 May 21, 2024
0487b0e
fix
derschnee68 May 21, 2024
3e55bfd
feat: add representations nx lib
derschnee68 May 21, 2024
1e96820
feat: add representations components
derschnee68 May 21, 2024
8db7994
feat: add common to move nx lib
derschnee68 May 21, 2024
8b1d580
fix
derschnee68 May 21, 2024
1f7e580
fix
derschnee68 May 21, 2024
581c624
fix: filerepresentation
derschnee68 May 21, 2024
47cc881
fix
derschnee68 May 21, 2024
7180db6
fix: refactor add region form component
derschnee68 May 21, 2024
1398a54
Merge remote-tracking branch 'origin/main' into julien/compound
derschnee68 May 21, 2024
a6568a6
fix: improve compound viewer
derschnee68 May 21, 2024
46e47b3
fix: style
derschnee68 May 21, 2024
52902df
wip
derschnee68 May 21, 2024
cc2dc38
fix
derschnee68 May 21, 2024
b2a3929
fix
derschnee68 May 21, 2024
acc534e
feat: add region service
derschnee68 May 21, 2024
b346c5f
fix
derschnee68 May 21, 2024
7466a9a
fix
derschnee68 May 21, 2024
5f7c40f
fix
derschnee68 May 21, 2024
8dd6801
fix
derschnee68 May 21, 2024
479fb5c
fix
derschnee68 May 21, 2024
18f323f
Merge remote-tracking branch 'origin/main' into julien/compound
derschnee68 May 21, 2024
8ed6122
fix
derschnee68 May 22, 2024
a708b8b
fix
derschnee68 May 22, 2024
bcacb62
fix
derschnee68 May 22, 2024
74a14fd
fix
derschnee68 May 22, 2024
35fc29f
fix
derschnee68 May 22, 2024
987beee
wip
derschnee68 May 22, 2024
1efb6f6
fix
derschnee68 May 22, 2024
2b91922
fix
derschnee68 May 22, 2024
525fc9a
fix: region service
derschnee68 May 22, 2024
57c95f3
fix
derschnee68 May 22, 2024
e93a215
fix: design
derschnee68 May 22, 2024
6f2f14f
fix
derschnee68 May 22, 2024
7bed134
fix
derschnee68 May 22, 2024
cbe6a57
fix
derschnee68 May 22, 2024
ed6b87a
fix
derschnee68 May 22, 2024
8f2bcf9
fix
derschnee68 May 23, 2024
da6c378
wip
derschnee68 May 23, 2024
8e3b969
fix: remove changeDetection
derschnee68 May 23, 2024
69e450c
fix
derschnee68 May 23, 2024
e851ca5
fix
derschnee68 May 23, 2024
9f2cefc
fix
derschnee68 May 23, 2024
fc53f3e
fix
derschnee68 May 23, 2024
d9a2219
Revert "fix: remove changeDetection"
derschnee68 May 23, 2024
04b4f16
Merge remote-tracking branch 'origin/main' into julien/compound
derschnee68 May 23, 2024
0758924
fix
derschnee68 May 23, 2024
e327efd
fix
derschnee68 May 23, 2024
6a61065
fix
derschnee68 May 23, 2024
6d51c84
fix: lint
derschnee68 May 23, 2024
7202cb8
fix: PR requirements
derschnee68 May 23, 2024
96d142d
fix
derschnee68 May 23, 2024
88803c1
fix
derschnee68 May 23, 2024
fd76353
fix: change page bug fix
derschnee68 May 23, 2024
4bc38ac
fix
derschnee68 May 24, 2024
f49b5f6
fix
derschnee68 May 24, 2024
afd22bb
fix
derschnee68 May 24, 2024
bd8350c
Merge remote-tracking branch 'origin/main' into julien/comparison-viewer
derschnee68 May 24, 2024
ee3c127
fix
derschnee68 May 24, 2024
f2e9e11
fix: remove unused guard
derschnee68 May 27, 2024
a6585fe
wip: comparison model
derschnee68 May 27, 2024
5ba1501
fix
derschnee68 May 27, 2024
2a4d1bd
fix: remove unused state actions showAllProps, showAllComments
derschnee68 May 27, 2024
b3199a1
feat: add resource fetcher
derschnee68 May 27, 2024
ae07c71
fix
derschnee68 May 27, 2024
9ab145b
fix
derschnee68 May 27, 2024
4335547
Merge remote-tracking branch 'origin/main' into julien/comparison-viewer
derschnee68 May 27, 2024
0005803
fix
derschnee68 May 27, 2024
26c753e
fix: remove unused resource ngxs
derschnee68 May 27, 2024
bea579c
Merge remote-tracking branch 'origin/main' into julien/comparison-viewer
derschnee68 May 27, 2024
90474f9
fix: nx
derschnee68 May 27, 2024
710225f
fix: lint nx
derschnee68 May 27, 2024
82756c2
fix
derschnee68 May 27, 2024
3386adc
fix
derschnee68 May 27, 2024
8e7b109
fix
derschnee68 May 27, 2024
6de64c7
fix: multiple subscriptions
derschnee68 May 27, 2024
8d08b00
fix
derschnee68 May 27, 2024
1e51714
fix: replace resource image (DEV-3679)
irmastnt May 28, 2024
1ea78f7
Merge branch 'main' into feature/dev-3679-image-viewer-not-updated-af…
irmastnt May 28, 2024
9587f15
Merge branch 'main' into feature/dev-3679-image-viewer-not-updated-af…
irmastnt May 28, 2024
1e61971
Merge branch 'main' into feature/dev-3679-image-viewer-not-updated-af…
irmastnt May 28, 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 @@ -39,13 +39,14 @@ import { NotificationService } from '@dasch-swiss/vre/shared/app-notification';
import { UserSelectors } from '@dasch-swiss/vre/shared/app-state';
import { Store } from '@ngxs/store';
import * as OpenSeadragon from 'openseadragon';
import { combineLatest, Observable, Subscription } from 'rxjs';
import { Observable, Subscription, combineLatest } from 'rxjs';
import { distinctUntilChanged, map, mergeMap, switchMap, tap } from 'rxjs/operators';
import { FileRepresentation } from '../file-representation';
import { getFileValue } from '../get-file-value';
import { Region } from '../region';
import { RegionService } from '../region.service';
import { RepresentationService } from '../representation.service';
import { ResourceFetcherService } from '../resource-fetcher.service';
import { EmitEvent, Events, UpdatedFileEventValue, ValueOperationEventService } from '../value-operation-event.service';
import { osdViewerConfig } from './osd-viewer.config';

Expand Down Expand Up @@ -134,7 +135,8 @@ export class StillImageComponent implements OnInit, OnChanges, OnDestroy {
private _rs: RepresentationService,
private _valueOperationEventService: ValueOperationEventService,
private _regionService: RegionService,
private _store: Store
private _store: Store,
private _resourceFetcherService: ResourceFetcherService
) {
OpenSeadragon.setString('Tooltips.Home', '');
OpenSeadragon.setString('Tooltips.ZoomIn', '');
Expand Down Expand Up @@ -278,6 +280,7 @@ export class StillImageComponent implements OnInit, OnChanges, OnDestroy {
)
)
.subscribe(res2 => {
this._resourceFetcherService.reload();
this._valueOperationEventService.emit(
new EmitEvent(
Events.FileValueUpdated,
Expand Down
Loading