Skip to content

Commit b578f99

Browse files
refactor(files_sharing): split internal/external share (relayout)
According to screen designs. * Elements and lists reordered * Headlines and separators introduced Intermediate step: components need to be dissolved in the following commits. Refs: nextcloud#48925
1 parent 918f28f commit b578f99

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

apps/files_sharing/src/components/SharingInput.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
<template>
77
<div class="sharing-search">
8-
<label for="sharing-search-input">{{ t('files_sharing', 'Search for share recipients') }}</label>
98
<NcSelect ref="select"
109
v-model="value"
1110
input-id="sharing-search-input"
@@ -17,7 +16,7 @@
1716
:clear-search-on-blur="() => false"
1817
:user-select="true"
1918
:options="options"
20-
@search="asyncFind"
19+
@open="asyncFind"
2120
@option:selected="onSelected">
2221
<template #no-options="{ search }">
2322
{{ search ? noResultText : t('files_sharing', 'No recommendations. Start typing.') }}

apps/files_sharing/src/views/SharingDetailsTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ export default {
10581058
&__wrapper {
10591059
position: relative;
10601060
overflow: scroll;
1061-
flex-shrink: 1;
1061+
flex: 1 0 auto;
10621062
padding: 4px;
10631063
padding-right: 12px;
10641064
}

apps/files_sharing/src/views/SharingTab.vue

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
</SharingEntrySimple>
2626
</ul>
2727

28+
<h3>Internal shares</h3>
2829
<!-- add new share input -->
2930
<SharingInput v-if="!loading"
3031
:can-reshare="canReshare"
@@ -34,13 +35,14 @@
3435
:shares="shares"
3536
@open-sharing-details="toggleShareDetailsView" />
3637

37-
<!-- link shares list -->
38-
<SharingLinkList v-if="!loading"
39-
ref="linkShareList"
40-
:can-reshare="canReshare"
41-
:file-info="fileInfo"
42-
:shares="linkShares"
43-
@open-sharing-details="toggleShareDetailsView" />
38+
<!-- will move _into_ the dropdown component -->
39+
<div style="border-top: 1px dotted grey;"></div>
40+
41+
<!-- internal link copy -->
42+
<SharingEntryInternal :file-info="fileInfo" />
43+
44+
<div style="border-top: 1px dotted grey;"></div>
45+
<!-- will move _into_ the dropdown component -->
4446

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

55-
<!-- internal link copy -->
56-
<SharingEntryInternal :file-info="fileInfo" />
57+
<hr>
58+
<h3>External shares</h3>
59+
60+
<!-- link shares list -->
61+
<SharingLinkList v-if="!loading"
62+
ref="linkShareList"
63+
:can-reshare="canReshare"
64+
:file-info="fileInfo"
65+
:shares="linkShares"
66+
@open-sharing-details="toggleShareDetailsView" />
5767
</div>
5868

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

6878
<!-- projects (deprecated as of NC25 (replaced by related_resources) - see instance config "projects.enabled" ; ignore this / remove it / move into own section) -->
6979
<div v-show="!showSharingDetailsView && projectsEnabled && fileInfo"
70-
class="sharingTab__additionalContent">
71-
<CollectionList
72-
:id="`${fileInfo.id}`"
80+
class="sharingTab__additionalContent">
81+
<CollectionList :id="`${fileInfo.id}`"
7382
type="file"
7483
:name="fileInfo.name" />
7584
</div>
@@ -432,4 +441,8 @@ export default {
432441
margin: 44px 0;
433442
}
434443
}
444+
445+
h3 {
446+
font-weight: bold;
447+
}
435448
</style>

0 commit comments

Comments
 (0)