Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
46bf9e3
Initial conversion logic & added new widgets
sohel-rp Jun 30, 2022
4087d2a
Removed dummy schema
sohel-rp Jun 30, 2022
044d313
Changes as per review comments
sohel-rp Jul 1, 2022
3c6d120
Merge pull request #418 from devtron-labs/1869_86_widgets_and_convers…
sohel-rp Jul 1, 2022
0b822a0
Merge remote-tracking branch 'origin/main' into helm-values-gui
sohel-rp Jul 4, 2022
dfa6385
Initial commit for basic GUI form
sohel-rp Jul 4, 2022
5d8306e
Additional hidden checks
sohel-rp Jul 5, 2022
b6f9223
additional required related checks & fixes
sohel-rp Jul 6, 2022
b7ba593
minor fixes
sohel-rp Jul 6, 2022
1bf92fa
minor changes
sohel-rp Jul 6, 2022
0a45f09
Merge remote-tracking branch 'origin/main' into helm-values-gui
sohel-rp Jul 12, 2022
7bea296
Merge branch 'helm-values-gui' into 1868_helm_values_gui_form
sohel-rp Jul 12, 2022
84986ec
Removed dummy schema related changes and other minor changes
sohel-rp Jul 12, 2022
f0f6b77
validation for required fields
sohel-rp Jul 13, 2022
c9cbfaa
minor change
sohel-rp Jul 18, 2022
d76a510
Merge branch 'main' into helm-values-gui
sohel-rp Jul 18, 2022
c9bf83a
Merge branch 'helm-values-gui' into 1868_helm_values_gui_form
sohel-rp Jul 18, 2022
8b0c69b
minor change
sohel-rp Jul 18, 2022
324c291
isFieldHidden check fix & added types
sohel-rp Jul 19, 2022
0576c6a
Added some checks & fixed preset value issue
sohel-rp Jul 19, 2022
329cda8
minor change
sohel-rp Jul 19, 2022
c6a5786
Merge branch 'main' into helm-values-gui
sohel-rp Jul 19, 2022
3715869
Merge branch 'helm-values-gui' into 1868_helm_values_gui_form
sohel-rp Jul 19, 2022
5a02ceb
Review comments
sohel-rp Jul 19, 2022
04f74b3
Minor fixes
sohel-rp Jul 20, 2022
fdf19d9
number input value issue fix
sohel-rp Jul 20, 2022
687e310
additional hidden fields conditions
sohel-rp Jul 21, 2022
6689dca
FormBox issue fix
sohel-rp Jul 21, 2022
0f74b6c
minor hidden condition issue fix
sohel-rp Jul 21, 2022
6b790c9
fix for path & value to set in issue
sohel-rp Jul 22, 2022
be793c6
minor fix
sohel-rp Jul 22, 2022
a0c5522
review suggestion fixes
sohel-rp Jul 22, 2022
198969d
Added additional instance of check
sohel-rp Jul 22, 2022
c362807
minor
sohel-rp Jul 22, 2022
fcb5fb5
Merge pull request #441 from devtron-labs/1868_helm_values_gui_form
sohel-rp Jul 22, 2022
9099ed6
Merge branch 'main' into helm-values-gui
sohel-rp Jul 22, 2022
2370604
Merge branch 'main' into helm-values-gui
sohel-rp Jul 22, 2022
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
3 changes: 1 addition & 2 deletions src/components/charts/chartValues/ChartValues.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { ChartInstalledConfig, ChartKind } from '../../v2/values/chartValuesDiff

export default function ChartValues() {
const { chartId, chartValueId } = useParams<{ chartId: string; chartValueId: string }>()
const [loader, setLoader] = useState(false)
const [loader, setLoader] = useState(true)
const [errorStatusCode, setErrorStatusCode] = useState(0)
const [appStoreApplicationName, setAppStoreApplicationName] = useState('')
const [valueName, setValueName] = useState('')
Expand All @@ -34,7 +34,6 @@ export default function ChartValues() {

async function getChartDetails() {
try {
setLoader(true)
const { result: chartVersionMinResult } = await getChartVersionsMin(chartId)
setChartVersions(chartVersionMinResult)

Expand Down
2 changes: 1 addition & 1 deletion src/components/charts/charts.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export function updateChartGroupEntries(payload) {
}

export function getReadme(appStoreApplicationVersionId: number) {
return get(`app-store/discover/application/readme/${appStoreApplicationVersionId}`)
return get(`app-store/discover/application/chartInfo/${appStoreApplicationVersionId}`)
}

export function getChartGroupInstallationDetails(chartGroupId: number | string) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/RadioGroup/RadioGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const RadioGroup: React.FC<RadioGroupInterface> & RadioGroupComposition = React.
)
})

function Radio({ value, children, className = '', showTippy = false, tippyContent = '', canSelect = true }) {
function Radio({ value, children, className = '', showTippy = false, tippyContent = '', canSelect = true, isDisabled = false }) {
const { name, selected, select, disabled, onChange } = useRadioContext()
return (
<ConditionalWrap
Expand All @@ -73,7 +73,7 @@ function Radio({ value, children, className = '', showTippy = false, tippyConten
}
onChange(e)
}}
disabled={disabled}
disabled={isDisabled || disabled}
/>
<span className="radio__item-label">{children}</span>
</label>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/formFields/Checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export enum CHECKBOX_VALUE {
CHECKED = 'CHECKED',
INTERMEDIATE = 'INTERMEDIATE',
}
interface CheckboxProps {
export interface CheckboxProps {
onChange: (event) => void
isChecked: boolean
value: 'CHECKED' | 'INTERMEDIATE'
Expand Down
74 changes: 74 additions & 0 deletions src/components/common/formFields/Widgets/Widgets.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
.styled-field.form__row {
.info-label-icon {
svg circle {
fill: var(--N500);
}
}

.error-label-icon {
svg g path:nth-of-type(2) {
fill: var(--R500);
}
}
}

.styled-form-box {
> .styled-form-box:last-of-type {
margin-bottom: 0 !important;
}
}

.required-field::after {
content: ' *';
color: var(--R500);
}

.slider-input-box-container {
.slider-input {
-webkit-appearance: none;
width: 450px;
height: 12px;
border-radius: 6px;
background: linear-gradient(to right, var(--B500) 0%, var(--B500) 50%, var(--N200) 50%, var(--N200) 100%);
outline: none;
transition: background 450ms ease-in;
}

.slider-input::-webkit-slider-thumb {
-webkit-appearance: none;
appearance: none;
height: 24px;
width: 24px;
border-radius: 50%;
background-image: radial-gradient(circle, var(--B500) 35%, white 36%);
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
cursor: pointer;
}

.slider-input::-moz-range-thumb {
height: 24px;
width: 24px;
border-radius: 50%;
background-image: radial-gradient(circle, var(--B500) 35%, white 36%);
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
cursor: pointer;
}

.slider-input-box-wrapper {
.slider-input-box,
.slider-input-unit {
padding: 6px 10px;
}

.slider-input-box {
width: 98px;
background-color: var(--N50);
outline: none;
}

.slider-input-unit {
background-color: white;
border-left: none;
}
}
}
Loading