Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7da74108 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/remove-encryption-msg' into 'main' 

(fix) remove encryption message from unified search

Closes e/infra/backlog#5138

See merge request e/infra/ecloud/nextcloud-apps/ecloud-theme-helper!167
parents 08046c2a 5bef4cd6

lib/Listeners/BeforeTemplateRenderedListener.php

+0 −4
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ class BeforeTemplateRenderedListener implements IEventListener { 
		$this->util->addStyle($this->appName, 'icons');

		$this->util->addStyle($this->appName, 'icons-vars');



		if ($this->userSession->isLoggedIn()) {

			$this->util->addScript($this->appName, $this->appName . '-unified-search-encryption-message');

			$this->util->addStyle($this->appName, 'unified-search-encryption-message');

		}

		if (strpos($pathInfo, '/apps/files') !== false) {

			$this->util->addStyle($this->appName, 'files');

			$this->util->addScript($this->appName, $this->appName . '-files-icon-alignment');

scss/unified-search-encryption-message.scss

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/* Search helptext */

#header-menu-unified-search .empty-content:after,

#header-menu-unified-search ul.unified-search__results.unified-search__results-files:after {

	margin: 10px auto;

	font-size: 12px;

	color: var(--color-text-lighter);

	display: flex;

	justify-content: center;

}

.v-popper__popper.v-popper--theme-dropdown.action-item__popper.v-popper__popper--shown.v-popper__popper--show-to .v-popper__wrapper ul[role="menu"] li.action>button>.filter-button__icon {

	filter: brightness(0) saturate(100%) invert(50%) sepia(9%) saturate(11%) hue-rotate(314deg) brightness(98%) contrast(94%);

}



.modal-mask.unified-search-modal .v-popper.v-popper--theme-dropdown[data-cy-unified-search-filter="people"] {

	display: none;

}

#unified-search .unified-search-modal .chip .icon img {

    filter: brightness(0) saturate(100%) invert(55%) sepia(4%) saturate(15%) hue-rotate(35deg) brightness(91%) contrast(88%);

}
 
 No newline at end of file

src/unified-search-encryption-message.js

deleted100755 → 0
+0 −12
Original line number Diff line number Diff line 
document.addEventListener('DOMContentLoaded', function() {

	const headerElement = document.querySelector('#header')

	if (!headerElement) {

		return

	}

	const searchHelpText = t('core', 'Due to encryption the search is only done on files\' name.')

	const attr = '#unified-search .empty-content:after, #unified-search .unified-search-modal__results:after'

	const style = `{ content: "${searchHelpText.replace(/'/g, '\\\'')}" }` // Correctly escape single quotes

	const newStyle = document.createElement('style')

	newStyle.innerHTML = attr + style

	headerElement.appendChild(newStyle)

})

webpack.config.js

+1 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ module.exports = { 
	entry: {

		'personal-info-settings': path.join(__dirname, 'src/personal-info-settings.js'),

		'settings-user-security': path.join(__dirname, 'src/settings-user-security.js'),

		'files-icon-alignment': path.join(__dirname, 'src/files-icon-alignment.js'),

		'unified-search-encryption-message': path.join(__dirname, 'src/unified-search-encryption-message.js')

		'files-icon-alignment': path.join(__dirname, 'src/files-icon-alignment.js')

	},

}