Skip to content

Fix styles issues in federated apps #3646

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
illia-prokopchuk wants to merge 1 commit into
base: feature/ig4
Choose a base branch
from
Open

Fix styles issues in federated apps #3646

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
2 changes: 1 addition & 1 deletion .storybook/preview-body.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div id="overlay_container"></div>
<div id="mlrun_overlay_container"></div>
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<base href="/mlrun"/>
<base href="/mlrun" />
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>MLRun</title>
</head>
<body>
<div id="root"></div>
<div id="overlay_container"></div>
<div id="mlrun_overlay_container"></div>
<div class="4"></div>
<script type="module" src="/src/index.jsx"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ const App = () => {
<Suspense fallback={<LoaderForSuspenseFallback />}>
<RouterProvider router={router} />
</Suspense>
{createPortal(<Notifications />, document.getElementById('overlay_container'))}
{createPortal(<Notifications />, document.getElementById('mlrun_overlay_container'))}
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion src/common/EditorModal/EditorModalView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const EditorModalView = ({ closeModal, data, handleSaveCode, setData }) =>
/>
</div>
</div>,
document.getElementById('overlay_container')
document.getElementById('mlrun_overlay_container')
)

EditorModalView.propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/FeatureSetsPanel/FeatureSetsPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ const FeatureSetsPanel = ({ closePanel, createFeatureSetSuccess, project }) => {
)
}}
</Form>,
document.getElementById('overlay_container')
document.getElementById('mlrun_overlay_container')
)
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/FunctionsPanel/FunctionsPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ const FunctionsPanel = ({
)
}}
</Form>,
document.getElementById('overlay_container')
document.getElementById('mlrun_overlay_container')
)
}

