Skip to content

Commit d2e9d79

Browse files
authored
Merge pull request #173 from devtron-labs/feat/release-tenant-updates
feat: add sorting for the cluster list
2 parents 53438c9 + 27b0ea9 commit d2e9d79

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "0.0.84-beta-3",
3+
"version": "0.0.84-beta-6",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Common/Dialogs/DeleteDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export const DeleteDialog: React.FC<DeleteDialogProps> & { Description?: React.F
5353
const getLabel = () => (
5454
<span>
5555
Type
56-
<span className="fw-6">&nbsp;&apos;{deleteConfirmationText}&apos;&nbsp;</span>
56+
<span className="fw-6 dc__word-break">&nbsp;&apos;{deleteConfirmationText}&apos;&nbsp;</span>
5757
to confirm
5858
</span>
5959
)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
import { stringComparatorBySortOrder } from '../Helpers'
12
import { clusterListData } from './mock'
23
import { ClusterType } from './types'
34

45
export const getClusterList = async (): Promise<ClusterType[]> =>
56
new Promise((resolve) => {
67
setTimeout(() => {
7-
resolve(clusterListData)
8+
resolve(clusterListData.sort((a, b) => stringComparatorBySortOrder(a.name, b.name)))
89
}, 1000)
910
})

0 commit comments

Comments
 (0)