Lock views and prevent editing (#3094)

* working lock and unlock

* prevent flexible layout drop hints from showing

* fix lint issue

* wip

* disable mousedown when not editing in DisplayLayout

* continued wip

* Cherrypick new glyphs from add-new-glyphs-062320

* More new glyphs, updated art

- New glyphs: icon-unlocked and icon-target;
- Updated art for icon-lock glyph;

* Edit toggle refinements WIP

- Markup, CSS in BrowseBar.vue;

* More new glyphs, updated art

- New glyphs: icon-unlocked and icon-target;
- Updated art for icon-lock glyph;

* Edit toggle refinements

- Replaced toggle switch with button;

* prevent styling changes when locked

* fix lint issues

* fix tests

* make reviewer suggested changes

Co-authored-by: charlesh88 <charlesh88@gmail.com>
This commit is contained in:
Deep Tailor
2020-06-29 13:14:42 -07:00
committed by GitHub
parent 9d2991ee10
commit 6ab468086a
32 changed files with 1086 additions and 267 deletions

View File

@ -24,6 +24,7 @@
<layout-frame
:item="item"
:grid-size="gridSize"
:is-editing="isEditing"
@move="(gridDelta) => $emit('move', gridDelta)"
@endMove="() => $emit('endMove')"
>
@ -70,7 +71,11 @@ export default {
type: Number,
required: true
},
initSelect: Boolean
initSelect: Boolean,
isEditing: {
type: Boolean,
required: true
}
},
computed: {
style() {

View File

@ -24,14 +24,18 @@
<div
class="l-layout"
:class="{
'is-multi-selected': selectedLayoutItems.length > 1
'is-multi-selected': selectedLayoutItems.length > 1,
'allow-editing': isEditing
}"
@dragover="handleDragOver"
@click.capture="bypassSelection"
@drop="handleDrop"
>
<!-- Background grid -->
<div class="l-layout__grid-holder c-grid">
<div
v-if="isEditing"
class="l-layout__grid-holder c-grid"
>
<div
v-if="gridSize[0] >= 3"
class="c-grid__x l-grid l-grid-x"
@ -53,6 +57,7 @@
:init-select="initSelectIndex === index"
:index="index"
:multi-select="selectedLayoutItems.length > 1"
:is-editing="isEditing"
@move="move"
@endMove="endMove"
@endLineResize="endLineResize"
@ -138,6 +143,10 @@ export default {
domainObject: {
type: Object,
required: true
},
isEditing: {
type: Boolean,
required: true
}
},
data() {
@ -164,7 +173,7 @@ export default {
let selectionPath = this.selection[0];
let singleSelectedLine = this.selection.length === 1 &&
selectionPath[0].context.layoutItem && selectionPath[0].context.layoutItem.type === 'line-view';
return selectionPath && selectionPath.length > 1 && !singleSelectedLine;
return this.isEditing && selectionPath && selectionPath.length > 1 && !singleSelectedLine;
}
},
inject: ['openmct', 'options', 'objectPath'],
@ -352,6 +361,9 @@ export default {
.some(childId => this.openmct.objects.areIdsEqual(childId, identifier));
},
handleDragOver($event) {
if (this.internalDomainObject.locked) {
return;
}
// Get the ID of the dragged object
let draggedKeyString = $event.dataTransfer.types
.filter(type => type.startsWith(DRAG_OBJECT_TRANSFER_PREFIX))

View File

@ -24,6 +24,7 @@
<layout-frame
:item="item"
:grid-size="gridSize"
:is-editing="isEditing"
@move="(gridDelta) => $emit('move', gridDelta)"
@endMove="() => $emit('endMove')"
>
@ -70,7 +71,11 @@ export default {
type: Number,
required: true
},
initSelect: Boolean
initSelect: Boolean,
isEditing: {
type: Boolean,
required: true
}
},
computed: {
style() {

View File

@ -33,7 +33,7 @@
<div
class="c-frame-edit__move"
@mousedown="startMove([1,1], [0,0], $event)"
@mousedown="isEditing ? startMove([1,1], [0,0], $event) : null"
></div>
</div>
</template>
@ -54,6 +54,10 @@ export default {
required: true,
validator: (arr) => arr && arr.length === 2
&& arr.every(el => typeof el === 'number')
},
isEditing: {
type: Boolean,
required: true
}
},
computed: {

View File

@ -24,6 +24,7 @@
:item="item"
:grid-size="gridSize"
:title="domainObject && domainObject.name"
:is-editing="isEditing"
@move="(gridDelta) => $emit('move', gridDelta)"
@endMove="() => $emit('endMove')"
>
@ -95,6 +96,10 @@ export default {
index: {
type: Number,
required: true
},
isEditing: {
type: Boolean,
required: true
}
},
data() {

View File

@ -24,6 +24,7 @@
<layout-frame
:item="item"
:grid-size="gridSize"
:is-editing="isEditing"
@move="(gridDelta) => $emit('move', gridDelta)"
@endMove="() => $emit('endMove')"
>
@ -105,6 +106,10 @@ export default {
index: {
type: Number,
required: true
},
isEditing: {
type: Boolean,
required: true
}
},
data() {

View File

@ -24,6 +24,7 @@
<layout-frame
:item="item"
:grid-size="gridSize"
:is-editing="isEditing"
@move="(gridDelta) => $emit('move', gridDelta)"
@endMove="() => $emit('endMove')"
>
@ -75,7 +76,11 @@ export default {
type: Number,
required: true
},
initSelect: Boolean
initSelect: Boolean,
isEditing: {
type: Boolean,
required: true
}
},
computed: {
style() {

View File

@ -45,8 +45,7 @@
&[s-selected],
&[s-selected-parent] {
// Display grid and allow edit marquee to display in nested layouts when editing
> * > * > .l-layout {
background: $editUIGridColorBg;
> * > * > .l-layout + .allow-editing {
box-shadow: inset $editUIGridColorFg 0 0 2px 1px;
> [class*='grid-holder'] {