better revoked credential handling

Author: Bushstar

java/demo/src/main/java/org/keychain/demo/ui/MainView.java

@@ -779,6 +779,11 @@ private Div heldSelector() {
             String value = event.getValue();
             if (value != null && !value.isBlank()) {
                 selectedHeldDid = value;
+                heldArea.clear();
+                updateHeldSelectionState();
+            } else {
+                selectedHeldDid = null;
+                heldArea.clear();
                 updateHeldSelectionState();
             }
         });
@@ -2054,6 +2059,7 @@ private void updateIssued() {
                 return;
             }
             issuedOriginal = json;
+            resetHeldSelection();
             showSuccess("Credential updated");
         } catch (Exception e) {
             showError(e.getMessage());
@@ -2073,6 +2079,7 @@ private void revokeIssued() {
                 return;
             }
             refreshIssued();
+            resetHeldSelection();
             showSuccess("Credential revoked");
         } catch (Exception e) {
             showError(e.getMessage());
@@ -2358,6 +2365,13 @@ private void updateIssuedSelectionState() {
         setButtonsEnabledOnValue(selected, issuedCopyButton);
     }
 
+    private void resetHeldSelection() {
+        heldSelect.clear();
+        selectedHeldDid = null;
+        heldArea.clear();
+        updateHeldSelectionState();
+    }
+
     private void setButtonsEnabledOnValue(String value, Button... buttons) {
         boolean enabled = value != null && !value.isBlank();
         for (Button button : buttons) {
@@ -3018,17 +3032,29 @@ private void updateHeldSelectionState() {
         boolean hasSelection = did != null && !did.isBlank();
 
         heldResolveSelectedButton.setEnabled(hasSelection);
-        heldDecryptSelectedButton.setEnabled(hasSelection);
         heldCopyButton.setEnabled(hasSelection);
 
         if (!hasSelection) {
+            heldDecryptSelectedButton.setEnabled(false);
             heldRemoveButton.setEnabled(false);
             heldPublishButton.setEnabled(false);
             heldRevealButton.setEnabled(false);
             heldUnpublishButton.setEnabled(false);
             return;
         }
 
+        boolean deactivatedEmpty = isDeactivatedEmptyCredential(did);
+        if (deactivatedEmpty) {
+            boolean unpublished = credentialUnpublished(did);
+            heldDecryptSelectedButton.setEnabled(false);
+            heldPublishButton.setEnabled(false);
+            heldRevealButton.setEnabled(false);
+            heldRemoveButton.setEnabled(true);
+            heldUnpublishButton.setEnabled(!unpublished);
+            return;
+        }
+
+        heldDecryptSelectedButton.setEnabled(true);
         boolean unpublished = credentialUnpublished(did);
         boolean published = credentialPublished(did);
         boolean revealed = credentialRevealed(did);
@@ -3070,6 +3096,28 @@ private boolean credentialUnpublished(String did) {
         return !manifest.containsKey(did);
     }
 
+    private boolean isDeactivatedEmptyCredential(String did) {
+        try {
+            MdipDocument doc = keymasterService.resolveDID(did);
+            if (doc == null || doc.didDocumentMetadata == null) {
+                return false;
+            }
+            if (!Boolean.TRUE.equals(doc.didDocumentMetadata.deactivated)) {
+                return false;
+            }
+            Object data = doc.didDocumentData;
+            if (data == null) {
+                return true;
+            }
+            if (data instanceof java.util.Map<?, ?>) {
+                return ((java.util.Map<?, ?>) data).isEmpty();
+            }
+            return false;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     private void updateSchemaCreateState() {
         String name = schemaNameField.getValue();
         schemaCreateButton.setEnabled(name != null && !name.isBlank());