Skip to content

Commit 0894bff

Browse files
committed
Now showing the Advanced Storage plugin in the plugins list.
1 parent 46dc2e6 commit 0894bff

File tree

6 files changed

+33
-2
lines changed

6 files changed

+33
-2
lines changed

Plugin/Plugin.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,10 @@ Json::Value GetPluginsConfiguration(bool& hasUserProfile)
461461
LOG(WARNING) << "When using OE2 and the authorization plugin together, you must set 'Authorization.CheckedLevel' to 'studies'. Unless you are using this orthanc only to generate tokens.";
462462
}
463463
}
464+
else if (pluginName == "advanced-storage")
465+
{
466+
pluginsConfiguration[pluginName]["Enabled"] = IsPluginEnabledInConfiguration("AdvancedStorage", "Enable", false);
467+
}
464468
else if (pluginName == "AWS S3 Storage")
465469
{
466470
pluginsConfiguration[pluginName]["Enabled"] = GetPluginConfiguration(pluginConfiguration, "AwsS3Storage");

WebApplication/src/components/Settings.vue

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ export default {
1111
return {
1212
verboseLevel: "default",
1313
delayedDeletionPendingFilesCount: 0,
14+
advancedStoragePendingDeletionFilesCount: 0,
15+
advancedStorageIndexerModeEnabled: false,
16+
advancedStorageDelayedDeletionModeEnabled: false,
1417
hkLastProcessedChange: -1,
1518
hkLastChangeToProcess: -1,
1619
};
@@ -34,6 +37,12 @@ export default {
3437
this.hkLastChangeToProcess = hkStatus["LastChangeToProcess"];
3538
this.hkLastProcessedChange = hkStatus["LastProcessedChange"];
3639
}
40+
if (this.hasAdvancedStorage) {
41+
const advstStatus = await api.getAdvancedStorageStatus();
42+
this.advancedStorageDelayedDeletionModeEnabled = advstStatus["DelayedDeletionIsActive"];
43+
this.advancedStorageIndexerModeEnabled = advstStatus["IndexerIsActive"];
44+
this.advancedStoragePendingDeletionFilesCount = advstStatus["FilesPendingDeletion"];
45+
}
3746
}
3847
},
3948
watch: {
@@ -77,6 +86,9 @@ export default {
7786
hasDelayedDeletionPlugin() {
7887
return 'delayed-deletion' in this.installedPlugins && this.installedPlugins['delayed-deletion'].Enabled;
7988
},
89+
async hasAdvancedStorageDelayedDeletion() {
90+
return 'advanced-storage' in this.installedPlugins && this.installedPlugins['advanced-storage'].Enabled && this.advancedStorageDelayedDeletionModeEnabled;
91+
},
8092
hasHousekeeperPlugin() {
8193
return 'housekeeper' in this.installedPlugins && this.installedPlugins['housekeeper'].Enabled;
8294
},
@@ -135,6 +147,11 @@ export default {
135147
</th>
136148
<td class="value">{{ delayedDeletionPendingFilesCount }}</td>
137149
</tr>
150+
<tr v-if="hasAdvancedStorageDelayedDeletion">
151+
<th scope="row" class="w-50 header"># {{ $t('plugins.advanced_storage.pending_deletion_files_count') }}
152+
</th>
153+
<td class="value">{{ advancedStoragePendingDeletionFilesCount }}</td>
154+
</tr>
138155
<tr v-if="hasHousekeeperPlugin">
139156
<th scope="row" class="w-50 header">{{ $t('plugins.housekeeper.progress_status') }}
140157
</th>

WebApplication/src/locales/en.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@
162162
"delayed_deletion": {
163163
"pending_files_count": "Delayed Deletion plugin: Files to delete"
164164
},
165+
"advanced_storage": {
166+
"pending_deletion_files_count": "Advanced Storage - Delayed Deletion: Files to delete"
167+
},
165168
"housekeeper": {
166169
"progress_status": "Housekeeper plugin: changes processed",
167170
"completed": "Completed"

WebApplication/src/locales/fr.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@
162162
"delayed_deletion": {
163163
"pending_files_count": "Delayed Deletion plugin: Fichiers à effacer"
164164
},
165+
"advanced_storage": {
166+
"pending_deletion_files_count": "Advanced Storage - Delayed Deletion: Fichiers à effacer"
167+
},
165168
"housekeeper": {
166169
"progress_status": "Housekeeper plugin: état d'avancement",
167170
"completed": "Terminé"

WebApplication/src/orthancApi.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,9 @@ export default {
434434
async getDelayedDeletionStatus() {
435435
return (await axios.get(orthancApiUrl + "plugins/delayed-deletion/status")).data;
436436
},
437+
async getAdvancedStorageStatus() {
438+
return (await axios.get(orthancApiUrl + "plugins/advanced-storage/status")).data;
439+
},
437440
async getHousekeeperStatus() {
438441
return (await axios.get(orthancApiUrl + "plugins/housekeeper/status")).data;
439442
},

release-notes.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
Pending changes
2-
===============
1+
1.8.5 (2025-06-17)
2+
==================
33

44
Changes:
55
- Now showing the number of files processed in the upload progress bar.
6+
- Now showing the Advanced Storage plugin in the plugins list.
67

78

89
1.8.4 (2025-06-11)

0 commit comments

Comments
 (0)