Skip to content

Commit 18eed97

Browse files
committed
fix: bad lint
1 parent a4fae32 commit 18eed97

File tree

4 files changed

+16
-26
lines changed

4 files changed

+16
-26
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,8 @@ cli/test/infisical-merge
7373
/backend/binary
7474
backend/bdd/.bdd-infisical-bootstrap-result.json
7575

76+
# local tmp (e.g. test scripts, not for version control)
77+
/tmp
78+
7679
/npm/bin
7780
__pycache__

backend/src/ee/services/license/license-fns.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,23 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
6868
secretVersioning: true,
6969
pitRecovery: false,
7070
ipAllowlisting: false,
71-
rbac: false,
71+
rbac: true,
7272
githubOrgSync: false,
7373
customRateLimits: false,
74-
subOrganization: false,
74+
subOrganization: true,
7575
customAlerts: false,
7676
secretAccessInsights: false,
7777
auditLogs: false,
7878
auditLogsRetentionDays: 0,
7979
auditLogStreams: false,
8080
auditLogStreamLimit: 3,
81-
samlSSO: false,
82-
enforceGoogleSSO: false,
81+
samlSSO: true,
82+
enforceGoogleSSO: true,
8383
hsm: false,
84-
oidcSSO: false,
84+
oidcSSO: true,
8585
scim: false,
8686
ldap: false,
87-
groups: false,
87+
groups: true,
8888
status: null,
8989
trial_end: null,
9090
has_used_trial: true,
@@ -100,7 +100,7 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
100100
},
101101
pkiEst: false,
102102
pkiAcme: false,
103-
enforceMfa: false,
103+
enforceMfa: true,
104104
projectTemplates: false,
105105
kmip: false,
106106
gateway: false,

frontend/src/hooks/api/subOrganizations/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ export {
55
useUpdateSubOrganization
66
} from "./mutations";
77
export { subOrganizationsQuery } from "./queries";
8-
export { SubOrgOrderBy } from "./types";
98
export type {
109
TCreateSubOrganizationDTO,
1110
TDeleteSubOrganizationDTO,
@@ -14,3 +13,4 @@ export type {
1413
TSubOrganization,
1514
TUpdateSubOrganizationDTO
1615
} from "./types";
16+
export { SubOrgOrderBy } from "./types";

frontend/src/pages/organization/SettingsPage/components/OrgSubOrgsTab/OrgSubOrgsTab.tsx

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ import { authKeys, selectOrganization } from "@app/hooks/api/auth/queries";
6363
import { MfaMethod } from "@app/hooks/api/auth/types";
6464
import { OrderByDirection } from "@app/hooks/api/generic/types";
6565
import {
66-
SubOrgOrderBy,
6766
subOrganizationsQuery,
67+
SubOrgOrderBy,
6868
TSubOrganization,
6969
useDeleteSubOrganization,
7070
useJoinSubOrganization,
@@ -293,10 +293,7 @@ export const OrgSubOrgsTab = () => {
293293
<UnstableTable>
294294
<UnstableTableHeader>
295295
<UnstableTableRow>
296-
<UnstableTableHead
297-
onClick={toggleOrderDirection}
298-
className="w-1/3"
299-
>
296+
<UnstableTableHead onClick={toggleOrderDirection} className="w-1/3">
300297
Name
301298
<ChevronDownIcon
302299
className={twMerge(
@@ -350,9 +347,7 @@ export const OrgSubOrgsTab = () => {
350347
: undefined
351348
}
352349
>
353-
<UnstableTableCell isTruncatable>
354-
{subOrg.name}
355-
</UnstableTableCell>
350+
<UnstableTableCell isTruncatable>{subOrg.name}</UnstableTableCell>
356351
<UnstableTableCell isTruncatable className="text-muted">
357352
{subOrg.slug}
358353
</UnstableTableCell>
@@ -478,18 +473,10 @@ export const OrgSubOrgsTab = () => {
478473
subTitle="Update the name and slug of this sub-organization."
479474
footerContent={
480475
<div className="flex items-center gap-2">
481-
<Button
482-
variant="org"
483-
type="submit"
484-
form="edit-sub-org-form"
485-
isPending={isUpdating}
486-
>
476+
<Button variant="org" type="submit" form="edit-sub-org-form" isPending={isUpdating}>
487477
Save Changes
488478
</Button>
489-
<Button
490-
variant="outline"
491-
onClick={() => handlePopUpClose("editSubOrg")}
492-
>
479+
<Button variant="outline" onClick={() => handlePopUpClose("editSubOrg")}>
493480
Cancel
494481
</Button>
495482
</div>

0 commit comments

Comments
 (0)