Skip to content

Commit 058bffe

Browse files
committed
gh-5042 Fix DocRefInfoCache change handler to include CREATE
1 parent 1a6d8ea commit 058bffe

File tree

3 files changed

+63
-4
lines changed

3 files changed

+63
-4
lines changed

stroom-core-client/src/main/java/stroom/importexport/client/presenter/ImportConfigConfirmPresenter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ public String getValue(final ImportState action) {
467467
return action.getDocRef().getType();
468468
}
469469
};
470-
dataGrid.addResizableColumn(column, "Type", 100);
470+
dataGrid.addResizableColumn(column, "Type", 150);
471471
}
472472

473473
private void addSourcePathColumn() {
@@ -478,7 +478,7 @@ public String getValue(final ImportState action) {
478478
return action.getSourcePath();
479479
}
480480
};
481-
dataGrid.addResizableColumn(column, "Source Path", 300);
481+
dataGrid.addResizableColumn(column, "Source Path", 450);
482482
}
483483

484484
private void addDestPathColumn() {
@@ -489,7 +489,7 @@ public String getValue(final ImportState action) {
489489
return action.getDestPath();
490490
}
491491
};
492-
dataGrid.addResizableColumn(column, "Destination Path", 300);
492+
dataGrid.addResizableColumn(column, "Destination Path", 450);
493493
}
494494

