Skip to content

Commit 81fd7cd

Browse files
Ash-expAsh-exp
committed
EA mod fixes
1 parent 695c154 commit 81fd7cd

File tree

5 files changed

+74
-61
lines changed

5 files changed

+74
-61
lines changed

‎src/components/deploymentConfig/DeploymentTemplateView/DeploymentTemplateEditorView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ export default function DeploymentTemplateEditorView({
339339
<div className="code-editor__header flex left w-100 p-0-imp">
340340
<div className="flex left fs-12 fw-6 cn-9 dc__border-right h-32 pl-12 pr-12">
341341
<span className="fw-n" style={{ width: '85px' }}>
342-
Compare with:{' '}
342+
Compare with:
343343
</span>
344344
<CompareWithDropdown
345345
envId={envId}

‎src/components/dockerRegistry/Docker.tsx

Lines changed: 63 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -555,14 +555,16 @@ function DockerForm({
555555
.replace(/^oci?:\/\//, '')
556556
.replace(/^docker?:\/\//, '')
557557
.replace(/^http?:\/\//, ''),
558-
...(selectedDockerRegistryType.value === RegistryType.ECR
558+
...(selectedDockerRegistryType.value === RegistryType.ECR &&
559+
registryStorageType !== RegistryStorageType.OCI_PUBLIC
559560
? {
560561
awsAccessKeyId: customState.awsAccessKeyId.value?.trim(),
561562
awsSecretAccessKey: parsePassword(customState.awsSecretAccessKey.value),
562563
awsRegion: awsRegion,
563564
}
564565
: {}),
565-
...(selectedDockerRegistryType.value === RegistryType.ARTIFACT_REGISTRY ||
566+
...((selectedDockerRegistryType.value === RegistryType.ARTIFACT_REGISTRY &&
567+
registryStorageType !== RegistryStorageType.OCI_PUBLIC) ||
566568
selectedDockerRegistryType.value === RegistryType.GCR
567569
? {
568570
username: trimmedUsername,
@@ -572,15 +574,17 @@ function DockerForm({
572574
: `'${parsePassword(customState.password.value)}'`,
573575
}
574576
: {}),
575-
...(selectedDockerRegistryType.value === RegistryType.DOCKER_HUB ||
576-
selectedDockerRegistryType.value === RegistryType.ACR ||
577-
selectedDockerRegistryType.value === RegistryType.QUAY
577+
...(registryStorageType !== RegistryStorageType.OCI_PUBLIC &&
578+
(selectedDockerRegistryType.value === RegistryType.DOCKER_HUB ||
579+
selectedDockerRegistryType.value === RegistryType.ACR ||
580+
selectedDockerRegistryType.value === RegistryType.QUAY)
578581
? {
579582
username: trimmedUsername,
580583
password: parsePassword(customState.password.value),
581584
}
582585
: {}),
583-
...(selectedDockerRegistryType.value === RegistryType.OTHER
586+
...(registryStorageType !== RegistryStorageType.OCI_PUBLIC &&
587+
selectedDockerRegistryType.value === RegistryType.OTHER
584588
? {
585589
username: trimmedUsername,
586590
password: parsePassword(customState.password.value),
@@ -692,31 +696,28 @@ function DockerForm({
692696

693697
function onValidation() {
694698
if (selectedDockerRegistryType.value === RegistryType.ECR) {
695-
if (registryStorageType === RegistryStorageType.OCI_PRIVATE) {
696-
if (
697-
(!isIAMAuthType &&
698-
(!customState.awsAccessKeyId.value || !(customState.awsSecretAccessKey.value || id))) ||
699-
!customState.registryUrl.value
700-
) {
701-
setCustomState((st) => ({
702-
...st,
703-
awsAccessKeyId: { ...st.awsAccessKeyId, error: st.awsAccessKeyId.value ? '' : 'Mandatory' },
704-
awsSecretAccessKey: {
705-
...st.awsSecretAccessKey,
706-
error: id || st.awsSecretAccessKey.value ? '' : 'Mandatory',
707-
},
708-
registryUrl: { ...st.registryUrl, error: st.registryUrl.value ? '' : 'Mandatory' },
709-
}))
710-
return
711-
}
712-
} else {
713-
if (!customState.registryUrl.value) {
714-
setCustomState((st) => ({
715-
...st,
716-
registryUrl: { ...st.registryUrl, error: st.registryUrl.value ? '' : 'Mandatory' },
717-
}))
718-
return
719-
}
699+
if ( registryStorageType === RegistryStorageType.OCI_PRIVATE &&
700+
(!isIAMAuthType &&
701+
(!customState.awsAccessKeyId.value || !(customState.awsSecretAccessKey.value || id))) ||
702+
!customState.registryUrl.value
703+
) {
704+
setCustomState((st) => ({
705+
...st,
706+
awsAccessKeyId: { ...st.awsAccessKeyId, error: st.awsAccessKeyId.value ? '' : 'Mandatory' },
707+
awsSecretAccessKey: {
708+
...st.awsSecretAccessKey,
709+
error: id || st.awsSecretAccessKey.value ? '' : 'Mandatory',
710+
},
711+
registryUrl: { ...st.registryUrl, error: st.registryUrl.value ? '' : 'Mandatory' },
712+
}))
713+
return
714+
}
715+
if (!customState.registryUrl.value) {
716+
setCustomState((st) => ({
717+
...st,
718+
registryUrl: { ...st.registryUrl, error: st.registryUrl.value ? '' : 'Mandatory' },
719+
}))
720+
return
720721
}
721722
} else if (selectedDockerRegistryType.value === RegistryType.DOCKER_HUB) {
722723
if (
@@ -729,34 +730,41 @@ function DockerForm({
729730
password: { ...st.password, error: id || st.password.value ? '' : 'Mandatory' },
730731
}))
731732
return
733+
}
734+
if (!customState.registryUrl.value) {
735+
setCustomState((st) => ({
736+
...st,
737+
registryUrl: { ...st.registryUrl, error: st.registryUrl.value ? '' : 'Mandatory' },
738+
}))
739+
return
732740
}
733741
} else if (
734742
selectedDockerRegistryType.value === RegistryType.ARTIFACT_REGISTRY ||
735743
selectedDockerRegistryType.value === RegistryType.GCR
736744
) {
737745
const isValidJsonFile = isValidJson(customState.password.value) || id
738746
const isValidJsonStr = isValidJsonFile ? '' : 'Invalid JSON'
739-
if (registryStorageType === RegistryStorageType.OCI_PRIVATE) {
740-
if (!customState.username.value || !(customState.password.value || id) || !isValidJsonFile) {
741-
setCustomState((st) => ({
742-
...st,
743-
username: { ...st.username, error: st.username.value ? '' : 'Mandatory' },
744-
password: {
745-
...st.password,
746-
error: id || st.password.value ? isValidJsonStr : 'Mandatory',
747-
},
748-
registryUrl: { ...st.registryUrl, error: st.registryUrl.value ? '' : 'Mandatory' },
749-
}))
750-
return
751-
}
752-
} else {
753-
if (!customState.registryUrl.value) {
754-
setCustomState((st) => ({
755-
...st,
756-
registryUrl: { ...st.registryUrl, error: st.registryUrl.value ? '' : 'Mandatory' },
757-
}))
758-
return
759-
}
747+
if (
748+
registryStorageType === RegistryStorageType.OCI_PRIVATE &&
749+
(!customState.username.value || !(customState.password.value || id) || !isValidJsonFile)
750+
) {
751+
setCustomState((st) => ({
752+
...st,
753+
username: { ...st.username, error: st.username.value ? '' : 'Mandatory' },
754+
password: {
755+
...st.password,
756+
error: id || st.password.value ? isValidJsonStr : 'Mandatory',
757+
},
758+
registryUrl: { ...st.registryUrl, error: st.registryUrl.value ? '' : 'Mandatory' },
759+
}))
760+
return
761+
}
762+
if (!customState.registryUrl.value) {
763+
setCustomState((st) => ({
764+
...st,
765+
registryUrl: { ...st.registryUrl, error: st.registryUrl.value ? '' : 'Mandatory' },
766+
}))
767+
return
760768
}
761769
} else if (
762770
selectedDockerRegistryType.value === RegistryType.ACR ||
@@ -1740,18 +1748,19 @@ function DockerForm({
17401748
className="cta flex h-36 delete dc__m-auto ml-0"
17411749
data-testid="delete-container-registry"
17421750
type="button"
1751+
disabled={loading}
17431752
onClick={() => toggleConfirmation(true)}
17441753
>
17451754
{deleting ? <Progressing /> : 'Delete'}
17461755
</button>
17471756
)}
1748-
<button className="cta flex h-36 mr-16 cancel" type="button" onClick={setToggleCollapse}>
1757+
<button className="cta flex h-36 mr-16 cancel" type="button" onClick={setToggleCollapse} disabled={loading || deleting}>
17491758
Cancel
17501759
</button>
17511760
<button
17521761
className="cta flex h-36"
17531762
type="submit"
1754-
disabled={loading}
1763+
disabled={loading || deleting}
17551764
data-testid="container-registry-save-button"
17561765
>
17571766
{loading ? <Progressing /> : id ? 'Update' : 'Save'}

‎src/components/globalConfigurations/GlobalConfiguration.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ function NavItem({ serverMode }) {
389389
<div className="flexbox flex-justify">External Links</div>
390390
</NavLink>
391391

392-
{window._env_.ENABLE_SCOPED_VARIABLES && (
392+
{serverMode !== SERVER_MODE.EA_ONLY && window._env_.ENABLE_SCOPED_VARIABLES && (
393393
<NavLink
394394
to={URLS.GLOBAL_CONFIG_SCOPED_VARIABLES}
395395
key={URLS.GLOBAL_CONFIG_SCOPED_VARIABLES}
@@ -569,7 +569,7 @@ function Body({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
569569
<ExternalLinks />
570570
</Route>,
571571
]}
572-
{window._env_.ENABLE_SCOPED_VARIABLES && (
572+
{serverMode !== SERVER_MODE.EA_ONLY && window._env_.ENABLE_SCOPED_VARIABLES && (
573573
<Route key={URLS.GLOBAL_CONFIG_SCOPED_VARIABLES} path={URLS.GLOBAL_CONFIG_SCOPED_VARIABLES}>
574574
<ScopedVariables isSuperAdmin={isSuperAdmin} />
575575
</Route>

‎src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,16 @@ function EnvironmentSelectorComponent({
127127
async function deleteResourceAction(deleteAction: DELETE_ACTION) {
128128
try {
129129
const response = await getDeleteApplicationApi(deleteAction)
130-
if (response.result.deleteResponse?.deleteInitiated) {
130+
if (response.result.deleteResponse?.deleteInitiated || (isExternalApp && response.result?.success)) {
131131
setShowDeleteConfirmation(false)
132132
showNonCascadeDeleteDialog(false)
133133
showForceDeleteDialog(false)
134134
toast.success('Deletion initiated successfully.')
135135
_init()
136-
} else if (deleteAction !== DELETE_ACTION.NONCASCADE_DELETE && !response.result.deleteResponse?.clusterReachable) {
136+
} else if (
137+
deleteAction !== DELETE_ACTION.NONCASCADE_DELETE &&
138+
!response.result.deleteResponse?.clusterReachable
139+
) {
137140
setClusterName(response.result.deleteResponse?.clusterName)
138141
setShowDeleteConfirmation(false)
139142
showNonCascadeDeleteDialog(true)

‎src/components/v2/values/chartValuesDiff/ChartValuesEditor.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,12 @@ export default function ChartValuesEditor({
152152

153153

154154
useEffect(() => {
155-
if (
155+
const ExternalModeCondition = chartValuesList.length > 0 && isExternalApp
156+
const FullModeCondition =
156157
!manifestView &&
157158
chartValuesList.length > 0 &&
158159
(isDeployChartView || isCreateValueView || deploymentHistoryList.length > 0)
159-
) {
160+
if (ExternalModeCondition || FullModeCondition) {
160161
const deployedChartValues = [],
161162
defaultChartValues = [],
162163
presetChartValues = []

0 commit comments

Comments
 (0)