Skip to content

Commit

Permalink
Fix [UI] UI small fixes 1.7.x (#2808)
Browse files Browse the repository at this point in the history
  • Loading branch information
illia-prokopchuk authored Oct 14, 2024
1 parent 8ae9ab8 commit 48a8873
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"final-form-arrays": "^3.1.0",
"fs-extra": "^10.0.0",
"identity-obj-proxy": "^3.0.0",
"iguazio.dashboard-react-controls": "2.2.1",
"iguazio.dashboard-react-controls": "2.2.2-1.7.x",
"is-wsl": "^1.1.0",
"js-base64": "^2.5.2",
"js-yaml": "^4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/common/Input/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ const Input = React.forwardRef(
type,
value: typedValue
}}
style={floatingLabel ? {} : { paddingLeft: `${labelWidth + 16}px` }}
style={floatingLabel ? {} : { paddingLeft: `${labelWidth + 16}px`, paddingRight: tip ? '25px' : '0px' }}
/>
{label && (
<div className={labelClassNames}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionBar/ActionBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ const ActionBar = ({
/>
))
)}
{autoRefreshIsEnabled && <FormCheckBox label={AUTO_REFRESH} name={AUTO_REFRESH_ID} />}
{autoRefreshIsEnabled && <FormCheckBox className="auto-refresh" label={AUTO_REFRESH} name={AUTO_REFRESH_ID} />}
<FormOnChange handler={setAutoRefresh} name={AUTO_REFRESH_ID} />
{withRefreshButton && (
<RoundedIcon tooltipText="Refresh" onClick={() => refresh(formState)} id="refresh">
Expand Down
4 changes: 2 additions & 2 deletions src/components/FeatureStore/FeatureVectors/FeatureVectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import {
featureVectorsActionCreator,
searchFeatureVectorItem
} from './featureVectors.util'
import { DANGER_BUTTON, LABEL_BUTTON } from 'igz-controls/constants'
import { DANGER_BUTTON, TERTIARY_BUTTON } from 'igz-controls/constants'
import { checkTabIsValid, handleApplyDetailsChanges } from '../featureStore.util'
import { createFeatureVectorsRowData } from '../../../utils/createFeatureStoreContent'
import { getFeatureVectorIdentifier } from '../../../utils/getUniqueIdentifier'
Expand Down Expand Up @@ -204,7 +204,7 @@ const FeatureVectors = ({
header: 'Delete feature vector?',
message: `Are you sure you want to delete the feature vector "${featureVector.name}"?. You cannot restore a feature vector after deleting it.`,
btnCancelLabel: 'Cancel',
btnCancelVariant: LABEL_BUTTON,
btnCancelVariant: TERTIARY_BUTTON,
btnConfirmLabel: 'Delete',
btnConfirmVariant: DANGER_BUTTON,
rejectHandler: () => setConfirmData(null),
Expand Down
4 changes: 2 additions & 2 deletions src/components/FunctionsPage/Functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import {
import createFunctionsRowData from '../../utils/createFunctionsRowData'
import functionsActions from '../../actions/functions'
import jobsActions from '../../actions/jobs'
import { DANGER_BUTTON, LABEL_BUTTON } from 'igz-controls/constants'
import { DANGER_BUTTON, TERTIARY_BUTTON } from 'igz-controls/constants'
import { getFunctionIdentifier } from '../../utils/getUniqueIdentifier'
import { getFunctionNuclioLogs, getFunctionLogs } from '../../utils/getFunctionLogs'
import { isBackgroundTaskRunning } from '../../utils/poll.util'
Expand Down Expand Up @@ -365,7 +365,7 @@ const Functions = ({
header: 'Delete function?',
message: `You try to delete function "${func.name}". Deleted functions cannot be restored.`,
btnCancelLabel: 'Cancel',
btnCancelVariant: LABEL_BUTTON,
btnCancelVariant: TERTIARY_BUTTON,
btnConfirmLabel: 'Delete',
btnConfirmVariant: DANGER_BUTTON,
rejectHandler: () => setConfirmData(null),
Expand Down
3 changes: 1 addition & 2 deletions src/components/Project/project.utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ export const generateCreateNewOptions = (
handler: () => {
openRegisterModelModal()
},
// TODO: remove hidden in 1.4
hidden: true
hidden: !isDemoMode
},
{
label: 'Register Dataset',
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProjectSettings/projectSettings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
padding: 0 15px;
flex: 0 0 auto;
width: 50%;
min-width: 500px;
min-width: 650px;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { Button, PopUpDialog } from 'igz-controls/components'

import { parseFeatureTemplate } from '../../utils/parseFeatureTemplate'
import { generateProjectsList } from '../../utils/projects'
import { LABEL_BUTTON, PRIMARY_BUTTON } from 'igz-controls/constants'
import { TERTIARY_BUTTON, PRIMARY_BUTTON } from 'igz-controls/constants'
import { setFeaturesPanelData, setTablePanelOpen } from '../../reducers/tableReducer'

import { ReactComponent as AddCircle } from 'igz-controls/images/add-circle.svg'
Expand Down Expand Up @@ -244,7 +244,7 @@ const AddToFeatureVectorPopUp = ({
</div>
<div className="pop-up-dialog__footer-container">
<Button
variant={LABEL_BUTTON}
variant={TERTIARY_BUTTON}
label="Cancel"
className="pop-up-dialog__btn_cancel"
onClick={closePopUp}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import {
getInternalLabelsValidationRule
} from 'igz-controls/utils/validation.util'
import { setFieldState, isSubmitDisabled } from 'igz-controls/utils/form.util'
import { LABEL_BUTTON, PRIMARY_BUTTON } from 'igz-controls/constants'
import { TERTIARY_BUTTON, PRIMARY_BUTTON } from 'igz-controls/constants'
import { getChipOptions } from '../../utils/getChipOptions'
import { convertChipsData, parseChipsData } from '../../utils/convertChipsData'

Expand Down Expand Up @@ -149,7 +149,7 @@ const CreateFeatureVectorPopUp = ({
<div className="pop-up-dialog__footer-container">
<Button
type="button"
variant={LABEL_BUTTON}
variant={TERTIARY_BUTTON}
label="Cancel"
className="pop-up-dialog__btn_cancel"
onClick={closePopUp}
Expand Down
5 changes: 4 additions & 1 deletion src/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,6 @@ div[id^='chartjs-tooltip'] {

&__actions {
display: flex;
margin-left: 20px;

.action-button {
white-space: nowrap;
Expand All @@ -870,6 +869,10 @@ div[id^='chartjs-tooltip'] {
margin-right: 10px;
}
}

.auto-refresh {
margin-left: 20px;
}
}
}

Expand Down

0 comments on commit 48a8873

Please sign in to comment.