Rename 'all files' to 'personal' throughout the UI&tests

__fixtures__/sidebarNavItems.js

@@ -1,6 +1,6 @@
 export default [
  {
- name: "All files",
+ name: "Personal",
  icon: "folder",
  route: {
  name: "files-personal",
@@ -9,32 +9,14 @@ export default [
  active: true
  },
  {
- name: "Shared with me",
- icon: "shared-with-me",
+ name: "Shares",
+ icon: 'share-forward',
  route: {
  name: "files-shared-with-me",
  path: "/files/list/shared-with-me"
  },
  active: false
  },
- {
- name: "Shared with others",
- icon: "shared-with-others",
- route: {
- name: "files-shared-with-others",
- path: "/files/list/shared-with-others"
- },
- active: false
- },
- {
- name: "Shared via link",
- icon: "link",
- route: {
- name: "files-shared-via-link",
- path: "/files/list/shared-via-link"
- },
- active: false
- },
  {
  name: "Deleted files",
  icon: "delete",

changelog/unreleased/enhancement-shares-overview

@@ -2,6 +2,8 @@ Enhancement: Shares overview
 
 We've merged the three shares navigation items into one central "Shares" item, 
 with a toggle to switch between the three different kinds of shares (incoming, outgoing, links).
+In the process, we have also renamed the "All files" page to the "Personal" page, indicating that 
+this is the user's personal space since shares (and potentially other shared spaces) live elsewhere.
 
 https://github.com/owncloud/web/issues/6440
 https://github.com/owncloud/web/pull/6512

packages/web-app-files/src/components/AppBar/AppBar.vue

@@ -196,7 +196,7 @@ export default {
 
  if (acc.length) {
  if (this.isPersonalLocation) {
- acc[0].text = this.$gettext('All files')
+ acc[0].text = this.$gettext('Personal')
  acc[0].to = acc[0].to + '/'
  } else if (this.isSpacesProjectLocation || this.isSpacesProjectsLocation) {
  acc[0] = {

packages/web-app-files/src/components/FilesList/NotFoundMessage.vue

@@ -29,7 +29,7 @@
  appearance="raw"
  :to="homeRoute"
  >
- <translate>Go to »All files«</translate>
+ <translate>Go to »Personal« page</translate>
  </oc-button>
  <oc-button
  v-if="showPublicLinkButton"

packages/web-app-files/src/router/spaces.ts

@@ -57,7 +57,7 @@ export const buildRoutes = (components: RouteComponents): RouteConfig[] => [
  component: components.Personal,
  meta: {
  hasBulkActions: true,
- title: $gettext('All files'),
+ title: $gettext('Personal'),
  patchCleanPath: true
  }
  }

packages/web-app-files/src/views/LocationPicker.vue

@@ -216,7 +216,7 @@ export default {
  this.currentAction === batchActions.move
  ? this.$gettext('Move into »%{ target }«')
  : this.$gettext('Copy into »%{ target }«')
- const target = basename(this.target) || this.$gettext('All files')
+ const target = basename(this.target) || this.$gettext('Personal')
  return this.$gettextInterpolate(translated, { target })
  },
 
@@ -259,7 +259,7 @@ export default {
  breadcrumbs.push(this.createBreadcrumbNode(i + 1, pathSegments[i], itemPath))
  }
  } else {
- breadcrumbs.push(this.createBreadcrumbNode(0, this.$gettext('All files'), '/'))
+ breadcrumbs.push(this.createBreadcrumbNode(0, this.$gettext('Personal'), '/'))
  for (let i = 0; i < pathSegments.length; i++) {
  const itemPath = join.apply(null, pathSegments.slice(0, i + 1))
  breadcrumbs.push(this.createBreadcrumbNode(i + 1, pathSegments[i], itemPath))

packages/web-app-files/tests/unit/components/FilesList/NotFoundMessage.spec.js

@@ -35,7 +35,7 @@ describe('NotFoundMessage', () => {
 
  expect(homeButton.exists()).toBeTruthy()
  expect(homeButton.find('translate-stub')).toBeTruthy()
- expect(homeButton.find('translate-stub').text()).toBe('Go to »All files«')
+ expect(homeButton.find('translate-stub').text()).toBe('Go to »Personal« page')
  })
 
  it('should not show reload public link button', () => {

packages/web-app-files/tests/unit/views/LocationPicker.spec.js

@@ -131,7 +131,7 @@ describe('LocationPicker', () => {
  expect(breadcrumbItems.length).toBe(3)
  expect(breadcrumbItems[0]).toMatchObject({
  index: 0,
- text: 'All files',
+ text: 'Personal',
  to: {
  name: route.name,
  params: { action: route.params.action, item: '/' },

packages/web-app-files/tests/unit/views/__snapshots__/LocationPicker.spec.js.snap

@@ -14,9 +14,9 @@ exports[`LocationPicker files app bar should show current hint according to the
  Resources will be moved into the folder where you are currently located.</p>
 `;
 
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 1`] = `<h1 class="location-picker-selection-info oc-mb">Move into »All files«</h1>`;
+exports[`LocationPicker files app bar should show location picker selection info according to route action and item 1`] = `<h1 class="location-picker-selection-info oc-mb">Move into »Personal«</h1>`;
 
-exports[`LocationPicker files app bar should show location picker selection info according to route action and item 2`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »All files«</h1>`;
+exports[`LocationPicker files app bar should show location picker selection info according to route action and item 2`] = `<h1 class="location-picker-selection-info oc-mb">Copy into »Personal«</h1>`;
 
 exports[`LocationPicker files app bar should show location picker selection info according to route action and item 3`] = `<h1 class="location-picker-selection-info oc-mb">Move into »child«</h1>`;
 

packages/web-runtime/src/components/Topbar/TopBar.vue

@@ -72,7 +72,7 @@ export default {
  },
 
  sidebarLogoAlt() {
- return this.$gettext('Navigate to all files page')
+ return this.$gettext('Navigate to personal files page')
  },
 
  logoImage() {

packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNav.spec.js.snap

@@ -6,11 +6,9 @@ exports[`OcSidebarNav renders navItems into a list 1`] = `
  </button>
  <nav aria-label="Sidebar navigation menu" class="oc-sidebar-nav oc-my-m oc-px-xs">
  <oc-list-stub>
- <sidebar-nav-item-stub name="All files" index="0" active="true" target="/files/list/all" icon="folder" filltype="fill"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Shared with me" index="1" target="/files/list/shared-with-me" icon="shared-with-me" filltype="fill"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Shared with others" index="2" target="/files/list/shared-with-others" icon="shared-with-others" filltype="fill"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Shared via link" index="3" target="/files/list/shared-via-link" icon="link" filltype="fill"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Deleted files" index="4" target="/files/list/trash-bin" icon="delete" filltype="fill"></sidebar-nav-item-stub>
+ <sidebar-nav-item-stub name="Personal" index="0" active="true" target="/files/list/all" icon="folder" filltype="fill"></sidebar-nav-item-stub>
+ <sidebar-nav-item-stub name="Shares" index="1" target="/files/list/shared-with-me" icon="share-forward" filltype="fill"></sidebar-nav-item-stub>
+ <sidebar-nav-item-stub name="Deleted files" index="2" target="/files/list/trash-bin" icon="delete" filltype="fill"></sidebar-nav-item-stub>
  </oc-list-stub>
  </nav> <span class="footer">Footer</span>
 </div>
@@ -22,11 +20,9 @@ exports[`OcSidebarNav toggles back into open state upon button click 1`] = `
  </button>
  <nav aria-label="Sidebar navigation menu" class="oc-sidebar-nav oc-my-m oc-px-xs">
  <oc-list-stub>
- <sidebar-nav-item-stub name="All files" index="0" active="true" target="/files/list/all" icon="folder" filltype="fill"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Shared with me" index="1" target="/files/list/shared-with-me" icon="shared-with-me" filltype="fill"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Shared with others" index="2" target="/files/list/shared-with-others" icon="shared-with-others" filltype="fill"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Shared via link" index="3" target="/files/list/shared-via-link" icon="link" filltype="fill"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Deleted files" index="4" target="/files/list/trash-bin" icon="delete" filltype="fill"></sidebar-nav-item-stub>
+ <sidebar-nav-item-stub name="Personal" index="0" active="true" target="/files/list/all" icon="folder" filltype="fill"></sidebar-nav-item-stub>
+ <sidebar-nav-item-stub name="Shares" index="1" target="/files/list/shared-with-me" icon="share-forward" filltype="fill"></sidebar-nav-item-stub>
+ <sidebar-nav-item-stub name="Deleted files" index="2" target="/files/list/trash-bin" icon="delete" filltype="fill"></sidebar-nav-item-stub>
  </oc-list-stub>
  </nav> <span class="footer">Footer</span>
 </div>
@@ -38,11 +34,9 @@ exports[`OcSidebarNav toggles into closed state upon button click 1`] = `
  </button>
  <nav aria-label="Sidebar navigation menu" class="oc-sidebar-nav oc-my-m oc-px-xs">
  <oc-list-stub>
- <sidebar-nav-item-stub name="All files" index="0" active="true" target="/files/list/all" icon="folder" filltype="fill" collapsed="true"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Shared with me" index="1" target="/files/list/shared-with-me" icon="shared-with-me" filltype="fill" collapsed="true"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Shared with others" index="2" target="/files/list/shared-with-others" icon="shared-with-others" filltype="fill" collapsed="true"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Shared via link" index="3" target="/files/list/shared-via-link" icon="link" filltype="fill" collapsed="true"></sidebar-nav-item-stub>
- <sidebar-nav-item-stub name="Deleted files" index="4" target="/files/list/trash-bin" icon="delete" filltype="fill" collapsed="true"></sidebar-nav-item-stub>
+ <sidebar-nav-item-stub name="Personal" index="0" active="true" target="/files/list/all" icon="folder" filltype="fill" collapsed="true"></sidebar-nav-item-stub>
+ <sidebar-nav-item-stub name="Shares" index="1" target="/files/list/shared-with-me" icon="share-forward" filltype="fill" collapsed="true"></sidebar-nav-item-stub>
+ <sidebar-nav-item-stub name="Deleted files" index="2" target="/files/list/trash-bin" icon="delete" filltype="fill" collapsed="true"></sidebar-nav-item-stub>
  </oc-list-stub>
  </nav> <span class="footer">Footer</span>
 </div>

packages/web-runtime/tests/unit/components/SidebarNav/__snapshots__/SidebarNavItem.spec.js.snap

@@ -2,15 +2,15 @@
 
 exports[`OcSidebarNav renders navItem with toolTip if collapsed 1`] = `
 <li class="oc-sidebar-nav-item oc-pb-xs oc-px-s" id="123">
- <router-link-stub to="/files/list/all" class="oc-button oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-sidebar-nav-item-link" data-nav-id="5"><span class="oc-icon oc-icon-m oc-icon-passive"><!----></span> <span class="oc-ml-m text text-invisible">All files</span>
+ <router-link-stub to="/files/list/all" class="oc-button oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-sidebar-nav-item-link" data-nav-id="5"><span class="oc-icon oc-icon-m oc-icon-passive"><!----></span> <span class="oc-ml-m text text-invisible">Personal</span>
  <!---->
  </router-link-stub>
 </li>
 `;
 
 exports[`OcSidebarNav renders navItem without toolTip if expanded 1`] = `
 <li class="oc-sidebar-nav-item oc-pb-xs oc-px-s" id="123">
- <router-link-stub to="/files/list/all" class="oc-button oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-sidebar-nav-item-link" data-nav-id="5"><span class="oc-icon oc-icon-m oc-icon-passive"><!----></span> <span class="oc-ml-m text">All files</span>
+ <router-link-stub to="/files/list/all" class="oc-button oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw oc-sidebar-nav-item-link" data-nav-id="5"><span class="oc-icon oc-icon-m oc-icon-passive"><!----></span> <span class="oc-ml-m text">Personal</span>
  <!---->
  </router-link-stub>
 </li>

packages/web-runtime/tests/unit/components/Topbar/__snapshots__/TopBar.spec.js.snap

@@ -5,7 +5,7 @@ exports[`Top Bar component Displays applications menu 1`] = `
  <div class="oc-topbar-left oc-flex oc-flex-middle oc-flex-between">
  <applications-menu-stub applicationslist="[object Object],[object Object],[object Object]"></applications-menu-stub>
  <router-link-stub to="/" tag="a" ariacurrentvalue="page" event="click">
- <oc-img-stub src="example-logo.svg" alt="Navigate to all files page" class="oc-logo-image"></oc-img-stub>
+ <oc-img-stub src="example-logo.svg" alt="Navigate to personal files page" class="oc-logo-image"></oc-img-stub>
  </router-link-stub>
  </div>
  <div class="portal-wrapper">

tests/acceptance/features/webUICreateFilesFolders/createFile.feature

@@ -7,7 +7,7 @@ Feature: create files
  Given user "Alice" has been created with default attributes and without skeleton files in the server
  And user "Alice" has created file "/lorem.txt" in the server
  And user "Alice" has logged in using the webUI
- And the user has browsed to the files page
+ And the user has browsed to the personal page
 
  @ocisSmokeTest
  Scenario: create a new file

tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature

@@ -78,7 +78,7 @@ Feature: deleting files and folders
  Given user "Alice" has uploaded file "data.zip" to "data.zip" in the server
  And user "Alice" has created file "lorem.txt" in the server
  And user "Alice" has created folder "simple-folder" in the server
- And the user has browsed to the files page
+ And the user has browsed to the personal page
  When the user marks all files for batch action using the webUI
  # Shares is a special folder that cannot be deleted on oCIS
  # The user has to unmark it in order to "delete all" the rest of the items
@@ -253,7 +253,7 @@ Feature: deleting files and folders
  Scenario: Try to delete file and folder that used to exist but does not anymore
  Given user "Alice" has created folder "simple-folder" in the server
  And user "Alice" has created file "lorem.txt" in the server
- And the user has browsed to the files page
+ And the user has browsed to the personal page
  And the following files have been deleted by user "Alice" in the server
  | name |
  | lorem.txt |

tests/acceptance/features/webUIFavorites/favoritesFile.feature

@@ -8,7 +8,7 @@ Feature: Mark file as favorite
  Background:
  Given user "Alice" has been created with default attributes and without skeleton files in the server
  And user "Alice" has logged in using the webUI
- And the user has browsed to the files page
+ And the user has browsed to the personal page
 
  @smokeTest
  Scenario: mark files as favorites
@@ -111,7 +111,7 @@ Feature: Mark file as favorite
  Scenario: Try to favorite file and folder that used to exist but does not anymore
  Given user "Alice" has created file "lorem.txt" in the server
  And user "Alice" has created folder "simple-folder" in the server
- And the user has browsed to the files page
+ And the user has browsed to the personal page
  And the following files have been deleted by user "Alice" in the server
  | name |
  | lorem.txt |

tests/acceptance/features/webUIFavorites/unfavoriteFile.feature

@@ -18,7 +18,7 @@ Feature: Unmark file/folder as favorite
  And user "Alice" has favorited element "data.zip" in the server
  And user "Alice" has favorited element "data.tar.gz" in the server
  And user "Alice" has favorited element "lorem.txt" in the server
- And the user has browsed to the files page
+ And the user has browsed to the personal page
  When the user unmarks the favorited file "data.zip" using the webUI
  Then as user "Alice" file "data.zip" should not be marked as favorite in the server
  And file "data.zip" should not be marked as favorite on the webUI
@@ -39,7 +39,7 @@ Feature: Unmark file/folder as favorite
  And user "Alice" has favorited element "simple-folder" in the server
  And user "Alice" has favorited element "simple-empty-folder" in the server
  And user "Alice" has favorited element "0" in the server
- And the user has browsed to the files page
+ And the user has browsed to the personal page
  When the user unmarks the favorited folder "simple-folder" using the webUI
  Then as user "Alice" folder "simple-folder" should not be marked as favorite in the server
  And folder "simple-folder" should not be marked as favorite on the webUI
@@ -107,7 +107,7 @@ Feature: Unmark file/folder as favorite
  And the user has reloaded the current page of the webUI
  And user "Alice" has favorited element "simple-folder" in the server
  And user "Alice" has favorited element "lorem.txt" in the server
- And the user has browsed to the files page
+ And the user has browsed to the personal page
  And the following files have been deleted by user "Alice" in the server
  | name |
  | lorem.txt |

tests/acceptance/features/webUIFiles/batchAction.feature

@@ -11,7 +11,7 @@ Feature: Visibility of the batch actions menu
  And user "Alice" has created folder "simple-folder" in the server
 
 
- Scenario: View batch action menu for a folder on the all files page
+ Scenario: View batch action menu for a folder on the personal page
  Given user "Alice" has logged in using the webUI
  When the user marks the folder "simple-folder" using the webUI
  Then the following batch action buttons should be visible
@@ -21,7 +21,7 @@ Feature: Visibility of the batch actions menu
  | Delete |
 
 
- Scenario: View batch action menu for a file on the all files page
+ Scenario: View batch action menu for a file on the personal page
  Given user "Alice" has created file "lorem.txt" in the server
  And user "Alice" has logged in using the webUI
  When the user marks the file "lorem.txt" using the webUI
@@ -33,7 +33,7 @@ Feature: Visibility of the batch actions menu
  | Copy |
 
 
- Scenario: View batch action menu when selecting both file and folder on the all files page
+ Scenario: View batch action menu when selecting both file and folder on the personal page
  Given user "Alice" has created file "lorem.txt" in the server
  And user "Alice" has logged in using the webUI
  When the user marks these files for batch action using the webUI
@@ -99,7 +99,7 @@ Feature: Visibility of the batch actions menu
 
  Scenario: View batch action menu for a folder on the shared via link page
  Given user "Alice" has created a public link with following settings in the server
- | path  | /simple-folder |
+ | path | /simple-folder |
  And user "Alice" has logged in using the webUI
  And the user has browsed to the shared-via-link page
  When the user marks the folder "simple-folder" using the webUI