Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
---------

Signed-off-by: Yulong Ruan <ruanyl@amazon.com>
  • Loading branch information
ruanyl authored Sep 18, 2023
1 parent cfa9c4b commit e296a5d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/plugins/workspace/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
public start(core: CoreStart) {
this.logger.debug('Starting SavedObjects service');
this.permissionControl?.setup(core.savedObjects.getScopedClient);
this.client?.setSavedObjectes(core.savedObjects);
this.client?.setSavedObjects(core.savedObjects);
this.setupWorkspaces(core);

return {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/workspace/server/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export interface IRequestDetail {

export interface IWorkspaceDBImpl {
setup(dep: CoreSetup): Promise<IResponse<boolean>>;
setSavedObjectes(savedObjectes: SavedObjectsServiceStart): void;
setSavedObjects(savedObjects: SavedObjectsServiceStart): void;
create(
requestDetail: IRequestDetail,
payload: Omit<WorkspaceAttributeWithPermission, 'id'>
Expand Down
32 changes: 17 additions & 15 deletions src/plugins/workspace/server/workspace_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ export class WorkspaceClientWithSavedObject implements IWorkspaceDBImpl {

private savedObjects?: SavedObjectsServiceStart;

setSavedObjectes(savedObjects: SavedObjectsServiceStart) {
setSavedObjects(savedObjects: SavedObjectsServiceStart) {
this.savedObjects = savedObjects;
}

private getScopeClientWithoutPermisson(
private getScopedClientWithoutPermission(
requestDetail: IRequestDetail
): SavedObjectsClientContract | undefined {
return this.savedObjects?.getScopedClient(requestDetail.request, {
Expand Down Expand Up @@ -80,11 +80,13 @@ export class WorkspaceClientWithSavedObject implements IWorkspaceDBImpl {
const { permissions, ...attributes } = payload;
const id = generateRandomId(WORKSPACE_ID_SIZE);
const client = this.getSavedObjectClientsFromRequestDetail(requestDetail);
const existingWorkspaceRes = await this.getScopeClientWithoutPermisson(requestDetail)?.find({
type: WORKSPACE_TYPE,
search: attributes.name,
searchFields: ['name'],
});
const existingWorkspaceRes = await this.getScopedClientWithoutPermission(requestDetail)?.find(
{
type: WORKSPACE_TYPE,
search: attributes.name,
searchFields: ['name'],
}
);
if (existingWorkspaceRes && existingWorkspaceRes.total > 0) {
throw new Error(DUPLICATE_WORKSPACE_NAME_ERROR);
}
Expand Down Expand Up @@ -166,14 +168,14 @@ export class WorkspaceClientWithSavedObject implements IWorkspaceDBImpl {
const client = this.getSavedObjectClientsFromRequestDetail(requestDetail);
const workspaceInDB: SavedObject<WorkspaceAttribute> = await client.get(WORKSPACE_TYPE, id);
if (workspaceInDB.attributes.name !== attributes.name) {
const existingWorkspaceRes = await this.getScopeClientWithoutPermisson(requestDetail)?.find(
{
type: WORKSPACE_TYPE,
search: attributes.name,
searchFields: ['name'],
fields: ['_id'],
}
);
const existingWorkspaceRes = await this.getScopedClientWithoutPermission(
requestDetail
)?.find({
type: WORKSPACE_TYPE,
search: attributes.name,
searchFields: ['name'],
fields: ['_id'],
});
if (existingWorkspaceRes && existingWorkspaceRes.total > 0) {
throw new Error(DUPLICATE_WORKSPACE_NAME_ERROR);
}
Expand Down

0 comments on commit e296a5d

Please sign in to comment.