495495
public void abortImport(final HidePopupRequestEvent e) {

stroom-explorer/stroom-explorer-impl/src/main/java/stroom/explorer/impl/DocRefInfoCache.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,11 @@ public void clear() {
174174

175175
@Override
176176
public void onChange(final EntityEvent event) {
177-
if (event != null && !EntityAction.CREATE.equals(event.getAction())) {
177+
if (event != null) {
178+
// Need to handle all types as we are caching an optional, e.g.
179+
// If you do a delete then an empty is loaded into the cache,
180+
// then the same doc is created again, then we need the empty to
181+
// be evicted.
178182
LOGGER.debug("Invalidating entry for {}", event);
179183
cache.invalidate(event.getDocRef());
180184
}
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
* Change DocRef Info Cache to evict entries on document creation to stop stroom saying that a document doesn't exist after import.
2+
3+
4+
```sh
5+
# ONLY the top line will be included as a change entry in the CHANGELOG.
6+
# The entry should be in GitHub flavour markdown and should be written on a SINGLE
7+
# line with no hard breaks. You can have multiple change files for a single GitHub issue.
8+
# The entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
9+
# 'Fixed nasty bug'.
10+
#
11+
# Examples of acceptable entries are:
12+
#
13+
#
14+
# * Issue **123** : Fix bug with an associated GitHub issue in this repository
15+
#
16+
# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
17+
#
18+
# * Fix bug with no associated GitHub issue.
19+
20+
21+
# --------------------------------------------------------------------------------
22+
# The following is random text to make this file unique for git's change detection
23+
# LLG1VEY3T7XdMyJ4GmeXSKlekMHiIvz6k2uiO0C8My74Pr3FmQIXGfaqRCmGWXCKmtspNFjeBVyUA2ke
24+
# VZdG42KkvNfT5OdZhb5VhW3HmCUwCVcXKC1hCmVe9tI6UjZpJrpQIOCZCwLoWcefUSioC9G1inL03Ztr
25+
# XHF9aEJv7GDqnnEH3GIqk4asMEndGfT46GCfkC1WM0di1Z6EXq7gnEWTPBsIx4RVdxcso1FzcbEYwZpV
26+
# 3dUYVJsfnw1uTrTam6FJUEmaYl1BiFJeWG8sTHI9s78RfbzsSm6wxAYsi2D7BePM3ao3UVMTlGCL1G4M
27+
# 987FcaYG2UNwp64uY9I3fnEOt739lPpxwnBiGJkdllgDUteR4udL9xhoiNYhbw0nXICwihhrxk8Kso3N
28+
# jM3KpkeZwO9MWUnSOCmEQ4dl4ejgw4ydhF0JPMtEJtcrFVZGQDQNxSERYNNR93uOhsjFn6w0gTi4vzf0
29+
# r3urplC2kCfCFpsyjzBo46CAZe8u1orWesLyQcN4UXOiDZdexV1zqWGkkAY0WhUph0sevMzOqBNTMPaN
30+
# bFiu9ZDtl8kirX8VDiBxs83tV5zZsQKl15SIqClaTEkYsl6NJ3evKuZN5O0favL2RKJgPfnLgbQ3kIjb
31+
# qtJ6Yyckwsr7z7T2NgMubV4IWHlTWMo1eQsQ52yXGtutQnQUWlFCu8Tjf4M9i4HbO8InGmYi8sVe4ATx
32+
# MbtGg8HR7VheeTZzVbTf5c61MYfkuiv2bfLzUJPhadAK9bN9XwRe17LTElYZnj8RR4t8R8RR3STcHmxD
33+
# RHBVZjU2yMmow4ISyIlYR5WPZl45jsh1YLCbNYyqoWXv5MUHXJSSQJQ336bbPMYK2TbSWIVFoFASIGmu
34+
# RrPMUEyPovTZKVnmR7d2lf04mlvsRXJ7wxvCaGyoQ2RxegaKDLX6y9OzJ2D8RgM4hgLknxb83zjCp5h0
35+
# zJmjTkbHkYCExtt5HSGvhD3ZIPcEbQmrOoR5JZWU8QudhqwSn1PuOCfrxTtpFrym2GM8qjSAjBPau9PA
36+
# HVprj3vBe349nLjx6k1OdWMNDdoildZUOhT4DzBWw9Pcku6EsULYwDvgeYnoeBqBJLD4HQsjAkS2bGre
37+
# 4FknCCUxy5DZYtLMmT5ye640xaVY7fqvBv6S0ZXHbcSsOb3rdd1oP0237OXqudakIKC2xRC1jMXAPbBy
38+
# 3CBWJ5RlqbHagSXcesTaAbk0Ai1tJXZVUN7m1pHX5OHNF1xhA8SnSlQHOxoShLvPEWitN2zER67AIQk1
39+
# LDHwlvQOrnHiRNrBV99ySlwX7J8FwxKTjdxmuoTbPIHbaif7w0pQDQt6nKLe4fPvFPDd5Lu0gfJ3ZYOw
40+
# 1trY1XjZkNFNE2jqdDS6GVQgcKaiFpmjfhQCRMX4NL5vmOIk6B3cS6zVaE6IEiew75lnk6b8KzBMg1dk
41+
# 6akQQ4RqALJWDbLnt6OHZ6eubn55jEOHUYktyJdV3rOThmViHAUH39ce8x44biYpCJc40DUjZmJsO34z
42+
# 2MV7PnceIckflN2f4RSmTomDGPjVWRVlb9u5m47h8bRZtuYJ3bzuLLLYZLFUthdGonQ1zlNKGvh1hqFA
43+
# E3yjgcggcpEwz26wMaMOratR9uQmAaIXkXzaG1Ml3AoHF0jOM8O1Q6C7cIqrT1H90JOAzAeU0qa9JRRJ
44+
# U1euM6ZQWpsyVZj4S91jOpYlmVjfoMi9JJEgUgd4v0RfbEbjwdc0kWr1jCmxcydWNWzQCG6V085pSqsc
45+
# mZ74OsW4aD1EsjTQ9A9ktLOhF9twmBHpYnGIZNVnIC9nULqh6EohQqEgUPfxTcBagpqZUhAveb4vwbPn
46+
# 5CmST2sLuIW820qgn9N01MTclyZizkkRfotq1xSIIgwErhLwmmUy3Q21uLrH6PJwE4R28TLANrtM25xb
47+
# Bx7ostqtWmbKm3xG7wds2jm3uRyT0zX2KaD32MUxijM6yN7J6PnsiC6VGFwxmeNDlBOakAcaukk4mlgm
48+
# iBGpFIPNPr6CvKtc1MpRHAQIP9QRRXiE8tzVxyp2j1o6Zi2gRTvKn1s1bK6CwaQmASOw8H448giwHmC2
49+
# hggupbFkkpurGDLIlPBEDY3RJaqaPPMW2ruwrjlLv183x7wJdn6pZmgwtjI0dKT6PeFkIhs9zcPTbXT6
50+
# fSR19u2QTvLrCuUNVr0PjQXVEQLFXUrL6AihLeNYwDsgyyQXxXtZXQ3JVRUbiASWgbhOtTYPPgyCPUJP
51+
# ggn6BVf1Xek1jex11lN21x7FDQXHwkfgImSJMtpIsn8w2O1pohIfLpjRRyxLv6BSwyMSlPFl6EzJaid9
52+
# S8WLXBbj8N9noamWF1Bce59JbfvmqgsiK2Rjyk0chk375sdFbd7NQzjcEoMmyDEY5oAGBIqXVmxOIoAa
53+
# --------------------------------------------------------------------------------
54+
55+
```

0 commit comments

Comments
 (0)