Skip to content

Commit 38569f7

Browse files
committed
feat: update license type references for improved consistency in LicensesDataTable components
1 parent 4b72b97 commit 38569f7

3 files changed

Lines changed: 43 additions & 7 deletions

File tree

src/packages/cloud/src/namespace/components/LicensesDataTableComponent.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
useStore
1515
} from "@code0-tech/pictor";
1616
import {DataTableFilterProps, DataTableSortProps} from "@code0-tech/pictor/dist/components/data-table/DataTable";
17-
import {Namespace, NamespaceLicense} from "@code0-tech/sagittarius-graphql-types";
17+
import {Namespace, License} from "@code0-tech/sagittarius-graphql-types";
1818
import {NamespaceService} from "@edition/namespace/services/Namespace.service";
1919
import {LicensesDataTableRowComponent} from "@edition/namespace/components/LicensesDataTableRowComponent";
2020
import Link from "next/link";
@@ -23,8 +23,8 @@ export interface LicensesDataTableComponentProps {
2323
namespaceId: Namespace['id']
2424
sort?: DataTableSortProps
2525
filter?: DataTableFilterProps
26-
preFilter?: (project: NamespaceLicense, index: number) => boolean
27-
onSelect?: (item: NamespaceLicense | undefined) => void
26+
preFilter?: (project: License, index: number) => boolean
27+
onSelect?: (item: License | undefined) => void
2828
}
2929

3030
export const LicensesDataTableComponent: React.FC<LicensesDataTableComponentProps> = (props) => {
@@ -35,7 +35,7 @@ export const LicensesDataTableComponent: React.FC<LicensesDataTableComponentProp
3535
const namespaceStore = useStore(NamespaceService)
3636

3737
const licenses = React.useMemo(
38-
() => namespaceService.getById(namespaceId)?.namespaceLicenses?.nodes as NamespaceLicense[] ?? [],
38+
() => namespaceService.getById(namespaceId)?.licenses?.nodes as License[] ?? [],
3939
[namespaceStore]
4040
)
4141

src/packages/cloud/src/namespace/components/LicensesDataTableRowComponent.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import React from "react";
2-
import {Namespace, NamespaceLicense} from "@code0-tech/sagittarius-graphql-types";
2+
import {Namespace, License} from "@code0-tech/sagittarius-graphql-types";
33
import {DataTableColumn, useService, useStore} from "@code0-tech/pictor";
44
import {NamespaceService} from "@edition/namespace/services/Namespace.service";
55

66
export interface LicensesDataTableRowComponentProps {
77
namespaceId: Namespace['id']
8-
licenseId: NamespaceLicense['id']
8+
licenseId: License['id']
99
}
1010

1111
export const LicensesDataTableRowComponent: React.FC<LicensesDataTableRowComponentProps> = (props) => {
@@ -16,7 +16,7 @@ export const LicensesDataTableRowComponent: React.FC<LicensesDataTableRowCompone
1616
const namespaceStore = useStore(NamespaceService)
1717

1818
const license = React.useMemo(
19-
() => namespaceService.getById(namespaceId)?.namespaceLicenses?.nodes?.find(license => license?.id === licenseId) as NamespaceLicense,
19+
() => namespaceService.getById(namespaceId)?.licenses?.nodes?.find(license => license?.id === licenseId) as License,
2020
[namespaceStore, namespaceId, licenseId]
2121
)
2222

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#import "@edition/organization/services/fragments/Organization.id.fragment.graphql"
2+
#import "@edition/user/services/fragments/User.id.fragment.graphql"
3+
fragment Namespace on Namespace {
4+
__typename
5+
id
6+
updatedAt
7+
createdAt
8+
roles {
9+
count
10+
}
11+
members {
12+
count
13+
}
14+
projects {
15+
count
16+
}
17+
runtimes {
18+
count
19+
}
20+
parent {
21+
__typename
22+
...on Organization {
23+
...OrganizationId
24+
}
25+
...on User{
26+
...UserId
27+
}
28+
}
29+
userAbilities {
30+
createNamespaceProject
31+
createNamespaceRole
32+
createRuntime
33+
inviteMember
34+
__typename
35+
}
36+
}

0 commit comments

Comments
 (0)