fixes and refactor

This commit is contained in:
Liyas Thomas
2021-05-14 05:50:17 +00:00
committed by GitHub
parent 2b8cda40a2
commit 8f09c82763
13 changed files with 107 additions and 87 deletions

View File

@@ -5,7 +5,7 @@
<SmartTab
:id="'team-collections'"
:label="'Team Collections'"
v-if="currentUser && currentUser.eaInvited"
v-if="currentUser && currentUser.eaInvited && !doc"
>
<ul>
<li>
@@ -40,6 +40,7 @@ import { currentUserInfo$ } from "~/helpers/teams/BackendUserInfo"
export default {
props: {
doc: Boolean,
show: Boolean,
},
subscriptions() {

View File

@@ -13,6 +13,7 @@
<CollectionsChooseType
:collectionsType="collectionsType"
:show="showTeamCollections"
:doc="doc"
@update-collection-type="updateCollectionType"
@update-selected-team="updateSelectedTeam"
/>
@@ -108,7 +109,8 @@
@edit-folder="editFolder($event)"
@edit-request="editRequest($event)"
@update-team-collections="updateTeamCollections"
@select-collection="$emit('use-collection', index)"
@select-collection="$emit('use-collection', collection)"
@unselect-collection="$emit('remove-collection', collection)"
@select-folder="
$emit('select-folder', {
folderName:
@@ -128,11 +130,10 @@
picked = $event.id
}
"
@unselect-collection="$emit('remove-collection', collection)"
@expand-collection="expandCollection"
@remove-collection="removeCollection"
@remove-request="removeRequest"
:picked="picked"
:picked="picked.toString()"
/>
</li>
</ul>

View File

@@ -12,7 +12,9 @@
<button class="icon" @click="toggleShowChildren">
<i class="material-icons" v-show="!showChildren && !isFiltered">arrow_right</i>
<i class="material-icons" v-show="showChildren || isFiltered">arrow_drop_down</i>
<i v-if="picked === collectionIndex" class="text-green-400 material-icons">check_circle</i>
<i v-if="picked === collectionIndex.toString()" class="text-green-400 material-icons"
>check_circle</i
>
<i v-else class="material-icons">folder</i>
<span>{{ collection.name }}</span>
</button>
@@ -92,7 +94,7 @@
})
"
@remove-request="removeRequest"
:picked="picked"
:picked="picked.toString()"
/>
</li>
</ul>

View File

@@ -99,7 +99,7 @@
"
@expand-collection="expandCollection"
@remove-request="removeRequest"
:picked="picked"
:picked="picked.toString()"
/>
</li>
</ul>
@@ -110,7 +110,7 @@
class="ml-8 border-l border-brdColor"
>
<CollectionsTeamsRequest
:request="JSON.parse(request.request)"
:request="request.request"
:collection-index="collectionIndex"
:folder-index="-1"
:folder-name="collection.name"

View File

@@ -93,7 +93,7 @@
class="flex ml-8 border-l border-brdColor"
>
<CollectionsTeamsRequest
:request="JSON.parse(request.request)"
:request="request.request"
:collection-index="collectionIndex"
:folder-index="folderIndex"
:folder-name="folder.name"