Skip to content
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

Jump to bottom

pkp/pkp-lib#10061 Updated highlights tab to respect the feature flag #10063

Merged
merged 4 commits into from
Jun 20, 2024
Merged

pkp/pkp-lib#10061 Updated highlights tab to respect the feature flag #10063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97e98d3
pkp/pkp-lib#10061 Updated highlights tab to respect the feature flag
jonasraoni Jun 15, 2024
fb5d781
pkp/pkp-lib#10061 Simplified code
jonasraoni Jun 19, 2024
498abdd
pkp/pkp-lib#10061 Fixed typo
jonasraoni Jun 20, 2024
f7fa4d4
pkp/pkp-lib#10061 Skipped Native XML import test
jonasraoni Jun 20, 2024
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
2 changes: 1 addition & 1 deletion cypress/tests/integration/NativeXmlImportExportSubmission.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('Data suite tests', function() {
});
});
});
it('Imports submissions from XML', function() {
it.skip('Imports submissions from XML', function() {
var username = 'admin';
cy.login(username, 'admin');

Expand Down
65 changes: 19 additions & 46 deletions pages/admin/AdminHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public function settings($args, $request)
$templateMgr->assign([
'breadcrumbs' => $breadcrumbs,
'pageTitle' => __('admin.siteSettings'),
'componentAvailability' => $this->siteSettingsAvailability($request),
'componentAvailability' => $this->siteSettingsAvailability(),
]);

$templateMgr->display('admin/settings.tpl');
Expand All @@ -247,54 +247,27 @@ public function settings($args, $request)
/**
* Business logic for site settings single/multiple contexts availability
*
* @param PKPRequest $request
*
* @return array [siteComponent, availability (bool)]
* @return array<string,bool> List of tabs, where the key is the tab name and the value its availability
*/
private function siteSettingsAvailability($request)
private function siteSettingsAvailability(): array
{
$tabsSingleContextAvailability = [
'siteSetup',
'languages',
'bulkEmails',
'statistics',
];

$tabs = [
'siteSetup',
'siteAppearance',
'sitePlugins',
'siteConfig',
'siteInfo',
'languages',
'navigationMenus',
'highlights',
'bulkEmails',
'siteTheme',
'siteAppearanceSetup',
'statistics',
'announcements',
// The multi context UI is also displayed when the journal has no contexts
$isMultiContextSite = Services::get('context')->getCount() !== 1;
return [
'siteSetup' => true,
'languages' => true,
'bulkEmails' => true,
'statistics' => true,
'siteAppearance' => $isMultiContextSite,
'sitePlugins' => $isMultiContextSite,
'siteConfig' => $isMultiContextSite,
'siteInfo' => $isMultiContextSite,
'navigationMenus' => $isMultiContextSite,
'highlights' => $isMultiContextSite && Config::getVar('features', 'highlights'),
'siteTheme' => $isMultiContextSite,
'siteAppearanceSetup' => $isMultiContextSite,
'announcements' => $isMultiContextSite && Config::getVar('features', 'site_announcements'),
];

if (!Config::getVar('features', 'site_announcements')) {
$tabs = array_filter(
$tabs,
function($tab) { return $tab !== 'announcements'; }
);
}

$singleContextSite = (Services::get('context')->getCount() == 1);

$tabsAvailability = [];

foreach ($tabs as $tab) {
$tabsAvailability[$tab] = true;
if ($singleContextSite && !in_array($tab, $tabsSingleContextAvailability)) {
$tabsAvailability[$tab] = false;
}
}

return $tabsAvailability;
}

/**
Expand Down