Skip to content

Commit

Permalink
refactor(files_sharing): split internal/external share (relayout)
Browse files Browse the repository at this point in the history
According to screen designs.

* Elements and lists reordered
* Headlines and separators introduced

Intermediate step: components need to be dissolved in the following
commits.

Refs: #48925
  • Loading branch information
thlehmann-ionos authored and nfebe committed Jan 20, 2025
1 parent 33c10e1 commit 544b80a
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 14 deletions.
1 change: 0 additions & 1 deletion apps/files_sharing/src/components/SharingInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

<template>
<div class="sharing-search">
<label for="sharing-search-input">{{ t('files_sharing', 'Search for share recipients') }}</label>
<NcSelect ref="select"
v-model="value"
input-id="sharing-search-input"
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/src/views/SharingDetailsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@ export default {
&__wrapper {
position: relative;
overflow: scroll;
flex-shrink: 1;
flex: 1 0 auto;
padding: 4px;
padding-inline-end: 12px;
}
Expand Down
37 changes: 25 additions & 12 deletions apps/files_sharing/src/views/SharingTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
</SharingEntrySimple>
</ul>

<h3>Internal shares</h3>
<!-- add new share input -->
<SharingInput v-if="!loading"
:can-reshare="canReshare"
Expand All @@ -34,13 +35,14 @@
:shares="shares"
@open-sharing-details="toggleShareDetailsView" />

<!-- link shares list -->
<SharingLinkList v-if="!loading"
ref="linkShareList"
:can-reshare="canReshare"
:file-info="fileInfo"
:shares="linkShares"
@open-sharing-details="toggleShareDetailsView" />
<!-- will move _into_ the dropdown component -->
<div style="border-top: 1px dotted grey;"></div>

<!-- internal link copy -->
<SharingEntryInternal :file-info="fileInfo" />

<div style="border-top: 1px dotted grey;"></div>
<!-- will move _into_ the dropdown component -->

<!-- other shares list -->
<SharingList v-if="!loading"
Expand All @@ -52,8 +54,16 @@
<!-- inherited shares -->
<SharingInherited v-if="canReshare && !loading" :file-info="fileInfo" />

<!-- internal link copy -->
<SharingEntryInternal :file-info="fileInfo" />
<hr>
<h3>External shares</h3>

<!-- link shares list -->
<SharingLinkList v-if="!loading"
ref="linkShareList"
:can-reshare="canReshare"
:file-info="fileInfo"
:shares="linkShares"
@open-sharing-details="toggleShareDetailsView" />
</div>

<!-- additional entries, use it with cautious -->
Expand All @@ -67,9 +77,8 @@

<!-- projects (deprecated as of NC25 (replaced by related_resources) - see instance config "projects.enabled" ; ignore this / remove it / move into own section) -->
<div v-show="!showSharingDetailsView && projectsEnabled && fileInfo"
class="sharingTab__additionalContent">
<CollectionList
:id="`${fileInfo.id}`"
class="sharingTab__additionalContent">
<CollectionList :id="`${fileInfo.id}`"
type="file"
:name="fileInfo.name" />
</div>
Expand Down Expand Up @@ -434,4 +443,8 @@ export default {
margin: 44px 0;
}
}

h3 {
font-weight: bold;
}
</style>

0 comments on commit 544b80a

Please sign in to comment.