opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

isDefault->defaultProvider rename

Browse Source
This commit is contained in:
serge-rider
2020-05-16 00:06:24 +03:00
parent 7cf05e3508
commit 17955f0305
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderInfo.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class WebAuthProviderInfo {
return descriptor.getDescription();
}
public boolean isDefault() {
public boolean isDefaultProvider() {
return descriptor.getId().equals(CBPlatform.getInstance().getApplication().getAppConfiguration().getDefaultAuthProvider());
}
server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls
+1 -1
View File
@@ -23,7 +23,7 @@ type AuthProviderInfo {
icon: ID
description: String
default: Boolean
defaultProvider: Boolean
#configurationParameters: [ObjectPropertyInfo]!
webapp/packages/authentication/src/Dialog/AuthDialogController.ts
+3 -3
View File
@@ -97,14 +97,14 @@ export class AuthDialogController implements IInitializableController, IDestruct
}
private compareProviders = (providerA: AuthProvider, providerB: AuthProvider): number => {
if (providerA.isDefault === providerB.isDefault)
if (providerA.defaultProvider === providerB.defaultProvider)
{
return providerA.label.localeCompare(providerB.label);
}
if (providerA.isDefault === providerB.isDefault) {
if (providerA.defaultProvider === providerB.defaultProvider) {
return 0;
} if (providerA.isDefault) {
} if (providerA.defaultProvider) {
return 1;
}
return -1;
webapp/packages/core/src/queries/Authentication/getAuthProviders.gql
+1 -1
View File
@@ -4,7 +4,7 @@ query getAuthProviders {
label
icon
description
isDefault
defaultProvider
#configurationParameters {
# id
webapp/packages/core/src/sdk/sdk.ts
+3 -3
View File
@@ -54,7 +54,7 @@ export type AuthProviderInfo = {
label: Scalars["String"];
icon?: Maybe<Scalars["ID"]>;
description?: Maybe<Scalars["String"]>;
isDefault?: Maybe<Scalars["Boolean"]>;
defaultProvider?: Maybe<Scalars["Boolean"]>;
credentialParameters: Array<Maybe<AuthCredentialInfo>>;
};
@@ -928,7 +928,7 @@ export type GetAuthProvidersQuery = {
Maybe<
Pick<
AuthProviderInfo,
"id" | "label" | "icon" | "description" | "isDefault"
"id" | "label" | "icon" | "description" | "defaultProvider"
> & {
credentialParameters: Array<
Maybe<
@@ -1643,7 +1643,7 @@ export const GetAuthProvidersDocument = gql`
label
icon
description
isDefault
defaultProvider
credentialParameters {
id
displayName