libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-14709 removed circular dependency

Browse source
This commit is contained in:
Erik Jan de Wit 2020-07-09 11:36:07 +02:00 committed by Stan Silvert
parent 34dcbe8533
commit 0ba9055d28
9 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/AbstractResourceTable.tsx
View file

@ -1,5 +1,5 @@
import * as React from 'react';
import { Permission, PaginatedResources, Client } from './MyResourcesPage';
import { Permission, PaginatedResources, Client } from './resource-model';
import { Msg } from '../../widgets/Msg';
export interface ResourcesTableProps {

2
themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/EditTheResource.tsx
View file

@ -26,7 +26,7 @@ import {
} from '@patternfly/react-core';
import { OkIcon } from '@patternfly/react-icons';
import { Resource, Permission, Scope } from './MyResourcesPage';
import { Resource, Permission, Scope } from './resource-model';
import { Msg } from '../../widgets/Msg';
import { AccountServiceContext } from '../../account-service/AccountServiceContext';
import { ContentAlert } from '../ContentAlert';

42
themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/MyResourcesPage.tsx
View file

@ -23,6 +23,7 @@ import { Button, Level, LevelItem, Stack, StackItem, Tab, Tabs, TextInput } from
import {HttpResponse} from '../../account-service/account.service';
import {AccountServiceContext} from '../../account-service/AccountServiceContext';
import { PaginatedResources, Resource, Scope, Permission } from './resource-model';
import {ResourcesTable} from './ResourcesTable';
import {ContentPage} from '../ContentPage';
import {Msg} from '../../widgets/Msg';
@ -39,47 +40,6 @@ export interface MyResourcesPageState {
sharedWithMe: PaginatedResources;
}
export interface Resource {
_id: string;
name: string;
client: Client;
scopes: Scope[];
uris: string[];
shareRequests: Permission[];
}
export interface Client {
baseUrl: string;
clientId: string;
name?: string;
}
export class Scope {
public constructor(public name: string, public displayName?: string) {}
public toString(): string {
if (this.hasOwnProperty('displayName') && (this.displayName)) {
return this.displayName;
} else {
return this.name;
}
}
}
export interface PaginatedResources {
nextUrl: string;
prevUrl: string;
data: Resource[];
}
export interface Permission {
email?: string;
firstName?: string;
lastName?: string;
scopes: Scope[] | string[]; // this should be Scope[] - fix API
username: string;
}
const MY_RESOURCES_TAB = 0;
const SHARED_WITH_ME_TAB = 1;

2
themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/PermissionRequest.tsx
View file

@ -35,7 +35,7 @@ import { HttpResponse } from '../../account-service/account.service';
import { AccountServiceContext } from '../../account-service/AccountServiceContext';
import { Msg } from '../../widgets/Msg';
import { ContentAlert } from '../ContentAlert';
import { Resource, Scope, Permission } from './MyResourcesPage';
import { Resource, Scope, Permission } from './resource-model';
interface PermissionRequestProps {

2
themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/PermissionSelect.tsx
View file

@ -1,7 +1,7 @@
import * as React from 'react';
import { Select, SelectOption, SelectVariant, SelectOptionObject } from '@patternfly/react-core';
import { Scope } from './MyResourcesPage';
import { Scope } from './resource-model';
interface PermissionSelectState {
selected: ScopeValue[];

2
themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/ResourcesTable.tsx
View file

@ -42,7 +42,7 @@ import { HttpResponse } from '../../account-service/account.service';
import { AccountServiceContext } from '../../account-service/AccountServiceContext';
import { PermissionRequest } from "./PermissionRequest";
import { ShareTheResource } from "./ShareTheResource";
import { Permission, Resource } from "./MyResourcesPage";
import { Permission, Resource } from "./resource-model";
import { Msg } from '../../widgets/Msg';
import { ResourcesTableState, ResourcesTableProps, AbstractResourcesTable } from './AbstractResourceTable';
import { EditTheResource } from './EditTheResource';

2
themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/ShareTheResource.tsx
View file

@ -32,7 +32,7 @@ import {
} from '@patternfly/react-core';
import { AccountServiceContext } from '../../account-service/AccountServiceContext';
import { Resource, Permission, Scope } from './MyResourcesPage';
import { Resource, Permission, Scope } from './resource-model';
import { Msg } from '../../widgets/Msg';
import {ContentAlert} from '../ContentAlert';
import { PermissionSelect } from './PermissionSelect';

2
themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/SharedResourcesTable.tsx
View file

@ -29,7 +29,7 @@ import {
import { RepositoryIcon } from '@patternfly/react-icons';
import {PaginatedResources, Resource, Scope} from "./MyResourcesPage";
import { PaginatedResources, Resource, Scope } from "./resource-model";
import { Msg } from '../../widgets/Msg';
import { AbstractResourcesTable, ResourcesTableState } from './AbstractResourceTable';
import EmptyMessageState from '../../widgets/EmptyMessageState';

40
themes/src/main/resources/theme/keycloak-preview/account/src/app/content/my-resources-page/resource-model.ts Normal file
View file

@ -0,0 +1,40 @@
export interface Resource {
_id: string;
name: string;
client: Client;
scopes: Scope[];
uris: string[];
shareRequests: Permission[];
}
export interface Client {
baseUrl: string;
clientId: string;
name?: string;
}
export class Scope {
public constructor(public name: string, public displayName?: string) {}
public toString(): string {
if (this.hasOwnProperty('displayName') && (this.displayName)) {
return this.displayName;
} else {
return this.name;
}
}
}
export interface PaginatedResources {
nextUrl: string;
prevUrl: string;
data: Resource[];
}
export interface Permission {
email?: string;
firstName?: string;
lastName?: string;
scopes: Scope[] | string[]; // this should be Scope[] - fix API
username: string;
}