Update inventory controls and permissions filtering

lang/en.json

@@ -3233,6 +3233,7 @@
             "Tooltip": {
                 "disableEffect": "Disable Effect",
                 "enableEffect": "Enable Effect",
+                "edit": "Edit",
                 "openItemWorld": "Open Item World",
                 "openActorWorld": "Open Actor World",
                 "sendToChat": "Send to Chat",

module/applications/sheets/actors/character.mjs

@@ -12,8 +12,6 @@ export default class CharacterSheet extends DHBaseActorSheet {
     static DEFAULT_OPTIONS = {
         classes: ['character'],
         position: { width: 850, height: 800 },
-        /* Foundry adds disabled to all buttons and inputs if editPermission is missing. This is not desired. */
-        editPermission: CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER,
         actions: {
             toggleVault: CharacterSheet.#toggleVault,
             rollAttribute: CharacterSheet.#rollAttribute,
@@ -68,7 +66,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
                 }
             },
             {
-                handler: CharacterSheet.#getEquipamentContextOptions,
+                handler: CharacterSheet.#getEquipmentContextOptions,
                 selector: '[data-item-uuid][data-type="armor"], [data-item-uuid][data-type="weapon"]',
                 options: {
                     parentClassHooks: false,
@@ -170,6 +168,16 @@ export default class CharacterSheet extends DHBaseActorSheet {
         return applicationOptions;
     }
 
+    /** @inheritdoc */
+    _toggleDisabled(disabled) {
+        // Overriden to only disable text inputs by default.
+        // Everything else is done by checking @root.editable in the sheet
+        const form = this.form;
+        for (const input of form.querySelectorAll("input:not([type=search])")) {
+            input.disabled = disabled;
+        }
+    }
+
     /** @inheritDoc */
     async _onRender(context, options) {
         await super._onRender(context, options);
@@ -391,14 +399,14 @@ export default class CharacterSheet extends DHBaseActorSheet {
      * @this {CharacterSheet}
      * @protected
      */
-    static #getEquipamentContextOptions() {
+    static #getEquipmentContextOptions() {
         const options = [
             {
                 name: 'equip',
                 icon: 'fa-solid fa-hands',
                 condition: target => {
                     const doc = getDocFromElementSync(target);
-                    return doc && !doc.system.equipped;
+                    return doc.isOwner && doc && !doc.system.equipped;
                 },
                 callback: (target, event) => CharacterSheet.#toggleEquipItem.call(this, event, target)
             },
@@ -407,7 +415,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
                 icon: 'fa-solid fa-hands',
                 condition: target => {
                     const doc = getDocFromElementSync(target);
-                    return doc && doc.system.equipped;
+                    return doc.isOwner && doc && doc.system.equipped;
                 },
                 callback: (target, event) => CharacterSheet.#toggleEquipItem.call(this, event, target)
             }

module/applications/sheets/api/application-mixin.mjs

@@ -475,7 +475,7 @@ export default function DHApplicationMixin(Base) {
                         const doc = getDocFromElementSync(target);
                         return (
                             (!dataset.noCompendiumEdit && !doc) ||
-                            (doc && (!doc?.hasOwnProperty('systemPath') || doc?.inCollection))
+                            (doc?.isOwner && (!doc?.hasOwnProperty('systemPath') || doc?.inCollection))
                         );
                     },
                     callback: async target => (await getDocFromElement(target)).sheet.render({ force: true })
@@ -489,6 +489,7 @@ export default function DHApplicationMixin(Base) {
                     condition: target => {
                         const doc = getDocFromElementSync(target);
                         return (
+                            doc?.isOwner &&
                             !foundry.utils.isEmpty(doc?.system?.attack?.damage.parts) ||
                             !foundry.utils.isEmpty(doc?.damage?.parts)
                         );
@@ -511,7 +512,7 @@ export default function DHApplicationMixin(Base) {
                     icon: 'fa-solid fa-burst',
                     condition: target => {
                         const doc = getDocFromElementSync(target);
-                        return doc && !(doc.type === 'domainCard' && doc.system.inVault);
+                        return doc?.isOwner && !(doc.type === 'domainCard' && doc.system.inVault);
                     },
                     callback: async (target, event) => (await getDocFromElement(target)).use(event)
                 });
@@ -530,7 +531,8 @@ export default function DHApplicationMixin(Base) {
                     icon: 'fa-solid fa-trash',
                     condition: element => {
                         const target = element.closest('[data-item-uuid]');
-                        return target.dataset.itemType !== 'beastform';
+                        const doc = getDocFromElementSync(target);
+                        return doc?.isOwner && target.dataset.itemType !== 'beastform';
                     },
                     callback: async (target, event) => {
                         const doc = await getDocFromElement(target);

styles/less/sheets/actors/character/sheet.less

@@ -11,21 +11,6 @@
         padding-bottom: 0;
         overflow-x: auto;
 
-        &.viewMode {
-            button:not(.btn-toggle-view),
-            input:not(.search),
-            .controls,
-            .character-sidebar-sheet,
-            .img-portait,
-            .name-row,
-            .hope-section,
-            .downtime-section,
-            .character-traits,
-            .card-list {
-                pointer-events: none;
-            }
-        }
-
         .character-sidebar-sheet {
             grid-row: 1 / span 2;
             grid-column: 1;

styles/less/sheets/actors/character/sidebar.less

@@ -316,9 +316,9 @@
                     border-radius: 3px;
                     background: light-dark(@dark-blue, @golden);
                     clip-path: none;
-                    cursor: pointer;
                     display: flex;
                     align-items: center;
+                    justify-content: center;
                     gap: 4px;
                     border: 1px solid transparent;
                     transition: all 0.3s ease;

templates/sheets/actors/adversary/effects.hbs

@@ -6,7 +6,7 @@
         type='effect'
         isGlassy=true
         collection=effects.actives
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         }}
 
@@ -15,7 +15,7 @@
         type='effect'
         isGlassy=true
         collection=effects.inactives
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         }}
     </div>

templates/sheets/actors/adversary/features.hbs

@@ -6,8 +6,8 @@
             type='feature'
             collection=@root.features
             hideContextMenu=true
-            canCreate=true
+            canCreate=@root.editable
-            showActions=true
+            showActions=@root.editable
         }}
     </div>
 </section>

templates/sheets/actors/character/effects.hbs

@@ -7,7 +7,7 @@
         type='effect'
         isGlassy=true
         collection=effects.actives
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         }}
 
@@ -16,7 +16,7 @@
         type='effect'
         isGlassy=true
         collection=effects.inactives
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         disabled=true
         }}

