[5.x] Remove container tabs from Asset Manager

resources/js/components/assets/Browser/Browser.vue

@@ -21,17 +21,6 @@
  <span>{{ __('Drop File to Upload') }}</span>
  </div>
 
- <div class="publish-tabs tabs rounded-none rounded-t mb-3 shadow-none" v-if="showContainerTabs">
- <button class="tab-button" v-for="item in containers" :key="item.id"
- v-text="__(item.title)"
- :class="{
- active: item.id === container.id,
- 'border-b border-gray-300': item.id !== container.id
- }"
- @click="selectContainer(item.id)"
- />
- </div>
-
  <data-list
  v-if="!initializing"
  :rows="assets"
@@ -321,7 +310,6 @@ export default {
  // Either the ID, or the whole container object.
  initialContainer: {},
  selectedPath: String, // The path to display, determined by a parent component.
- restrictContainerNavigation: Boolean, // Whether to restrict to a single container and prevent navigation.
  restrictFolderNavigation: Boolean, // Whether to restrict to a single folder and prevent navigation.
  selectedAssets: Array,
  maxFiles: Number,
@@ -376,10 +364,6 @@ export default {
  return {container: this.selectedContainer};
  },
 
- showContainerTabs() {
- return !this.restrictContainerNavigation && Object.keys(this.containers).length > 1
- },
-
  showAssetEditor() {
  return Boolean(this.editedAssetId);
  },
@@ -552,14 +536,6 @@ export default {
  this.$emit('navigated', this.container, this.path);
  },
 
- selectContainer(id) {
- this.container = this.containers[id];
- this.path = '/';
- this.page = 1;
-
- this.$emit('navigated', this.container, this.path);
- },
-
  setMode(mode) {
  this.mode = mode;
  this.setPreference('mode', mode == 'table' ? null : mode);

resources/js/components/assets/Selector.vue

@@ -8,7 +8,6 @@
  :initial-per-page="$config.get('paginationSize')"
  :selected-path="folder"
  :selected-assets="browserSelections"
- :restrict-container-navigation="restrictContainerNavigation"
  :restrict-folder-navigation="restrictFolderNavigation"
  :max-files="maxFiles"
  :query-scopes="queryScopes"
@@ -59,12 +58,6 @@ export default {
  selected: Array,
  maxFiles: Number,
  queryScopes: Array,
- restrictContainerNavigation: {
- type: Boolean,
- default() {
- return false;
- }
- },
  restrictFolderNavigation: {
  type: Boolean,
  default() {

resources/js/components/fieldtypes/assets/AssetsFieldtype.vue

@@ -118,7 +118,6 @@
  <selector
  :container="container"
  :folder="folder"
- :restrict-container-navigation="true"
  :restrict-folder-navigation="restrictNavigation"
  :selected="selectedAssets"
  :view-mode="selectorViewMode"

resources/js/components/fieldtypes/bard/Image.vue

@@ -47,7 +47,6 @@
  <selector
  :container="extension.options.bard.config.container"
  :folder="extension.options.bard.config.folder || '/'"
- :restrict-container-navigation="true"
  :restrict-folder-navigation="extension.options.bard.config.restrict_assets"
  :selected="selections"
  :view-mode="'grid'"

resources/js/components/fieldtypes/bard/LinkToolbar.vue

@@ -168,7 +168,6 @@
  <asset-selector
  :container="config.container"
  :folder="config.folder || '/'"
- :restrict-container-navigation="true"
  :restrict-folder-navigation="config.restrict_assets"
  :selected="[]"
  :view-mode="'grid'"

resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue

@@ -89,7 +89,6 @@
  :container="container"
  :folder="folder"
  :selected="selectedAssets"
- :restrict-container-navigation="restrictAssetNavigation"
  :restrict-folder-navigation="restrictAssetNavigation"
  @selected="assetsSelected"
  @closed="closeAssetSelector"

src/Http/Controllers/CP/Assets/RedirectsToFirstAssetContainer.php

@@ -2,13 +2,24 @@
 
 namespace Statamic\Http\Controllers\CP\Assets;
 
+use Statamic\CP\Navigation\NavItem;
 use Statamic\Facades\AssetContainer;
+use Statamic\Facades\CP\Nav;
 use Statamic\Facades\User;
 
 trait RedirectsToFirstAssetContainer
 {
  public function redirectToFirstContainer()
  {
+ $firstContainerInNav = Nav::build()->pluck('items')->flatten()
+ ->filter(fn (NavItem $navItem) => $navItem->url() === cp_route('assets.index'))
+ ->map(fn (NavItem $navItem) => $navItem->children()?->first())
+ ->first();
+
+ if ($firstContainerInNav) {
+ abort(redirect($firstContainerInNav->url()));
+ }
+
  $containers = AssetContainer::all()->sortBy->title()->filter(function ($container) {
  return User::current()->can('view', $container);
  });