[tests-only][full-ci][do-not-merge]Investigate the failing acceptance tests in developer PR

.drone.env

@@ -1,3 +1,3 @@
 # The version of OCIS to use in pipelines that test against OCIS
-OCIS_COMMITID=ca66a9f7516734e7a3c64074d37f266dd90f702f
+OCIS_COMMITID=8f2bf0ed9ce08756bc8d4a286512382ff498fbc8
 OCIS_BRANCH=master

.drone.star

@@ -58,11 +58,11 @@ config = {
         "oC10": {
             "db": "mysql:5.5",
             "earlyFail": True,
-            "skip": False,
+            "skip": True,
         },
         "oCIS": {
             "earlyFail": True,
-            "skip": False,
+            "skip": True,
         },
     },
     "acceptance": {
@@ -186,6 +186,7 @@ config = {
                 "EXPECTED_FAILURES_FILE": "%s/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md" % dir["web"],
             },
             "screenShots": True,
+            "skip": True,
         },
         # These suites have all or most of their scenarios expected to fail.
         # Eliminate wasted CI time by not retrying the failing scenarios.
@@ -199,6 +200,7 @@ config = {
             },
             "screenShots": True,
             "retry": False,
+            "skip": True,
         },
         "webUINotification": {
             "type": NOTIFICATIONS,
@@ -214,6 +216,7 @@ config = {
             },
             "screenShots": True,
             "notificationsAppNeeded": True,
+            "skip": True,
         },
         "webUIFederation": {
             "type": FEDERATED,
@@ -228,6 +231,7 @@ config = {
             "notificationsAppNeeded": True,
             "federatedServerNeeded": True,
             "federatedServerVersion": OC10_VERSION,
+            "skip": True,
         },
         "webUI-XGA-Notifications": {
             "type": NOTIFICATIONS,
@@ -242,6 +246,7 @@ config = {
                 "EXPECTED_FAILURES_FILE": "%s/tests/acceptance/expected-failures-XGA-with-oc10-server-oauth2-login.md" % dir["web"],
                 "SCREEN_RESOLUTION": "768x1024",
             },
+            "skip": True,
             "notificationsAppNeeded": True,
             "filterTags": "@smokeTest and not @skipOnXGAPortraitResolution and not @skip and not @skipOnOC10 and not @notToImplementOnOC10",
         },
@@ -320,9 +325,11 @@ config = {
                 "EXPECTED_FAILURES_FILE": "%s/tests/acceptance/expected-failures-XGA-with-oc10-server-oauth2-login.md" % dir["web"],
                 "SCREEN_RESOLUTION": "768x1024",
             },
+            "skip": True,
             "filterTags": "@smokeTest and not @skipOnXGAPortraitResolution and not @skip and not @skipOnOC10 and not @notToImplementOnOC10",
         },
         "webUI-Notifications-iPhone": {
+            "skip": True,
             "type": NOTIFICATIONS,
             "suites": {
                 "oC10iPhoneNotifications": [
@@ -339,6 +346,7 @@ config = {
             "filterTags": "@smokeTest and not @skipOnIphoneResolution and not @skip and not @skipOnOC10 and not @notToImplementOnOC10",
         },
         "webUI-iPhone": {
+            "skip": True,
             "type": FULL,
             "suites": {
                 "oC10iPhone1": [
@@ -421,92 +429,10 @@ config = {
                 "",
             ],
             "suites": {
-                "oCISBasic": [
-                    "webUINotifications",
-                    "webUIPrivateLinks",
-                    "webUIPreview",
-                    "webUIAccount",
-                    "webUIWebdavLocks",
-                ],
-                "webUIWebdavLockProtection": "oCISWebdavLockProtection",
-                "oCISSharingBasic": [
-                    "webUISharingAcceptShares",
-                    "webUIRestrictSharing",
-                    "webUISharingNotifications",
-                ],
-                "webUIFavorites": "oCISFavorites",
-                "oCISFiles1": [
-                    "webUICreateFilesFolders",
-                    "webUIDeleteFilesFolders",
-                    "webUIFilesCopy",
-                    "webUITextEditor",
-                ],
                 "oCISFiles2": [
-                    "webUIFilesList",
-                    "webUIFilesDetails",
                     "webUIFilesSearch",
                     "webUIFilesActionMenu",
                 ],
-                "oCISFiles3": [
-                    "webUIRenameFiles",
-                    "webUILogin",
-                ],
-                "oCISFiles4": [
-                    "webUIFiles",
-                    "webUIRenameFolders",
-                ],
-                "oCISSharingInternal1": [
-                    "webUISharingInternalGroups",
-                    "webUISharingInternalGroupsEdgeCases",
-                ],
-                "oCISSharingInternal2": [
-                    "webUISharingInternalUsers",
-                    "webUISharingInternalUsersBlacklisted",
-                    "webUISharingInternalUsersCollaborator",
-                ],
-                "oCISSharingInternal3": [
-                    "webUISharingInternalGroupsSharingIndicator",
-                    "webUISharingInternalUsersSharingIndicator",
-                    "webUISharingExpirationDate",
-                    "webUISharingInternalUsersShareWithPage",
-                    "webUIResharing1",
-                    "webUIOperationsWithFolderShares",
-                ],
-                "oCISSharingAutocompletion": [
-                    "webUISharingAutocompletion",
-                ],
-                "oCISSharingPerm1": [
-                    "webUISharingPermissionsUsers",
-                    "webUISharingFilePermissionsGroups",
-                ],
-                "oCISSharingPerm2": [
-                    "webUISharingFolderPermissionsGroups",
-                    "webUISharingFolderAdvancedPermissionsGroups",
-                ],
-                "oCISSharingPerm3": [
-                    "webUISharingFilePermissionMultipleUsers",
-                    "webUISharingFolderPermissionMultipleUsers",
-                    "webUISharingFolderAdvancedPermissionMultipleUsers",
-                ],
-                "oCISSharingAndUpload": [
-                    "webUIResharing2",
-                    "webUIUpload",
-                ],
-                "oCISSharingPublic1": [
-                    "webUISharingPublicBasic",
-                    "webUISharingPublicExpire",
-                ],
-                "oCISSharingPublic2": [
-                    "webUISharingPublicDifferentRoles",
-                    "webUISharingPublicManagement",
-                ],
-                "oCISTrashbinUploadMoveJourney": [
-                    "webUITrashbinDelete",
-                    "webUITrashbinFilesFolders",
-                    "webUITrashbinRestore",
-                    "webUIMoveFilesFolders",
-                    "webUIUserJourney",
-                ],
             },
             "extraEnvironment": {
                 "NODE_TLS_REJECT_UNAUTHORIZED": "0",

changelog/5.7.0_2022-09-09/enhancement-update-ods

@@ -1,6 +1,6 @@
-Enhancement: Update ODS to v14.0.0-alpha.18
+Enhancement: Update ODS to v14.0.0-alpha.19
 
-We updated the ownCloud Design System to version 14.0.0-alpha.18. Please refer to the full changelog in the ODS release (linked) for more details. Summary:
+We updated the ownCloud Design System to version 14.0.0-alpha.19. Please refer to the full changelog in the ODS release (linked) for more details. Summary:
 
 * Bugfix - Omit special characters in user avatar initials: [#2070](https://github.com/owncloud/owncloud-design-system/issues/2070)
 * Bugfix - Avatar link icon: [#2269](https://github.com/owncloud/owncloud-design-system/pull/2269)
@@ -26,6 +26,8 @@ We updated the ownCloud Design System to version 14.0.0-alpha.18. Please refer t
 * Enhancement - Progress bar indeterminate state: [#2200](https://github.com/owncloud/owncloud-design-system/pull/2200)
 * Enhancement - Redesign notifications: [#2210](https://github.com/owncloud/owncloud-design-system/pull/2210)
 * Enhancement - Use Inter font: [#2270](https://github.com/owncloud/owncloud-design-system/pull/2270)
+* Enhancement - Button text align left: [#2323](https://github.com/owncloud/owncloud-design-system/pull/2323)
+* Enhancement - "Cancel"-button and -handler in OcSearchBar: [#2328](https://github.com/owncloud/owncloud-design-system/pull/2328)
 
-https://github.com/owncloud/web/pull/7626
-https://github.com/owncloud/owncloud-design-system/releases/tag/v14.0.0-alpha.18
+https://github.com/owncloud/web/pull/7675
+https://github.com/owncloud/owncloud-design-system/releases/tag/v14.0.0-alpha.19

changelog/unreleased/bugfix-search-bar-on-small-screens

@@ -0,0 +1,6 @@
+Bugfix: Search bar on small screens
+
+We've fixed the display of the search bar on small screens.
+
+https://github.com/owncloud/web/pull/7675
+https://github.com/owncloud/web/issues/7617

packages/web-app-search/src/portals/SearchBar.vue

@@ -1,19 +1,37 @@
 <template>
-  <div v-if="availableProviders.length" id="files-global-search" data-custom-key-bindings="true">
+  <div
+    v-if="availableProviders.length"
+    id="files-global-search"
+    ref="searchBar"
+    class="oc-flex"
+    data-custom-key-bindings="true"
+  >
     <oc-search-bar
       id="files-global-search-bar"
       ref="search"
       :label="searchLabel"
       :type-ahead="true"
       :placeholder="searchLabel"
       :button-hidden="true"
+      :show-cancel-button="showCancelButton"
+      cancel-button-variation="inverse"
+      :cancel-handler="cancelSearch"
       @input="updateTerm"
       @click.native="term && $refs.optionsDrop.show()"
       @keyup.native.esc="$refs.optionsDrop.hide()"
       @keyup.native.up="onKeyUpUp"
       @keyup.native.down="onKeyUpDown"
       @keyup.native.enter="onKeyUpEnter"
     />
+    <oc-button
+      v-oc-tooltip="$gettext('Display search bar')"
+      :aria-label="$gettext('Click to display and focus the search bar')"
+      class="mobile-search-btn oc-mr-s"
+      appearance="raw"
+      @click="showSearchBar"
+    >
+      <oc-icon name="search" variation="inverse" fill-type="line"></oc-icon>
+    </oc-button>
     <oc-drop
       id="files-global-search-options"
       ref="optionsDrop"
@@ -85,6 +103,8 @@ export default {
 
   data() {
     return {
+      resizeObserver: new ResizeObserver(this.onResize),
+      showCancelButton: false,
       term: '',
       activeProvider: undefined,
       optionsVisible: false,
@@ -172,6 +192,14 @@ export default {
     }
   },
 
+  mounted() {
+    this.resizeObserver.observe(this.$refs.searchBar)
+  },
+
+  beforeDestroy() {
+    this.resizeObserver.unobserve(this.$refs.searchBar)
+  },
+
   methods: {
     onKeyUpEnter() {
       this.$refs.optionsDrop.hide()
@@ -268,18 +296,43 @@ export default {
     isPreviewElementActive(searchId) {
       const previewElements = this.$refs.optionsDrop.$el.querySelectorAll('.preview')
       return previewElements[this.activePreviewIndex]?.dataset?.searchId === searchId
+    },
+    showSearchBar() {
+      document.getElementById('files-global-search-bar').style.visibility = 'visible'
+      document.getElementsByClassName('oc-search-input')[0].focus()
+      this.showCancelButton = true
+    },
+    cancelSearch() {
+      document.getElementById('files-global-search-bar').style.visibility = 'hidden'
+      this.showCancelButton = false
+    },
+    onResize() {
+      const searchBarEl = document.getElementById('files-global-search-bar')
+      if (window.innerWidth > 639) {
+        searchBarEl.style.visibility = 'visible'
+        this.showCancelButton = false
+      } else {
+        searchBarEl.style.visibility = 'hidden'
+      }
     }
   }
 }
 </script>
 
 <style lang="scss">
 #files-global-search {
+  .mobile-search-btn {
+    display: none;
+    @media (max-width: 639px) {
+      display: inline-flex;
+    }
+  }
+
   .oc-search-input {
     background-color: var(--oc-color-input-bg);
     transition: 0s;
 
-    @media (max-width: 959px) {
+    @media (max-width: 639px) {
       border: none;
       display: inline;
     }
@@ -288,42 +341,29 @@ export default {
   #files-global-search-bar {
     width: 452px;
     @media (max-width: 959px) {
-      min-width: 2.5rem;
-      width: 2.5rem;
-      background-color: var(--oc-color-swatch-brand-default);
+      width: 300px;
+    }
 
-      input,
-      .oc-width-expand {
-        width: 2.5rem;
-      }
+    @media (max-width: 639px) {
+      visibility: hidden;
+      background-color: var(--oc-color-swatch-brand-default);
+      position: absolute;
+      height: 48px;
+      left: 0;
+      right: 0;
+      margin: 0 auto;
+      top: 0;
+      width: 95vw !important;
 
       .oc-search-input-icon {
-        padding: 0 var(--oc-space-large);
+        padding: 0 var(--oc-space-xlarge);
       }
 
-      .oc-search-clear {
-        right: var(--oc-space-medium);
-      }
-
-      &:focus-within {
-        position: absolute;
-        height: 60px;
-        left: var(--oc-space-medium);
-        margin: 0 auto;
-        top: 0;
-        width: 100vw !important;
-
-        .oc-search-input-icon {
-          padding: 0 var(--oc-space-xlarge);
-        }
-      }
-
-      &:focus-within input,
+      input,
       input:not(:placeholder-shown) {
         background-color: var(--oc-color-input-bg);
         border: 1px solid var(--oc-color-input-border);
         z-index: var(--oc-z-index-modal);
-        width: 95%;
         margin: 0 auto;
       }
     }
@@ -343,7 +383,11 @@ export default {
       font-weight: 600;
     }
 
-    @media (max-width: 959px) {
+    @media (max-width: 969px) {
+      width: 300px;
+    }
+
+    @media (max-width: 639px) {
       width: 93vw !important;
     }
 

packages/web-runtime/package.json

@@ -24,7 +24,7 @@
     "luxon": "^2.4.0",
     "marked": "^4.0.12",
     "oidc-client-ts": "^2.0.5",
-    "owncloud-design-system": "14.0.0-alpha.18",
+    "owncloud-design-system": "14.0.0-alpha.19",
     "owncloud-sdk": "~3.0.0-alpha.15",
     "p-queue": "^6.6.2",
     "popper-max-size-modifier": "^0.2.0",