awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-15 19:16:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve merge conflicts

Browse Source
This commit is contained in:
Chukwunonso Frank
2023-07-26 20:39:51 +01:00
parent 46545c1462 8331cd4de8
commit a5b37c80ad
135 changed files with 3253 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/integrations/northflank/create.tsx
+3 -3
View File
@@ -57,7 +57,7 @@ export default function NorthflankCreateIntegrationPage() {
if (integrationAuthApps) {
if (integrationAuthApps.length > 0) {
const selectedApp = integrationAuthApps?.filter((integrationAuthApp) => integrationAuthApp.name === targetApp);
if (selectedApp.length > 0) {
if (selectedApp.length > 0 && selectedApp[0].secretGroups) {
setSecretGroupList(selectedApp[0].secretGroups);
setTargetSecretGroup(selectedApp[0]?.secretGroups[0]);
} else {
@@ -172,7 +172,7 @@ export default function NorthflankCreateIntegrationPage() {
</SelectItem>
))
) : (
<SelectItem value="No secret groups found" key="target-app-none">
<SelectItem value="none" key="target-secret-group-none">
No secret groups found
</SelectItem>
)}
@@ -183,7 +183,7 @@ export default function NorthflankCreateIntegrationPage() {
color="mineshaft"
className="mt-4"
isLoading={isLoading}
isDisabled={integrationAuthApps.length === 0 && secretGroupList === 0}
isDisabled={secretGroupList === 0}
>
Create Integration
</Button>