(cloudstack) branch fix-ss-access-status updated (3551598c5f3 -> 0b23939c773)

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a change to branch fix-ss-access-status
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 3551598c5f3 Image Store: View Access status of the image store and view events
     new 0b23939c773 Image Store: View Access status of the image store and view events

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (3551598c5f3)
            \
             N -- N -- N   refs/heads/fix-ss-access-status (0b23939c773)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ui/src/config/section/infra/secondaryStorages.js | 1 -
 1 file changed, 1 deletion(-)

(cloudstack) 01/01: Image Store: View Access status of the image store and view events

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a commit to branch fix-ss-access-status
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 0b23939c773a8ca99239208083abda5cac7eff85
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Mon Jan 8 13:38:13 2024 -0500

    Image Store: View Access status of the image store and view events
---
 api/src/main/java/com/cloud/event/EventTypes.java              | 2 ++
 server/src/main/java/com/cloud/storage/StorageManagerImpl.java | 2 ++
 ui/src/components/view/ListView.vue                            | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
index 67fed5500ee..5d525229095 100644
--- a/api/src/main/java/com/cloud/event/EventTypes.java
+++ b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -400,6 +400,7 @@ public class EventTypes {
     public static final String EVENT_IMAGE_STORE_DATA_MIGRATE = "IMAGE.STORE.MIGRATE.DATA";
     public static final String EVENT_IMAGE_STORE_RESOURCES_MIGRATE = "IMAGE.STORE.MIGRATE.RESOURCES";
     public static final String EVENT_IMAGE_STORE_OBJECT_DOWNLOAD = "IMAGE.STORE.OBJECT.DOWNLOAD";
+    public static final String EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE = "IMAGE.STORE.ACCESS.UPDATED";
 
     // Configuration Table
     public static final String EVENT_CONFIGURATION_VALUE_EDIT = "CONFIGURATION.VALUE.EDIT";
@@ -1164,6 +1165,7 @@ public class EventTypes {
 
         entityEventDetails.put(EVENT_IMAGE_STORE_DATA_MIGRATE, ImageStore.class);
         entityEventDetails.put(EVENT_IMAGE_STORE_OBJECT_DOWNLOAD, ImageStore.class);
+        entityEventDetails.put(EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE, ImageStore.class);
         entityEventDetails.put(EVENT_LIVE_PATCH_SYSTEMVM, "SystemVMs");
 
         //Object Store
diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
index 04889d0b2a8..615c7b6760e 100644
--- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@ -3261,6 +3261,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
     }
 
     @Override
+    @ActionEvent(eventType = EventTypes.EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE,
+            eventDescription = "image store access updated")
     public ImageStore updateImageStoreStatus(Long id, Boolean readonly) {
         // Input validation
         ImageStoreVO imageStoreVO = _imageStoreDao.findById(id);
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index a61f1930f71..093e7d663a0 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -340,7 +340,7 @@
       <template v-if="column.key === 'softwareversion'">
         <span>  {{ record.softwareversion ? record.softwareversion : 'N/A' }} </span>
       </template>
-      <template v-if="column.key === 'access'">
+      <template v-if="column.key === 'readonly'">
         <status :text="record.readonly ? 'ReadOnly' : 'ReadWrite'" displayText />
       </template>
       <template v-if="column.key === 'requiresupgrade'">