Skip to content

refactor: consolidate OC.Settings #57355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
susnux wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: consolidate OC.Settings #57355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions apps/settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,75 +239,6 @@ select {
}
}

.federation-menu {
position: relative;
cursor: pointer;
width: var(--default-clickable-area);
height: var(--default-clickable-area);
padding: calc(2 * var(--default-grid-baseline));
margin: 0;
background: none;
border: none;

&:hover,
&:focus {
background-color: var(--color-background-hover);
border-radius: var(--border-radius-element);

.icon-federation-menu {
opacity: 0.8;
}
}

.icon-federation-menu {
padding-inline-start: 16px;
background-size: 16px;
background-position: left center;
opacity: .3;
cursor: inherit;

.icon-triangle-s {
display: inline-block;
vertical-align: middle;
cursor: inherit;
}
}

.federationScopeMenu {
top: var(--default-clickable-area);

&.popovermenu {
.menuitem {
// override h3 heading font size
font-size: 12.8px;
line-height: 1.6em;

.menuitem-text-detail {
opacity: .75;
}

&.active {
box-shadow: inset 2px 0 var(--color-primary-element);

.menuitem-text {
font-weight: bold;
}
}

&.disabled {
opacity: .5;

cursor: default;

* {
cursor: default;
}
}
}
}
}
}

.clientsbox img {
height: 60px;
}
Expand Down
91 changes: 0 additions & 91 deletions apps/settings/js/templates.js
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions apps/settings/js/templates/federationscopemenu.handlebars
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions apps/settings/js/usersettings.js
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions apps/settings/src/apps.js
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions apps/settings/src/main-admin-ai.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,5 @@ __webpack_nonce__ = getCSPNonce()

Vue.prototype.t = t

// Not used here but required for legacy templates
window.OC = window.OC || {}
window.OC.Settings = window.OC.Settings || {}

const View = Vue.extend(ArtificialIntelligence)
new View().$mount('#ai-settings')
4 changes: 0 additions & 4 deletions apps/settings/src/main-admin-security.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ __webpack_nonce__ = getCSPNonce()

Vue.prototype.t = t

// Not used here but required for legacy templates
window.OC = window.OC || {}
window.OC.Settings = window.OC.Settings || {}

store.replaceState(loadState('settings', 'mandatory2FAState'))

const View = Vue.extend(AdminTwoFactor)
Expand Down
4 changes: 1 addition & 3 deletions apps/settings/templates/settings/admin/ai.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

script('settings', [
'vue-settings-admin-ai',
]);
\OCP\Util::addScript('settings', 'vue-settings-admin-ai');
?>

<div id="ai-settings">
Expand Down
4 changes: 1 addition & 3 deletions apps/settings/templates/settings/admin/server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
/** @var \OCP\IL10N $l */
/** @var array $_ */

script('settings', [
'vue-settings-admin-basic-settings',
]);
\OCP\Util::addScript('settings', 'vue-settings-admin-basic-settings');
?>

<div id="vue-admin-background-job"></div>
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/templates/settings/frame.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
*/

style('settings', 'settings');
\OCP\Util::addScript('settings', 'settings', 'core');
\OCP\Util::addScript('settings', 'legacy-admin');

?>

<div id="app-navigation">
Expand Down
6 changes: 1 addition & 5 deletions apps/settings/templates/settings/personal/personal.info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
/** @var \OCP\IL10N $l */
/** @var array $_ */

script('settings', [
'usersettings',
'templates',
'vue-settings-personal-info',
]);
\OCP\Util::addScript('settings', 'vue-settings-personal-info');
?>
<?php if (!$_['isFairUseOfFreePushService']) : ?>
<div class="section">
Expand Down
1 change: 0 additions & 1 deletion build/frontend-legacy/webpack.modules.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ module.exports = {
'public-nickname-handler': path.join(__dirname, 'apps/files_sharing/src', 'public-nickname-handler.ts'),
},
settings: {
apps: path.join(__dirname, 'apps/settings/src', 'apps.js'),
'legacy-admin': path.join(__dirname, 'apps/settings/src', 'admin.js'),
'vue-settings-admin-overview': path.join(__dirname, 'apps/settings/src', 'main-admin-overview.ts'),
'vue-settings-admin-basic-settings': path.join(__dirname, 'apps/settings/src', 'main-admin-basic-settings.js'),
Expand Down
5 changes: 5 additions & 0 deletions core/src/OC/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import { getRequestToken } from './requesttoken.ts'
import {
linkToRemoteBase,
} from './routing.js'
import Settings from './settings.js'
import { theme } from './theme.js'
import Util from './util.js'
import webroot from './webroot.js'
Expand Down Expand Up @@ -198,6 +199,10 @@ export default {
*/
PasswordConfirmation,
Plugins,
/**
* @deprecated 25.0.0 Use Vue based (`@nextcloud/vue`) settings components instead
*/
Settings,
theme,
Util,
debug,
Expand Down
Loading
Loading