Skip to content

Commit e575166

Browse files
authored
Merge pull request #5 from nroduit/viewer-hub_documentation_update
feat: adapt viewer-hub documentation following renaming
2 parents 5e6b255 + e611fe6 commit e575166

File tree

8 files changed

+154
-17
lines changed

8 files changed

+154
-17
lines changed

content/viewer-hub/debug.en.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ We recommend the use of [IntelliJ IDEA](https://www.jetbrains.com/idea/) because
1212
## Add a Launcher
1313

1414
- Open _Run > Edit Configurations..._
15-
- Aad in _VM options_ the following properties:
15+
- Add in _VM options_ the following properties:
1616
```
1717
-Duser.timezone=UTC
1818
-DENVIRONMENT=local
@@ -24,14 +24,14 @@ We recommend the use of [IntelliJ IDEA](https://www.jetbrains.com/idea/) because
2424
-DBACKEND_URI=http://localhost:8081
2525
-DDB_HOST=localhost
2626
-DDB_PORT=45101
27-
-DDB_NAME=weasis-manager
28-
-DDB_USER=weasis-manager
29-
-DDB_PASSWORD=weasis-manager
30-
-DCONFIGSERVER_URI=http://configdecrypt:987654321@localhost:8888
27+
-DDB_NAME=viewer-hub
28+
-DDB_USER=viewer-hub
29+
-DDB_PASSWORD=viewer-hub
30+
-DCONFIGSERVER_URI=http://localhost:8888
3131
-DS3_ACCESS_KEY=access-key
3232
-DS3_SECRET_KEY=secret-key
3333
-DS3_ENDPOINT=http://localhost:9080
34-
-DS3_BUCKET_NAME=weasis-manager-bucket
34+
-DS3_BUCKET_NAME=viewer-hub-bucket
3535
-DBACKEND_URI=http://localhost:8081
3636
```
3737
- Then clean/install + Run...
@@ -45,8 +45,8 @@ http://localhost:8081
4545
with
4646

4747
```
48-
User: weasis-manager-user
49-
Password: weasis-manager-password
48+
User: viewer-hub-user
49+
Password: password
5050
```
5151

5252
## Launch Weasis

content/viewer-hub/hub.en.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ Minio is an open-source object storage server compatible with Amazon S3 APIs. It
5050
Access the Minio console at: http://localhost:9090
5151

5252
Use the following credentials:
53-
- User: `weasis-manager`
54-
- Password: `weasis-manager`
53+
- User: `viewer-hub`
54+
- Password: `viewer-hub`
5555

5656
## Keycloak
5757

@@ -81,7 +81,7 @@ ViewerHub is a web application that manages the resources required by the differ
8181
Access the ViewerHub console at: http://localhost:8081
8282

8383
Use the following credentials:
84-
- User: `weasis-manager-user`
85-
- Password: `weasis-manager-password`
84+
- User: `viewer-hub-user`
85+
- Password: `password`
8686

8787

content/viewer-hub/manifest.en.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ weight: 80
88

99
## Manifest
1010

11-
The manifest contains the list of exams, series, and instances to retrieve when loading images by Weasis. It is represented in this [format](../../basics/customize/integration/#build-an-xml-manifest).
11+
The manifest contains the list of exams, series, and instances to retrieve when loading images by Weasis.
12+
13+
The manifest is represented in this [format](../../basics/customize/integration/#build-an-xml-manifest).
1214

1315
The creation of the manifest occurs when a client calls ViewerHub to launch Weasis through the launch URL using the [Launch APIs](../api).
1416

content/viewer-hub/user-guide/package.en.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,21 @@ weight: 60
77

88
## Compatibility file
99

10-
A compatibility file named "version-compatibility.json" is present in each Weasis release <br/> (in the weasis-native.zip file => bin-dist => weasis => conf).
10+
A compatibility file named "version-compatibility.json" is present in each Weasis release. <br/>
11+
12+
{{< highlight text >}}
13+
weasis-native.zip
14+
└── bin-dist/
15+
└── weasis/
16+
└── conf/
17+
└── version-compatibility.json
18+
{{< /highlight >}}
1119

1220
This file contains the mapping between the release version ("release-version") and the minimum version of Weasis that should be installed on the client workstation ("minimal-version").
1321

1422
This file also indicates which translation version should be used ("i18n-version").
1523

16-
![version_compatibility_file.png](/viewer-hub/compatibility/version_compatibility_file.png)
24+
{{< version-compatibility >}}
1725

1826
## Cache
1927

@@ -25,8 +33,8 @@ So when a client will launch Weasis via ViewerHub, it will directly know which v
2533

2634
## Minio/S3
2735

28-
By importing a new version of Weasis into ViewerHub, if the compatibility file is more recent, ViewerHub will replace the compatibility file present on the S3. This compatibility file will be renamed on S3 "mapping-minimal-version.json"
36+
By importing a new version of Weasis into ViewerHub, if the compatibility file is more recent, ViewerHub will replace the compatibility file present on the S3.
2937

30-
![s3_compatibility_file.png](/viewer-hub/compatibility/s3_compatibility_file.png)
38+
This compatibility file will be renamed in the S3 bucket "mapping-minimal-version.json"
3139

3240
In order to compare if this mapping file is more recent, ViewerHub will compare the version number of the latest release.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{{ $jsonFile := readFile "/static/viewer-hub/compatibility/version-compatibility.json" }}
2+
{{ $data := unmarshal $jsonFile }}
3+
<table>
4+
<thead>
5+
<tr>
6+
<th>Release Version</th>
7+
<th>Minimal Version</th>
8+
<th>i18n Version</th>
9+
</tr>
10+
</thead>
11+
<tbody>
12+
{{ range $index, $element := $data }}
13+
<tr>
14+
<td>{{ index $element "release-version" }}</td>
15+
<td>{{ index $element "minimal-version" }}</td>
16+
<td>{{ index $element "i18n-version" }}</td>
17+
</tr>
18+
{{ end }}
19+
</tbody>
20+
</table>
-19.7 KB
Binary file not shown.
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
[
2+
{
3+
"release-version": "3.6.0",
4+
"minimal-version": "3.6.0",
5+
"i18n-version": "2.0.0-SNAPSHOT"
6+
},
7+
{
8+
"release-version": "3.6.1",
9+
"minimal-version": "3.6.0",
10+
"i18n-version": "2.0.0-SNAPSHOT"
11+
},
12+
{
13+
"release-version": "3.6.2",
14+
"minimal-version": "3.6.0",
15+
"i18n-version": "2.0.0-SNAPSHOT"
16+
},
17+
{
18+
"release-version": "3.7.0",
19+
"minimal-version": "3.7.0",
20+
"i18n-version": "3.0.0-SNAPSHOT"
21+
},
22+
{
23+
"release-version": "3.7.1",
24+
"minimal-version": "3.7.0",
25+
"i18n-version": "3.0.0-SNAPSHOT"
26+
},
27+
{
28+
"release-version": "3.8.0",
29+
"minimal-version": "3.7.0",
30+
"i18n-version": "3.0.0-SNAPSHOT"
31+
},
32+
{
33+
"release-version": "3.8.1",
34+
"minimal-version": "3.7.0",
35+
"i18n-version": "3.0.0-SNAPSHOT"
36+
},
37+
{
38+
"release-version": "3.8.2",
39+
"minimal-version": "3.7.0",
40+
"i18n-version": "3.0.0-SNAPSHOT"
41+
},
42+
{
43+
"release-version": "4.0.0",
44+
"minimal-version": "4.0.0",
45+
"i18n-version": "3.0.0-SNAPSHOT"
46+
},
47+
{
48+
"release-version": "4.0.1",
49+
"minimal-version": "4.0.0",
50+
"i18n-version": "3.0.0-SNAPSHOT"
51+
},
52+
{
53+
"release-version": "4.0.2",
54+
"minimal-version": "4.0.0",
55+
"i18n-version": "3.0.0-SNAPSHOT"
56+
},
57+
{
58+
"release-version": "4.0.3",
59+
"minimal-version": "4.0.0",
60+
"i18n-version": "3.0.0-SNAPSHOT"
61+
},
62+
{
63+
"release-version": "4.1.0",
64+
"minimal-version": "4.1.0",
65+
"i18n-version": "4.0.0-SNAPSHOT"
66+
},
67+
{
68+
"release-version": "4.1.1",
69+
"minimal-version": "4.1.0",
70+
"i18n-version": "4.0.0-SNAPSHOT"
71+
},
72+
{
73+
"release-version": "4.1.2",
74+
"minimal-version": "4.1.0",
75+
"i18n-version": "4.0.0-SNAPSHOT"
76+
},
77+
{
78+
"release-version": "4.2.0",
79+
"minimal-version": "4.2.0",
80+
"i18n-version": "4.0.0-SNAPSHOT"
81+
},
82+
{
83+
"release-version": "4.2.1",
84+
"minimal-version": "4.2.0",
85+
"i18n-version": "4.0.0-SNAPSHOT"
86+
},
87+
{
88+
"release-version": "4.3.0",
89+
"minimal-version": "4.2.0",
90+
"i18n-version": "4.0.0-SNAPSHOT"
91+
},
92+
{
93+
"release-version": "4.4.0",
94+
"minimal-version": "4.4.0",
95+
"i18n-version": "4.0.0-SNAPSHOT"
96+
},
97+
{
98+
"release-version": "4.5.0",
99+
"minimal-version": "4.5.0",
100+
"i18n-version": "4.0.0-SNAPSHOT"
101+
},
102+
{
103+
"release-version": "4.5.1",
104+
"minimal-version": "4.5.0",
105+
"i18n-version": "4.0.0-SNAPSHOT"
106+
}
107+
]
-25 KB
Binary file not shown.

0 commit comments

Comments
 (0)