-
Notifications
You must be signed in to change notification settings - Fork 7
Admin button that hides the search icon in the SDMS header #7913
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
030afb6
Admin button that hides the search icon in the SDMS header
labkey-adam ddfe58f
Remove unused methods
labkey-adam 7d8a753
Missed file
labkey-adam e1d472f
Remove pointless check
labkey-adam 924047a
Put all the showSearch conditionals in one place
labkey-adam f4dedf0
Hide/show search icon test
labkey-adam 335b02c
Merge remote-tracking branch 'origin/develop' into fb_hide_search_button
labkey-adam File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright (c) 2026 LabKey Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.labkey.search.model; | ||
|
|
||
| public enum SearchIconState | ||
| { | ||
| Hide | ||
| { | ||
| @Override | ||
| String getAuditMessage() | ||
| { | ||
| return "Search Icon Hidden"; | ||
| } | ||
|
|
||
| @Override | ||
| boolean isVisible() | ||
| { | ||
| return false; | ||
| } | ||
| }, | ||
| Show | ||
| { | ||
| @Override | ||
| String getAuditMessage() | ||
| { | ||
| return "Search Icon Shown"; | ||
| } | ||
|
|
||
| @Override | ||
| boolean isVisible() | ||
| { | ||
| return true; | ||
| } | ||
| }; | ||
|
|
||
| abstract String getAuditMessage(); | ||
| abstract boolean isVisible(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
search/test/src/org/labkey/test/tests/search/HideSearchIconTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package org.labkey.test.tests.search; | ||
|
|
||
| import org.junit.Test; | ||
| import org.junit.experimental.categories.Category; | ||
| import org.labkey.test.BaseWebDriverTest; | ||
| import org.labkey.test.categories.Search; | ||
| import org.labkey.test.components.html.SiteNavBar; | ||
| import org.labkey.test.util.search.SearchAdminAPIHelper; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| @Category({Search.class}) | ||
| @BaseWebDriverTest.ClassTimeout(minutes = 1) | ||
| public class HideSearchIconTest extends BaseWebDriverTest | ||
| { | ||
| @Override | ||
| protected String getProjectName() | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> getAssociatedModules() | ||
| { | ||
| return List.of("Search"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testHideSearchIcon() | ||
| { | ||
| goToHome(); | ||
| assertTrue(new SiteNavBar(getDriver()).isSearchIconPresent()); | ||
|
|
||
| // Hide icon, refresh page, and verify icon is gone | ||
| SearchAdminAPIHelper.hideSearchIcon(getDriver()); | ||
| goToHome(); | ||
| assertFalse(new SiteNavBar(getDriver()).isSearchIconPresent()); | ||
|
|
||
| // Show icon, refresh page, and verify icon is back | ||
| SearchAdminAPIHelper.showSearchIcon(getDriver()); | ||
| goToHome(); | ||
| assertTrue( new SiteNavBar(getDriver()).isSearchIconPresent()); | ||
| } | ||
| } | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unrelated to this feature?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but mentioned in the top comment