templates/sheets/actors/character/features.hbs

@@ -8,8 +8,8 @@
             type='feature'
             actorType='character'
             collection=category.values
-            canCreate=true
+            canCreate=@root.editable
-            showActions=true
+            showActions=@root.editable
         }}
         {{else if category.values}}
         {{> 'daggerheart.inventory-items'
@@ -18,7 +18,7 @@
             actorType='character'
             collection=category.values
             canCreate=false
-            showActions=true
+            showActions=@root.editable
         }}
 
         {{/if}}

templates/sheets/actors/character/header.hbs

@@ -4,6 +4,7 @@
         <h1 class="actor-name input" contenteditable="plaintext-only" data-property="name" placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}">{{source.name}}</h1>
         <div class='level-div'>
             <h3 class='label'>
+                {{#if @root.editable}}
                     {{#if document.system.needsCharacterSetup}}
                         <button
                             type="button"
@@ -21,6 +22,7 @@
                             <i class="fa-solid fa-angles-up"></i>
                         </button>
                     {{/if}}
+                {{/if}}
                 {{#unless document.system.needsCharacterSetup}}
                     {{localize 'DAGGERHEART.GENERAL.level'}}
                     <input type="text" data-dtype="Number" class="level-value" value={{#if document.system.needsCharacterSetup}}0{{else}}{{document.system.levelData.level.changed}}{{/if}} {{#if document.system.needsCharacterSetup}}disabled{{/if}} />
@@ -110,12 +112,14 @@
                     <i class="fa-solid fa-fw fa-users"></i>
                 </button>
             {{/if}}
+            {{#if @root.editable}}
                 <button type="button" data-action="useDowntime" data-type="shortRest" data-tooltip="DAGGERHEART.APPLICATIONS.Downtime.shortRest.title">
                     <i class="fa-solid fa-fw fa-utensils"></i>
                 </button>
                 <button type="button" data-action="useDowntime" data-type="longRest" data-tooltip="DAGGERHEART.APPLICATIONS.Downtime.longRest.title">
                     <i class="fa-solid fa-fw fa-bed"></i>
                 </button>
+            {{/if}}
         </div>
     </div>
 

templates/sheets/actors/character/inventory.hbs

@@ -22,7 +22,7 @@
         type='weapon'
         collection=@root.inventory.weapons
         isGlassy=true
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         }}
         {{> 'daggerheart.inventory-items'
@@ -30,7 +30,7 @@
         type='armor'
         collection=@root.inventory.armor
         isGlassy=true
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         }}
         {{> 'daggerheart.inventory-items'
@@ -38,7 +38,7 @@
         type='consumable'
         collection=@root.inventory.consumables
         isGlassy=true
-        canCreate=true
+        canCreate=@root.editable
         isQuantifiable=true
         }}
         {{> 'daggerheart.inventory-items'
@@ -46,8 +46,8 @@
         type='loot'
         collection=@root.inventory.loot
         isGlassy=true
-        canCreate=true
+        canCreate=@root.editable
-        showActions=true
+        showActions=@root.editable
         isQuantifiable=true
         }}
     </div>

templates/sheets/actors/character/loadout.hbs

@@ -27,7 +27,7 @@
         isGlassy=true
         cardView=cardView
         collection=document.system.domainCards.loadout
-        canCreate=true
+        canCreate=@root.editable
         }}
         {{> 'daggerheart.inventory-items'
         title='DAGGERHEART.GENERAL.Tabs.vault'
@@ -35,7 +35,7 @@
         isGlassy=true
         cardView=cardView
         collection=document.system.domainCards.vault
-        canCreate=true
+        canCreate=@root.editable
         inVault=true
         }}
     </div>

templates/sheets/actors/character/sidebar.hbs

@@ -45,11 +45,11 @@
                             </a>
                         {{/times}}
                         </div>
-                        <a class="slot-label" data-action="toggleArmorMangement">
+                        <a class="slot-label" data-action="toggleArmorMangement" {{disabled (not @root.editable)}}>
                             <span class="label">{{localize "DAGGERHEART.GENERAL.armorSlots"}}</span>
                             <div class="slot-value-container">
                                 <span class="value">{{document.system.armorScore.value}} / {{document.system.armorScore.max}}</span>
-                                <i class="fa-solid fa-gear"></i>
+                                {{#if @root.editable}}<i class="fa-solid fa-gear" inert></i>{{/if}}
                             </div>
                         </a> 
                     </div>
@@ -64,9 +64,9 @@
                         value='{{document.system.armorScore.value}}'
                         max='{{document.system.armorScore.max}}'
                     ></progress>
-                    <a class="status-label" data-action="toggleArmorMangement">
+                    <a class="status-label" data-action="toggleArmorMangement" {{disabled (not @root.editable)}}>
                         <h4>{{localize "DAGGERHEART.GENERAL.armorSlots"}}</h4>
-                        <i class="fa-solid fa-gear"></i>
+                        {{#if @root.editable}}<i class="fa-solid fa-gear" inert></i>{{/if}}
                     </a>
                     {{/if}}
                 </div>

templates/sheets/actors/companion/effects.hbs

@@ -6,7 +6,7 @@
         type='effect'
         isGlassy=true
         collection=effects.actives
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         }}
 
@@ -15,7 +15,7 @@
         type='effect'
         isGlassy=true
         collection=effects.inactives
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         }}
     </div>

templates/sheets/actors/environment/features.hbs

@@ -9,8 +9,8 @@
         type='feature'
         collection=@root.features
         hideContextMenu=true
-        canCreate=true
+        canCreate=@root.editable
-        showActions=true
+        showActions=@root.editable
         }}
     </div>
 </section>

templates/sheets/actors/party/inventory.hbs

@@ -26,7 +26,7 @@
         actorType='party'
         collection=@root.inventory.weapons
         isGlassy=true
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         hideContextMenu=true
         isQuantifiable=true
@@ -37,7 +37,7 @@
         actorType='party'
         collection=@root.inventory.armor
         isGlassy=true
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
         hideContextMenu=true
         isQuantifiable=true
@@ -48,7 +48,7 @@
         actorType='party'
         collection=@root.inventory.consumables
         isGlassy=true
-        canCreate=true
+        canCreate=@root.editable
         hideContextMenu=true
         isQuantifiable=true
         }}
@@ -58,7 +58,7 @@
         actorType='party'
         collection=@root.inventory.loot
         isGlassy=true
-        canCreate=true
+        canCreate=@root.editable
         hideContextMenu=true
         isQuantifiable=true
         }}