Expand Down
2 changes: 1 addition & 1 deletion src/elements/ProjectCard/ProjectCardView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const ProjectCardView = React.forwardRef(({ actionsMenu, alert, project, statist
event.target.tagName !== 'A' &&
!ref.current.contains(event.target) &&
!chipRef.current?.contains(event.target) &&
!event.target.closest('#overlay_container')
!event.target.closest('#mlrun_overlay_container')
) {
navigate(`/projects/${project.metadata.name}/monitor`)
}
Expand Down
2 changes: 1 addition & 1 deletion src/layout/Page/Page.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const Page = () => {
<main id="main" className={pinnedClasses} ref={mainRef} style={mainStyles}>
<div id="main-wrapper">{isProjectsFetched ? <Outlet /> : <Loader />}</div>
</main>
{createPortal(<ModalContainer />, document.getElementById('overlay_container'))}
{createPortal(<ModalContainer />, document.getElementById('mlrun_overlay_container'))}
{convertedYaml.length > 0 && (
<YamlModal
convertedYaml={convertedYaml}
Expand Down
2 changes: 1 addition & 1 deletion src/utils/nuclio.remotes.utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const ensureNuclioRemote = async () => {

// TODO: Automate URL resolution (Local: remove suffix | Prod: append it)
if (!remoteEntryUrl.includes('/nuclio-ui')) {
// remoteEntryUrl = remoteEntryUrl.replace(/\/$/, ''); // Uncomment for Local
// remoteEntryUrl = remoteEntryUrl.replace(/\/$/, '') // Uncomment for Local
remoteEntryUrl = `${remoteEntryUrl.replace(/\/$/, '')}/nuclio-ui`
}

Expand Down
2 changes: 1 addition & 1 deletion tests/features/common/components/dropdown.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { locatorBuilder } from '../../common-tools/common-tools'
export default function(dropdownStructure) {
const root = dropdownStructure.optionsInRoot
? dropdownStructure.root
: '#overlay_container'
: '#mlrun_overlay_container'
const open_button = locatorBuilder`${0} ${1}`
const options = locatorBuilder`${0} ${1} ${2}`
const option = locatorBuilder`${0} ${1}:nth-of-type(${2}) ${3}`
Expand Down
6 changes: 3 additions & 3 deletions tests/features/common/page-objects/commonPagesHeader.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ export default {
loader: By.css('.loader-wrapper .loader'),
See_On_Github: By.css('header.header a[alt="MLRUN on Gihub"]'),
See_On_Slack: By.css('header.header a[alt="MLRUN on Slack"]'),
Common_Hint: By.css('#overlay_container .tip'),
Common_Tolltip: By.css('#overlay_container .tooltip'),
Common_Hint: By.css('#mlrun_overlay_container .tip'),
Common_Tolltip: By.css('#mlrun_overlay_container .tooltip'),
Common_Options: By.css(
'#overlay_container .options-menu .options-menu__body'
'#mlrun_overlay_container .options-menu .options-menu__body'
),
MLRun_Logo: By.css('.header .header__logo'),
No_Data_Message: By.css('.no-data-block h3'),
Expand Down
4 changes: 2 additions & 2 deletions tests/features/common/page-objects/feature-store.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ export default {
Table_Label_Filter_Input: commonLabelFilterInput,
Feature_Sets_Table: commonTable(featureSetsTable),
Feature_Store_Tab_Selector: featureStoreTabSelector,
Overlay: By.css('#overlay_container .chip-block-hidden_visible')
Overlay: By.css('#mlrun_overlay_container .chip-block-hidden_visible')
},
featuresTab: {
Feature_Store_Tab_Selector: featureStoreTabSelector,
Expand All @@ -414,7 +414,7 @@ export default {
Table_Tag_Filter_Dropdown: commonTableTreeFilterDropdown,
Table_Refresh_Button: tableRefreshButton,
Feature_Vectors_Table: commonTable(featureVectorTable),
Overlay: By.css('#overlay_container .chip-block-hidden_visible')
Overlay: By.css('#mlrun_overlay_container .chip-block-hidden_visible')
},
datasets: {
Delete_Artifact_Popup: By.css('[data-testid="pop-up-dialog"]'),
Expand Down
48 changes: 24 additions & 24 deletions tests/features/common/page-objects/interactive-popup.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ export default {
Cancel_Button: commonCancelButton,
Confirm_Button: By.css('.confirm-dialog__btn-container button:not(.pop-up-dialog__btn_cancel)'),
Delete_Button: commonDeleteButton,
Message: By.css('#overlay_container > div > div > div:nth-child(2)')
Message: By.css('#mlrun_overlay_container > div > div > div:nth-child(2)')
},
metricsSelectorPopup: {
Search_Metrics_Input: inputGroup(
Expand Down Expand Up @@ -809,8 +809,8 @@ export default {
Content_Application_Log_Info: By.css('.item-info .table__item-logs:nth-of-type(1)'),
Title_Function_Log_Info: By.css('.item-info > div > h3:nth-of-type(2)'),
Content_Function_Log_Info: By.css('.item-info .table__item-logs:nth-of-type(2)'),
Logs_Text_container: By.css('#overlay_container .table__item .table__item-logs-content'),
Logs_Refresh_Button: By.css('#overlay_container .table__item .logs-refresh'),
Logs_Text_container: By.css('#mlrun_overlay_container .table__item .table__item-logs-content'),
Logs_Refresh_Button: By.css('#mlrun_overlay_container .table__item .logs-refresh'),
Requested_Features_Table: By.css('.item-info .item-requested-features__table'),
Returned_Features_Table: By.css('.item-info .details-metadata__table'),
Statistics_Table: By.css('.item-info #DETAILS_STATISTICS_TABLE_ID'),
Expand Down Expand Up @@ -843,10 +843,10 @@ export default {
Category_Selector_Dropdown: categorySelect,
Checkbox_Category_Selector: commonTable(checkboxCategorySelector),
Overlay: By.css(
'#overlay_container .chip-block-hidden .chip-block-hidden__scrollable-container'
'#mlrun_overlay_container .chip-block-hidden .chip-block-hidden__scrollable-container'
),
Hyperparameter_Checkbox: checkboxComponent({
root: '#overlay_container .form-field-checkbox',
root: '#mlrun_overlay_container .form-field-checkbox',
elements: {
checkbox: 'input',
name: 'label',
Expand Down Expand Up @@ -1455,9 +1455,9 @@ export default {
YAML_Modal_Container: By.css('.pop-up-dialog .yaml-modal-container pre')
},
jobLogsPopup: {
Title: By.css('#overlay_container .alerts-logs .modal__content .modal__header-title'),
Cross_Cancel_Button: By.css('#overlay_container .alerts-logs .modal__header-button .data-ellipsis'),
Alerts_Logs_Container: By.css('#overlay_container .alerts-logs .modal__body .table__item-logs-container')
Title: By.css('#mlrun_overlay_container .alerts-logs .modal__content .modal__header-title'),
Cross_Cancel_Button: By.css('#mlrun_overlay_container .alerts-logs .modal__header-button .data-ellipsis'),
Alerts_Logs_Container: By.css('#mlrun_overlay_container .alerts-logs .modal__body .table__item-logs-container')
},
confirmPopup: {
Title: By.css('.pop-up-dialog .pop-up-dialog__header'),
Expand Down Expand Up @@ -1657,67 +1657,67 @@ export default {
Table_Project_Filter_Input: commonProjectFilterInput,
Project_Name_Filter_Dropdown: dropdownComponent(
generateDropdownGroup(
'#overlay_container [data-testid="pop-up-dialog"] [data-testid="project-form-field-select"]',
'#mlrun_overlay_container [data-testid="pop-up-dialog"] [data-testid="project-form-field-select"]',
'.form-field__control',
'.options-list [data-testid="select-option"]'
)
),
Mode_Filter_Dropdown: dropdownComponent(
generateDropdownGroup(
'#overlay_container [data-testid="me-mode-form-field-select"] [data-testid="select-header"]',
'#mlrun_overlay_container [data-testid="me-mode-form-field-select"] [data-testid="select-header"]',
'.form-field__control',
'.options-list [data-testid="select-option"]'
)
),
Entity_Type_Filter_Dropdown: dropdownComponent(
generateDropdownGroup(
'#overlay_container [data-testid="pop-up-dialog"] [data-testid="entity-type-form-field-select"]',
'#mlrun_overlay_container [data-testid="pop-up-dialog"] [data-testid="entity-type-form-field-select"]',
'.form-field__control',
'.options-list [data-testid="select-option"]'
)
),
Entity_ID_Filter_Input: inputGroup(
generateInputGroup(
'#overlay_container [data-testid="pop-up-dialog"] [data-testid="entity-form-field-input"]',
'#mlrun_overlay_container [data-testid="pop-up-dialog"] [data-testid="entity-form-field-input"]',
true,
false,
true
)
),
Endpoint_Application_Filter_Input: inputGroup(
generateInputGroup(
'#overlay_container [data-testid="pop-up-dialog"] [data-testid="endpoint-application-form-field-input"]',
'#mlrun_overlay_container [data-testid="pop-up-dialog"] [data-testid="endpoint-application-form-field-input"]',
true,
false,
true
)
),
Endpoint_Result_Filter_Input: inputGroup(
generateInputGroup(
'#overlay_container [data-testid="pop-up-dialog"] [data-testid="endpoint-result-form-field-input"]',
'#mlrun_overlay_container [data-testid="pop-up-dialog"] [data-testid="endpoint-result-form-field-input"]',
true,
false,
true
)
),
Job_Name_Filter_Input: inputGroup(
generateInputGroup(
'#overlay_container [data-testid="pop-up-dialog"] [data-testid="job-name-form-field-input"]',
'#mlrun_overlay_container [data-testid="pop-up-dialog"] [data-testid="job-name-form-field-input"]',
true,
false,
true
)
),
Severity_Filter_Dropdown: dropdownComponent(
generateDropdownGroup(
'#overlay_container [data-testid="pop-up-dialog"] [data-testid="severity-form-field-select"]',
'#mlrun_overlay_container [data-testid="pop-up-dialog"] [data-testid="severity-form-field-select"]',
'.form-field__control',
'.options-list [data-testid="select-checkbox"]'
)
),
Event_Type_Filter_Dropdown: dropdownComponent(
generateDropdownGroup(
'#overlay_container [data-testid="pop-up-dialog"] [data-testid="event-type-form-field-select"]',
'#mlrun_overlay_container [data-testid="pop-up-dialog"] [data-testid="event-type-form-field-select"]',
'.form-field__control',
'.options-list [data-testid="select-option"]'
)
Expand Down Expand Up @@ -1763,15 +1763,15 @@ export default {
)
),
Show_Iterations_Checkbox: checkboxComponent({
root: '#overlay_container .form-field-checkbox input',
root: '#mlrun_overlay_container .form-field-checkbox input',
elements: {
checkbox: '',
name: '',
icon: ''
}
}),
Show_Untagged: checkboxComponent({
root: '#overlay_container .form-field-checkbox input',
root: '#mlrun_overlay_container .form-field-checkbox input',
elements: {
checkbox: '',
name: '',
Expand Down Expand Up @@ -1930,7 +1930,7 @@ export default {
icon: ''
}
}),
Checkbox_Label: By.css('#overlay_container .form-field-checkbox label'),
Checkbox_Label: By.css('#mlrun_overlay_container .form-field-checkbox label'),
Table_Projects_Filter_Dropdown: dropdownComponent(
generateDropdownGroup(
'[data-testid="project-form-field-select"] [data-testid="select-header"]',
Expand All @@ -1953,12 +1953,12 @@ export default {
Header_Download_Pop_Up: By.css('[data-testid="download-container"] .download-container__header')
},
notificationPopUp: {
Title: By.css('#overlay_container .notification__body'),
Notification_Pop_Up: By.css('#overlay_container .notification__body'),
Title: By.css('#mlrun_overlay_container .notification__body'),
Notification_Pop_Up: By.css('#mlrun_overlay_container .notification__body'),
Notification_Pop_Up_Cross_Close_Button: By.css(
'#overlay_container .notification__button-close'
'#mlrun_overlay_container .notification__button-close'
),
Retry_Button: By.css('#overlay_container .notification__body .notification__body__button-retry')
Retry_Button: By.css('#mlrun_overlay_container .notification__body .notification__body__button-retry')
},
addTagPopup: {
Add_Tag_Popup: By.css('[data-testid="modal"]'),
Expand Down
2 changes: 1 addition & 1 deletion tests/features/common/page-objects/llm-prompts.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default {
Table_FilterBy_Button: By.css('[data-testid="filter-menu-btn-tooltip-wrapper"]'),
Refresh_Button: By.css('[data-testid="refresh"] [data-testid="refresh-tooltip-wrapper"]'),
LLMPrompts_Table: commonTable(overallTable),
Overlay: By.css('#overlay_container .chip-block-hidden_visible'),
Overlay: By.css('#mlrun_overlay_container .chip-block-hidden_visible'),
History_Back_Button: By.css('.history-back-link .history-back-link__icon'),
Version_History_Title: By.css(
'.history-back-link .history-back-link__title [data-testid="version-history"]'
Expand Down
4 changes: 2 additions & 2 deletions tests/features/common/page-objects/models.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export default {
'.content__action-bar-wrapper .action-bar__actions [data-testid="refresh"]'
),
Models_Table: commonTable(modelsTable),
Overlay: By.css('#overlay_container .chip-block-hidden_visible'),
Overlay: By.css('#mlrun_overlay_container .chip-block-hidden_visible'),
Register_Model_Button: By.css('.content__action-bar-wrapper .action-bar__actions .btn-tertiary'),
Train_Model_Button: By.css('.content__action-bar-wrapper .action-bar__actions .btn-primary'),
Table_FilterBy_Button: By.css('.models .action-bar [data-testid="filter-menu-btn"]'),
Expand All @@ -283,7 +283,7 @@ export default {
modelEndpoints: {
Table_Refresh_Button: tableRefreshButton,
Model_Endpoints_Table: commonTable(modelsEndpointTable),
Overlay: By.css('#overlay_container .chip-block-hidden_visible'),
Overlay: By.css('#mlrun_overlay_container .chip-block-hidden_visible'),
Table_FilterBy_Button: By.css('[data-testid="filter-menu-btn-tooltip-wrapper"]'),
Column_Name_Header: By.css('[data-testid="name"]'),
Sort_By_Name: By.css('[data-testid="name"].sortable-header-cell_active svg'),
Expand Down
2 changes: 1 addition & 1 deletion tests/features/common/page-objects/project-settings.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,6 @@ export default {
Secrets_Table: commonTable(secretsTable),
Add_Secret_Button: By.css('[data-testid="secrets-add-btn"]'),
Secrets_Hint: By.css('.settings__card-subtitle'),
Error_Message: By.css('#overlay_container .notification__body')
Error_Message: By.css('#mlrun_overlay_container .notification__body')
}
}
4 changes: 2 additions & 2 deletions tests/features/common/page-objects/projects.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const ProjectsTableSelector = {
root: '.project-card__actions-menu',
menuElements: {
open_button: 'button',
options: '#overlay_container .actions-menu__option'
options: '#mlrun_overlay_container .actions-menu__option'
}
}
}
Expand Down Expand Up @@ -125,7 +125,7 @@ export default {
Refresh_Projects_Button: By.css('.projects-content-header .data-ellipsis button'),
Projects_Table: commonTable(ProjectsTableSelector),
Project_Card_Alert_Icon: By.css('.project-card__header-title .project-card__alert'),
Overlay: By.css('#overlay_container .chip-block-hidden_visible'),
Overlay: By.css('#mlrun_overlay_container .chip-block-hidden_visible'),
Active_Projects_Button: By.css(
'.projects__wrapper .projects-content-header .projects-content-header-item [data-testid="active"]'
),
Expand Down
2 changes: 1 addition & 1 deletion tests/features/common/page-objects/side-panel.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ export default {
'.feature-set-panel .panel-title .checkbox'
),
Passthrough_PopUp_Dialog:{
Dialog_PopUp: By.css('#overlay_container .pop-up-dialog'),
Dialog_PopUp: By.css('#mlrun_overlay_container .pop-up-dialog'),
Close_Button: By.css('.pop-up-dialog .pop-up-dialog__header .pop-up-dialog__btn_close'),
Dialog_Message: By.css('.pop-up-dialog .confirm-dialog__message'),
Keep_Online_Target_Set_Button: By.css('.pop-up-dialog .confirm-dialog__btn-container .btn-tertiary'),
Expand Down
Loading