Skip to content
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.

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

[WIP]: PR for viewing diff #2245

Closed
wants to merge 80 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
f8b9717
fix: AppListFilters - Filter Dropdown - when timer updates, filter se…
RohitRaj011 Nov 14, 2024
efa2989
fix: ChartUsedCard - color update
RohitRaj011 Nov 14, 2024
b2425ae
feat: replace hibernate modal with confirmation dialog
arunjaindev Nov 18, 2024
d419509
chore: add prop handleClose
arunjaindev Nov 18, 2024
028391a
Merge branch 'develop' into fix/misc-bug-fixes
shivani170 Nov 19, 2024
3030d5f
Chore: version bump
arunjaindev Nov 19, 2024
f61456e
chore: chart UI fixes
shivani170 Nov 19, 2024
2bbc470
chore: removed unused code
shivani170 Nov 19, 2024
5459c79
refactor: remove nodeDetailsList and handle node listing through k8sR…
Elessar1802 Nov 19, 2024
e9477cd
Merge branch 'develop' of github.com:devtron-labs/dashboard into refa…
Elessar1802 Nov 19, 2024
8bd324b
chore: revert code
shivani170 Nov 20, 2024
5a134ad
chore: code formatting
shivani170 Nov 20, 2024
c46ba18
Merge branch 'develop' of github.com:devtron-labs/dashboard into feat…
eshankvaish Nov 20, 2024
0a3d19e
chore: bump common lib
eshankvaish Nov 20, 2024
79dee60
feat: update color for diff view
eshankvaish Nov 20, 2024
aa82331
chore: bump common
eshankvaish Nov 20, 2024
e3237b4
fix: check for old appliedColumns format
Elessar1802 Nov 20, 2024
1a5e442
chore: bump common lib
eshankvaish Nov 20, 2024
60ffc9a
feat: remove markdown and marked from dashboard
arunjaindev Nov 20, 2024
3f30835
chore: revert target url
arunjaindev Nov 20, 2024
b2d1074
feat: helm charts sidebar ui fixes
arunjaindev Nov 20, 2024
6881766
chore: document body replaced with ref
shivani170 Nov 21, 2024
0a67522
fix: add error icon for errors column & colors in status column
Elessar1802 Nov 21, 2024
d2fde88
Merge pull request #2212 from devtron-labs/fix/misc-bug-fixes
shivani170 Nov 21, 2024
e81f300
refactor: use select picker in column selector & minor css improvements
Elessar1802 Nov 21, 2024
6acb4d3
Merge branch 'develop' of github.com:devtron-labs/dashboard into chor…
eshankvaish Nov 21, 2024
f90fbba
chore: version bump
eshankvaish Nov 21, 2024
ee17391
fix: review comments
Elessar1802 Nov 21, 2024
fc4fba6
Merge branch 'main' of github.com:devtron-labs/dashboard into chore/r…
eshankvaish Nov 21, 2024
5e60ea0
Merge pull request #2226 from devtron-labs/chore/rc-23-dev-sync
eshankvaish Nov 21, 2024
df33e52
Merge branch 'refactor/node-details-list' of github.com:devtron-labs/…
Elessar1802 Nov 21, 2024
2e3c6b8
fix: sonarlint issues
Elessar1802 Nov 21, 2024
f7b05a7
Merge branch 'refactor/node-details-list' of github.com:devtron-labs/…
Elessar1802 Nov 21, 2024
28a1cbc
Merge pull request #2222 from devtron-labs/fix/node-details-list
Elessar1802 Nov 21, 2024
3bcbd94
chore: minor code refactorings suggested in review
Elessar1802 Nov 21, 2024
7dc3df7
Merge branch 'refactor/node-details-list' of github.com:devtron-labs/…
Elessar1802 Nov 21, 2024
b1e963f
Merge branch 'develop' of github.com:devtron-labs/dashboard into refa…
Elessar1802 Nov 21, 2024
bdccc50
chore: update common-lib verion
Elessar1802 Nov 22, 2024
3eca66b
chore: remove unneeded checks & send abortControllerRef to fetch
Elessar1802 Nov 22, 2024
29700fe
fix: dont check for namespaced in kind selector of user permission
Elessar1802 Nov 22, 2024
ceebc93
Merge pull request #2216 from devtron-labs/refactor/node-details-list
Elessar1802 Nov 22, 2024
bd982a4
Merge branch 'develop' of github.com:devtron-labs/dashboard into feat…
eshankvaish Nov 22, 2024
77cd37e
Merge pull request #2219 from devtron-labs/feat/react-diff-viewer
eshankvaish Nov 22, 2024
e2262b9
Merge branch 'develop' of github.com:devtron-labs/dashboard into fix/…
Elessar1802 Nov 25, 2024
e3b4333
feat: remove super admin checks for terminal, node details, etc
Elessar1802 Nov 25, 2024
e6ea96d
Merge branch 'develop' of https://github.com/devtron-labs/dashboard i…
arunjaindev Nov 25, 2024
6c5180f
chore: format file
arunjaindev Nov 25, 2024
b73d67b
chore: version bump
arunjaindev Nov 25, 2024
642226d
chore: remove import of tooltip props
arunjaindev Nov 25, 2024
afc83a8
feat: hide node option from sidebar if no permission for it
Elessar1802 Nov 25, 2024
46d738b
chore: update common-lib verion
Elessar1802 Nov 25, 2024
58d4f25
chore: extract find method
arunjaindev Nov 25, 2024
2b7d8ca
chore: extract option value
arunjaindev Nov 25, 2024
1a322e9
feat: add props show delete dialog
arunjaindev Nov 25, 2024
913a942
Merge branch 'develop' of https://github.com/devtron-labs/dashboard i…
arunjaindev Nov 25, 2024
4963af4
chore: rename backdrop id
arunjaindev Nov 25, 2024
8d14eae
chore: background size for status
arunjaindev Nov 25, 2024
62f2645
chore: version bump
arunjaindev Nov 25, 2024
5f35bbc
Merge pull request #2221 from devtron-labs/feat/marked-version-bump
arunjaindev Nov 25, 2024
2ce87c6
fix: k8sResourceList empty before selectedResource is set
Elessar1802 Nov 25, 2024
2b302d4
fix: isOpen is false on mount for k8s tab component
Elessar1802 Nov 26, 2024
f414119
Merge branch 'main' of github.com:devtron-labs/dashboard into fix/nod…
Elessar1802 Nov 26, 2024
1f132bf
feat: add backdrop class
arunjaindev Nov 26, 2024
09e7bea
Merge branch 'develop' of https://github.com/devtron-labs/dashboard i…
arunjaindev Nov 26, 2024
9d5b35f
chore: version bump
arunjaindev Nov 26, 2024
418782c
chore: version bump
arunjaindev Nov 26, 2024
06f710d
fix: dont render tab components unless tabs get initialized
Elessar1802 Nov 27, 2024
e2d69c0
Merge pull request #2239 from devtron-labs/fix/node-permissions-tabs
Elessar1802 Nov 27, 2024
31d499b
Merge branch 'develop' of github.com:devtron-labs/dashboard into fix/…
Elessar1802 Nov 27, 2024
d028f93
chore: common-lib version bump
Elessar1802 Nov 27, 2024
e6cec09
fix: update terminal tab dynamic title after cluster name fetch
Elessar1802 Nov 27, 2024
70e7623
Merge branch 'main' of github.com:devtron-labs/dashboard into fix/nod…
Elessar1802 Nov 27, 2024
86202ca
chore: version bump
arunjaindev Nov 28, 2024
e6eb8ae
fix: review comments
Elessar1802 Nov 28, 2024
7d20f85
chore: common-lib version bump
Elessar1802 Nov 28, 2024
10da613
Merge pull request #2240 from devtron-labs/fix/node-permissions
Elessar1802 Nov 28, 2024
6edf20f
fix: force flag instead of forceDelete in installed charts
eshankvaish Nov 28, 2024
74f5206
Merge pull request #2243 from devtron-labs/fix/helm-app-force-delete
eshankvaish Nov 28, 2024
67d776f
Merge branch 'develop' of https://github.com/devtron-labs/dashboard i…
arunjaindev Nov 28, 2024
2cf2702
Merge pull request #2211 from devtron-labs/feat/confirmation-modal
arunjaindev Nov 28, 2024
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: 0 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,13 @@ src/components/ClusterNodes/ClusterEvents.tsx
src/components/ClusterNodes/ClusterManifest.tsx
src/components/ClusterNodes/ClusterNodeEmptyStates.tsx
src/components/ClusterNodes/ClusterOverview.tsx
src/components/ClusterNodes/ColumnSelector.tsx
src/components/ClusterNodes/NodeActions/CordonNodeModal.tsx
src/components/ClusterNodes/NodeActions/DeleteNodeModal.tsx
src/components/ClusterNodes/NodeActions/DrainNodeModal.tsx
src/components/ClusterNodes/NodeActions/EditTaintsModal.tsx
src/components/ClusterNodes/NodeActions/NodeActionsMenu.tsx
src/components/ClusterNodes/NodeActions/validationRules.ts
src/components/ClusterNodes/NodeDetails.tsx
src/components/ClusterNodes/NodeDetailsList.tsx
src/components/ClusterNodes/NodeListSearchFilter.tsx
src/components/ClusterNodes/__tests__/ClusterManifest.test.tsx
src/components/ClusterNodes/__tests__/NodeList.test.tsx
src/components/ClusterNodes/constants.ts
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"homepage": "/dashboard",
"dependencies": {
"@devtron-labs/devtron-fe-common-lib": "1.1.0-patch-1",
"@devtron-labs/devtron-fe-common-lib": "1.1.6",
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
"@rjsf/core": "^5.13.3",
"@rjsf/utils": "^5.13.3",
Expand All @@ -14,7 +14,6 @@
"@sentry/tracing": "7.50.0",
"@tippyjs/react": "4.2.6",
"@typeform/embed-react": "2.20.0",
"@types/marked": "4.0.8",
"@vitejs/plugin-react": "4.3.1",
"command-line-parser": "^0.2.10",
"compute-histogram": "^0.9.11",
Expand All @@ -23,7 +22,6 @@
"fast-json-patch": "^3.1.1",
"flexsearch": "^0.6.32",
"jsonpath-plus": "^10.0.0",
"marked": "4.3.0",
"moment": "^2.29.4",
"monaco-editor": "0.44.0",
"monaco-yaml": "5.1.1",
Expand Down
1 change: 1 addition & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ export default function App() {
<div id="full-screen-modal" />
<div id="visible-modal" />
<div id="visible-modal-2" />
<div id="animated-dialog-backdrop" />
{import.meta.env.VITE_NODE_ENV === 'production' &&
window._env_ &&
window._env_.HOTJAR_ENABLED && <Hotjar />}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
GVKType,
getK8sResourceList,
EntityTypes,
ApiResourceGroupType,
} from '@devtron-labs/devtron-fe-common-lib'
import CreatableSelect from 'react-select/creatable'
import Tippy from '@tippyjs/react'
Expand Down Expand Up @@ -177,13 +178,16 @@ const K8sListItemCard = ({
const createKindData = (selected, _allKindMapping, _k8SObjectMap = null) => {
const kind = []
let selectedGvk: GVKType
const isAllNamespaceSelected = k8sPermission.namespace.some((option) => option.value === SELECT_ALL_VALUE)
if (_k8SObjectMap ?? processedData) {
if (selected.value === SELECT_ALL_VALUE) {
// eslint-disable-next-line no-restricted-syntax
for (const value of (_k8SObjectMap ?? processedData).values()) {
// eslint-disable-next-line no-loop-func
value?.child.forEach((ele: { gvk: GVKType }) => {
kind.push({ value: ele.gvk.Kind, label: ele.gvk.Kind, gvk: ele.gvk })
value?.child.forEach((ele: ApiResourceGroupType) => {
if (isAllNamespaceSelected || ele.namespaced) {
kind.push({ label: ele.gvk.Kind, value: ele.gvk.Kind, gvk: ele.gvk })
}
if (!selectedGvk && ele.gvk.Kind === k8sPermission.kind?.value) {
selectedGvk = ele.gvk
}
Expand All @@ -192,7 +196,7 @@ const K8sListItemCard = ({
} else {
const data = (_k8SObjectMap ?? processedData).get(selected.value === 'k8sempty' ? '' : selected.value)
data?.child?.forEach((ele) => {
if (ele.namespaced) {
if (isAllNamespaceSelected || ele.namespaced) {
kind.push({ label: ele.gvk.Kind, value: ele.gvk.Kind, gvk: ele.gvk })
}
if (!selectedGvk && ele.gvk.Kind === k8sPermission.kind?.value) {
Expand Down
34 changes: 0 additions & 34 deletions src/components/CIPipelineN/ciPipeline.utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,40 +172,6 @@ export const outputFormatSelectStyle = {
}),
}

export const containerImageSelectStyles = {
...baseSelectStyles,
control: (base, state) => ({
...base,
border: '1px solid var(--N200)',
boxShadow: 'none',
minHeight: 'auto',
borderRadius: '4px',
height: '32px',
fontSize: '12px',
pointerEvents: 'auto',
cursor: state.isDisabled ? 'not-allowed' : 'pointer',
}),
valueContainer: (base, state) => ({
...base,
color: 'var(--N900)',
background: 'var(--N50) !important',
padding: '0px 10px',
display: 'flex',
height: '30px',
borderTopLeftRadius: '4px',
borderBottomLeftRadius: '4px',
fontSize: '12px',
width: '100px',
whiteSpace: 'nowrap',
}),
indicatorsContainer: (base, state) => ({
...base,
background: 'var(--N50) !important',
borderTopRightRadius: '4px',
borderBottomRightRadius: '4px',
}),
}

export const CiPipelineSourceTypeBaseOptions = [
{
label: 'Branch Fixed',
Expand Down
1 change: 0 additions & 1 deletion src/components/ClusterNodes/ClusterNodeEmptyStates.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

import { GenericFilterEmptyState } from '@devtron-labs/devtron-fe-common-lib'
import React from 'react'

export default function ClusterNodeEmptyState({
title,
Expand Down
6 changes: 3 additions & 3 deletions src/components/ClusterNodes/ClusterOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
EditableTextArea,
ResourceKindType,
getUrlWithSearchParams,
showError,
} from '@devtron-labs/devtron-fe-common-lib'
import {
ClusterErrorType,
Expand Down Expand Up @@ -89,7 +90,7 @@ const tippyForMetricsApi = () => {
)
}

function ClusterOverview({ isSuperAdmin, selectedCluster, addTab }: ClusterOverviewProps) {
function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) {
const { clusterId, namespace } = useParams<{
clusterId: string
namespace: string
Expand Down Expand Up @@ -132,7 +133,7 @@ function ClusterOverview({ isSuperAdmin, selectedCluster, addTab }: ClusterOverv
})
}
} catch (error) {
setErrorCode(error['code'])
showError(error)
throw error
}
}
Expand Down Expand Up @@ -512,7 +513,6 @@ function ClusterOverview({ isSuperAdmin, selectedCluster, addTab }: ClusterOverv
<GenericDescription
isClusterTerminal
clusterId={clusterId}
isSuperAdmin={isSuperAdmin}
descriptionId={descriptionData.descriptionId}
initialDescriptionText={descriptionData.descriptionText}
initialDescriptionUpdatedBy={descriptionData.descriptionUpdatedBy}
Expand Down
3 changes: 1 addition & 2 deletions src/components/ClusterNodes/ClusterSelectionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ const parseSearchParams = (searchParams: URLSearchParams) => ({

const ClusterSelectionList: React.FC<ClusterSelectionType> = ({
clusterOptions,
isSuperAdmin,
clusterListLoader,
initialLoading,
refreshData,
Expand Down Expand Up @@ -190,7 +189,7 @@ const ClusterSelectionList: React.FC<ClusterSelectionType> = ({
{/* NOTE: visible-hover plays with display prop; therefore need to set display: flex on a new div */}
<div className="cursor dc__visible-hover--child ml-8">
<div className="flexbox dc__align-items-center dc__gap-4">
{!!clusterData.nodeCount && !clusterListLoader && isSuperAdmin && (
{!!clusterData.nodeCount && !clusterListLoader && (
<Tooltip alwaysShowTippyOnHover content="View terminal">
<div className="flex">
<TerminalIcon
Expand Down
182 changes: 0 additions & 182 deletions src/components/ClusterNodes/ColumnSelector.tsx

This file was deleted.

Loading
Loading