templates/sheets/global/partials/inventory-fieldset-items-V2.hbs

@@ -52,12 +52,11 @@ Parameters:
   {{else}}
   <ul class="items-list">
     {{#each collection as |item|}}
-
     {{> 'daggerheart.inventory-item'
     item=item
     type=../type
     disabledEffect=../disabledEffect
-    actorType=../actorType
+    actorType=(ifThen ../actorType ../actorType @root.document.type)
     hideControls=../hideControls
     hideContextMenu=../hideContextMenu
     isActor=../isActor

templates/sheets/global/partials/inventory-item-V2.hbs

@@ -72,62 +72,59 @@ Parameters:
     {{!-- Controls --}}
     {{#unless hideControls}}
         <div class="controls">
-    {{#if isActor}}
+            {{!-- Toggle/Equip buttons --}}
-      <a data-action="editDoc" data-tooltip="DAGGERHEART.UI.Tooltip.openActorWorld">
+            {{#if @root.editable}}
-        <i class="fa-solid fa-globe"></i>
+                {{#if (and (eq actorType 'character') (eq type 'weapon'))}}
-      </a>
-      {{#if (eq type 'adversary')}}
-      <a data-action='deleteAdversary' data-category="{{categoryAdversary}}" data-tooltip="CONTROLS.CommonDelete">
-        <i class='fas fa-trash'></i>
-      </a>
-      {{/if}}
-      {{#if (eq type 'character')}}
-      <a data-action='deletePartyMember' data-tooltip="CONTROLS.CommonDelete">
-        <i class='fas fa-trash'></i>
-      </a>
-      {{/if}}
-    {{else}}
-      {{#unless (eq actorType 'party')}}
-        {{#if (eq type 'weapon')}}
                     <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
                         data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
-          <i class="fa-solid fa-hands"></i>
+                        <i class="fa-solid fa-hands" inert></i>
-        </a>
-        {{else if (eq type 'armor')}}
-        <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
-          data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
-          <i class="fa-solid fa-fw fa-shield"></i>
                     </a>
                 {{/if}}
-        {{#if (eq type 'domainCard')}}
+                {{#if (and (eq actorType 'character') (eq type 'armor'))}}
+                    <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
+                        data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
+                        <i class="fa-solid fa-fw fa-shield" inert></i>
+                    </a>
+                {{/if}}
+                {{#if (and (eq type 'domainCard'))}}
                     <a data-action="toggleVault"
                         data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.inVault 'sendToLoadout' 'sendToVault' }}">
-          <i class="fa-solid {{ifThen item.system.inVault 'fa-arrow-up' 'fa-arrow-down'}}"></i>
+                        <i class="fa-solid {{ifThen item.system.inVault 'fa-arrow-up' 'fa-arrow-down'}}" inert></i>
                     </a>
-        {{else if (and (eq type 'effect') (not (eq item.type 'beastform')))}}
+                {{/if}}
+                {{#if (and (and (eq type 'effect') (not (eq item.type 'beastform'))))}}
                     <a data-action="toggleEffect"
                         data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.disabled 'enableEffect' 'disableEffect' }}">
-          <i class="{{ifThen item.disabled 'fa-solid fa-toggle-off' 'fa-solid fa-toggle-on'}}"></i>
+                        <i class="{{ifThen item.disabled 'fa-solid fa-toggle-off' 'fa-solid fa-toggle-on'}}" inert></i>
                     </a>
                 {{/if}}
+            {{/if}}
+
+            {{!-- Send to Chat --}}
             {{#if (hasProperty item "toChat")}}
                 <a data-action="toChat" data-tooltip="DAGGERHEART.UI.Tooltip.sendToChat">
-            <i class="fa-regular fa-fw fa-message"></i>
+                    <i class="fa-regular fa-fw fa-message" inert></i>
                 </a>
             {{/if}}
-      {{else}}
+
-        <a data-action="editDoc" data-tooltip="DAGGERHEART.UI.Tooltip.openActorWorld">
+            {{!-- Document management buttons or context menu --}}
-          <i class="fa-solid fa-globe"></i>
+            {{#if (and (not isActor) (not hideContextMenu))}}
-        </a>
-        <a data-action="deleteItem" data-tooltip="DAGGERHEART.UI.Tooltip.deleteItem">
-          <i class="fa-solid fa-trash"></i>
-        </a>
-      {{/unless}}
-      {{#unless hideContextMenu}}
                 <a data-action="triggerContextMenu" data-tooltip="DAGGERHEART.UI.Tooltip.moreOptions">
-        <i class="fa-solid fa-fw fa-ellipsis-vertical"></i>
+                    <i class="fa-solid fa-fw fa-ellipsis-vertical" inert></i>
                 </a>
-      {{/unless}}
+            {{else if @root.editable}}
+                <a data-action="editDoc" data-tooltip="DAGGERHEART.UI.Tooltip.edit">
+                    <i class="fa-solid fa-edit" inert></i>
+                </a>
+                {{#if (not isActor)}}
+                    <a data-action="deleteItem" data-tooltip="DAGGERHEART.UI.Tooltip.deleteItem">
+                        <i class="fa-solid fa-trash" inert></i>
+                    </a>
+                {{else if (eq type 'adversary')}}
+                    <a data-action='deleteAdversary' data-category="{{categoryAdversary}}" data-tooltip="CONTROLS.CommonDelete">
+                        <i class="fas fa-trash" inert></i>
+                    </a>
+                {{/if}}
             {{/if}}
         </div>
     {{/unless}}

templates/sheets/global/partials/inventory-item-compact.hbs

@@ -48,6 +48,7 @@
                 </a>
             {{/if}}
         {{else}}
+            {{#if @root.editable}}
                 {{#if (eq type 'weapon')}}
                 <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
                     data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
@@ -69,6 +70,7 @@
                     <i class="fa-solid fa-fw {{ifThen item.disabled 'fa-toggle-off' 'fa-toggle-on'}}"></i>
                 </a>
                 {{/if}}
+            {{/if}}
             {{#if (hasProperty item "toChat")}}
             <a data-action="toChat" data-tooltip="DAGGERHEART.UI.Tooltip.sendToChat">
                 <i class="fa-regular fa-fw fa-message"></i>

templates/sheets/global/tabs/tab-actions.hbs

@@ -8,6 +8,6 @@
     title='DAGGERHEART.GENERAL.Action.plural'
     collection=document.system.actions
     type='action'
-    canCreate=true
+    canCreate=@root.editable
 }}
 </section>

templates/sheets/global/tabs/tab-effects.hbs

@@ -6,7 +6,7 @@
         type='effect'
         isGlassy=true
         collection=effects.actives
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
     }}
 
@@ -16,7 +16,7 @@
         disabledEffect=true
         isGlassy=true
         collection=effects.inactives
-        canCreate=true
+        canCreate=@root.editable
         hideResources=true
     }}
 </section>