Skip to content

Commit d152ced

Browse files
authored
Fix access control tab fetching for remote cluster (#7456)
Signed-off-by: Ryan Liang <jiallian@amazon.com>
1 parent 536fbbb commit d152ced

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/access_control_tab.tsx

+7-6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ interface AccessControlTabProps {
2525
connector: string;
2626
properties: unknown;
2727
allowedRoles: string[];
28+
dataSourceMDSId: string;
2829
}
2930

3031
export const AccessControlTab = (props: AccessControlTabProps) => {
@@ -34,17 +35,17 @@ export const AccessControlTab = (props: AccessControlTabProps) => {
3435
const { http } = useOpenSearchDashboards<DataSourceManagementContext>().services;
3536

3637
useEffect(() => {
37-
http!
38-
.get(SECURITY_ROLES)
39-
.then((data) =>
38+
http
39+
.get(SECURITY_ROLES, { query: { dataSourceId: props.dataSourceMDSId } })
40+
.then((data) => {
4041
setRoles(
4142
Object.keys(data.data).map((key) => {
4243
return { label: key };
4344
})
44-
)
45-
)
45+
);
46+
})
4647
.catch((err) => setHasSecurityAccess(false));
47-
}, [http]);
48+
}, [http, props.dataSourceMDSId]);
4849

4950
const [selectedQueryPermissionRoles, setSelectedQueryPermissionRoles] = useState<Role[]>(
5051
props.allowedRoles.map((role) => {

src/plugins/data_source_management/public/components/direct_query_data_sources_components/connection_detail/direct_query_connection_detail.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ export const DirectQueryDataConnectionDetail: React.FC<DirectQueryDataConnection
365365
properties={datasourceDetails.properties}
366366
allowedRoles={datasourceDetails.allowedRoles}
367367
key={JSON.stringify(datasourceDetails.allowedRoles)}
368+
dataSourceMDSId={featureFlagStatus ? dataSourceMDSId ?? '' : ''}
368369
/>
369370
),
370371
},

0 commit comments

Comments
 (0)