Skip to content

[Feature Branch] Resolve review comments #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cliu123 merged 21 commits into from
Oct 25, 2022
Merged

[Feature Branch] Resolve review comments #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dcf9248
Resolve review comments
cliu123 Oct 21, 2022
851761f
Resolve review comments
cliu123 Oct 22, 2022
9dedb4f
Resolve review comments + Add multitenancy.enabled to feature flag
cliu123 Oct 22, 2022
54ee514
Resolve more comments
cliu123 Oct 23, 2022
d2f2e22
Fix lint
cliu123 Oct 23, 2022
27d4715
Resolve review comments
cliu123 Oct 24, 2022
c99cd21
Resolve more comments
cliu123 Oct 23, 2022
0ef67ec
Fix lint
cliu123 Oct 23, 2022
5c7e1ab
Resolve review comments
cliu123 Oct 24, 2022
fc7d3b6
Merge branch 'main_aggregation_view' of https://github.com/cliu123/se…
cliu123 Oct 24, 2022
79c98d0
Resolve review comments
cliu123 Oct 24, 2022
bb14404
Resolve more comments
cliu123 Oct 23, 2022
7985baa
Fix lint
cliu123 Oct 23, 2022
730bc7f
Resolve review comments
cliu123 Oct 21, 2022
fdaeba0
Resolve review comments
cliu123 Oct 22, 2022
63d86ea
Resolve more comments
cliu123 Oct 23, 2022
7a9b265
Fix lint
cliu123 Oct 23, 2022
e6a26c5
Resolve review comments
cliu123 Oct 24, 2022
63c0483
Merge branch 'main_aggregation_view' of https://github.com/cliu123/se…
cliu123 Oct 25, 2022
e5c0151
Resolve review comments
cliu123 Oct 25, 2022
8b5f97d
Fix lint
cliu123 Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions public/apps/account/account-app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,12 @@ export async function setupTopNavButton(coreStart: CoreStart, config: ClientConf
}

let tenant: string | undefined;
if (config.multitenancy.enabled && config.multitenancy.enable_aggregation_view) {
if (config.multitenancy.enabled) {
try {
tenant = await fetchCurrentTenant(coreStart.http);
} catch (e) {
console.log(e);
}
} else {
tenant = accountInfo.user_requested_tenant;
}

let shouldShowTenantPopup = true;
Expand Down
1 change: 1 addition & 0 deletions public/apps/configuration/utils/tenant-utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export const PRIVATE_TENANT = '__user__';
export const DEFAULT_TENANT = 'default';
export const GLOBAL_TENANT_RENDERING_TEXT = 'Global';
export const PRIVATE_TENANT_RENDERING_TEXT = 'Private';

export const GLOBAL_USER_DICT: { [key: string]: string } = {
Label: 'Global',
Value: GLOBAL_TENANT,
Expand Down
22 changes: 17 additions & 5 deletions server/saved_objects/saved_objects_wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import { Config } from 'packages/osd-config/target';
import { SecurityPluginConfigType } from '..';
import {
DEFAULT_TENANT,
globalTenantName,
GLOBAL_TENANT,
isPrivateTenant,
PRIVATE_TENANT,
Expand Down Expand Up @@ -95,17 +96,27 @@ export class SecuritySavedObjectsClientWrapper {
availableTenantNames.push(GLOBAL_TENANT);
}
if (isPrivateEnabled) {
availableTenantNames.push(PRIVATE_TENANT + state.authInfo?.user_name);
availableTenantNames.push(PRIVATE_TENANT + username);
}
const typeToNamespacesMap = {};
if (selectedTenant === '__user__') {
namespaceValue = selectedTenant + username;
if (availableTenantNames.includes(globalTenantName)) {
let index = availableTenantNames.indexOf(globalTenantName);
if (index > -1) {
availableTenantNames.splice(index, 1);
}
index = availableTenantNames.indexOf(username!);
if (index > -1) {
availableTenantNames.splice(index, 1);
}
}
const typeToNamespacesMap: any = {};
if (isPrivateTenant(selectedTenant!)) {
namespaceValue = selectedTenant! + username;
}
const searchTypes = Array.isArray(options.type) ? options.type : [options.type];
searchTypes.forEach((t) => {
if (t === 'config') {
if ('namespaces' in options) {
if (options.namespaces.includes(namespaceValue)) {
if (options.namespaces!.includes(namespaceValue!)) {
typeToNamespacesMap[t] = [namespaceValue];
}
} else {
Expand All @@ -122,6 +133,7 @@ export class SecuritySavedObjectsClientWrapper {
options.typeToNamespacesMap = new Map(Object.entries(typeToNamespacesMap));
options.type = '';
options.namespaces = [];

return await wrapperOptions.client.find(options);
};

Expand Down