Skip to content

Commit 444226c

Browse files
committed
chore: add util for getting cd node
1 parent 7861c44 commit 444226c

File tree

4 files changed

+28
-19
lines changed

4 files changed

+28
-19
lines changed

src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ import { RenderCDMaterialContentProps } from './types'
130130
import { WebhookReceivedPayloadModal } from '@Components/app/details/triggerView/WebhookReceivedPayloadModal'
131131
import { getExternalCIConfig } from '@Components/ciPipeline/Webhook/webhook.service'
132132
import { shouldRenderWebhookAddImageModal } from '@Components/app/details/triggerView/TriggerView.utils'
133+
import { getSelectedCDNode } from './utils'
133134

134135
const ApprovalMaterialModal = importComponentFromFELibrary('ApprovalMaterialModal')
135136
const getCIBlockState: (...props) => Promise<BlockedStateData> = importComponentFromFELibrary(
@@ -1449,17 +1450,10 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
14491450
)
14501451
if (!_cdNode) return null
14511452

1452-
let _selectedNode: CommonNodeAttr | undefined
1453-
if (bulkTriggerType === DeploymentNodeType.PRECD) {
1454-
_selectedNode = _cdNode.preNode
1455-
} else if (bulkTriggerType === DeploymentNodeType.CD) {
1456-
_selectedNode = _cdNode
1457-
} else if (bulkTriggerType === DeploymentNodeType.POSTCD) {
1458-
_selectedNode = _cdNode.postNode
1459-
}
1460-
1453+
const _selectedNode: CommonNodeAttr | undefined = getSelectedCDNode(bulkTriggerType, _cdNode)
1454+
14611455
const selectedArtifacts = _selectedNode?.[materialType]?.filter((artifact) => artifact.isSelected) ?? []
1462-
if (_selectedNode && selectedArtifacts.length > 0) {
1456+
if (selectedArtifacts?.length > 0) {
14631457
return { node: _selectedNode, wf }
14641458
}
14651459
return null

src/components/ApplicationGroup/Details/TriggerView/utils.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { CommonNodeAttr, DeploymentNodeType } from '@devtron-labs/devtron-fe-common-lib'
18+
1719
import { getIsMaterialApproved } from '@Components/app/details/triggerView/cdMaterials.utils'
1820

1921
import { BulkCDDetailType, BulkCIDetailType } from '../../AppGroup.types'
@@ -46,6 +48,19 @@ export const getIsImageApprovedByDeployerSelected = (appList: BulkCDDetailType[]
4648
)
4749
})
4850

51+
export const getSelectedCDNode = (bulkTriggerType: DeploymentNodeType, _cdNode: CommonNodeAttr) => {
52+
if (bulkTriggerType === DeploymentNodeType.PRECD) {
53+
return _cdNode.preNode
54+
}
55+
if (bulkTriggerType === DeploymentNodeType.CD) {
56+
return _cdNode
57+
}
58+
if (bulkTriggerType === DeploymentNodeType.POSTCD) {
59+
return _cdNode.postNode
60+
}
61+
return null
62+
}
63+
4964
export const getSelectedAppListForBulkStrategy = (appList: BulkCDDetailType[], feasiblePipelineIds: Set<number>) =>
5065
appList
5166
.map((app) => ({ pipelineId: +app.cdPipelineId, appName: app.name }))

src/css/colorPalette.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ $black: 0, 0, 0;
247247
--shadow-modal: 0px 1px 1px 0px rgba(#{$black}, 0.04), 0px 2px 8px 0px rgba(#{$black}, 0.04), 0px 3px 17px 0px rgba(#{$black}, 0.04), 0px 4px 30px 0px rgba(#{$black}, 0.13);
248248
--shadow-overlay: 0px 1px 1px 0px rgba(#{$black}, 0.04), 0px 2px 6px 0px rgba(#{$black}, 0.04), 0px 4px 12px 0px rgba(#{$black}, 0.1);
249249
--shadow-drawer: 0px 1px 1px 0px rgba(#{$black}, 0.04), 0px 2px 8px 0px rgba(#{$black}, 0.04), 0px 3px 17px 0px rgba(#{$black}, 0.04), 0px 4px 30px 0px rgba(#{$black}, 0.13);
250-
--shadow-card-primary: 0px 1px 2px 0px rgba(1, 87, 173, 0.1);
251-
--shadow-card-secondary: 0px 0px 8px 0px rgba(#{$black}, 0.1);
252-
--shadow-card-tertiary: 0 8px 12px 0 rgba(30, 35, 96, 0.1), 0 1px 4px 0 rgba(#{$black}, 0.1);
250+
--shadow-10: 0px 0px 4px 0px var(--black-20);
251+
--shadow-20: 0px 0px 7px 0px var(--black-20);
252+
--shadow-30: 0px 0px 10px 0px var(--black-20);
253253

254254
&.theme {
255255
&__light {

src/css/themeUtils.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,16 @@
116116
}
117117

118118
&__card {
119-
&--primary {
120-
box-shadow: var(--shadow-card-primary);
119+
&--10 {
120+
box-shadow: var(--shadow-10);
121121
}
122122

123-
&--secondary {
124-
box-shadow: var(--shadow-card-secondary);
123+
&--20 {
124+
box-shadow: var(--shadow-20);
125125
}
126126

127-
&--tertiary {
128-
box-shadow: var(--shadow-card-tertiary);
127+
&--30 {
128+
box-shadow: var(--shadow-10);
129129
}
130130
}
131131
}

0 commit comments

Comments
 (0)