Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

renamed ingester to ingestor #226

Merged
merged 1 commit into from
Apr 10, 2024
Merged

renamed ingester to ingestor #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/components/Navbar/rolesHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const writerAccess = [
'GetLiveTail',
];
const readerAccess = ['Query', 'ListStream', 'GetSchema', 'GetStats', 'GetRetention', 'GetAlert', 'GetLiveTail'];
const ingesterAccess = ['Ingest'];
const ingestorAccess = ['Ingest'];

const getStreamsSepcificAccess = (rolesWithRoleName: UserRoles, stream?: string) => {
let access: string[] = [];
Expand Down Expand Up @@ -81,10 +81,10 @@ const getStreamsSepcificAccess = (rolesWithRoleName: UserRoles, stream?: string)
}
});
}
if (role.privilege === 'ingester' && role.resource.stream === stream) {
ingesterAccess.forEach((ingesterAction: string) => {
if (!access.includes(ingesterAction)) {
access.push(ingesterAction);
if (role.privilege === 'ingestor' && role.resource.stream === stream) {
ingestorAccess.forEach((ingestorAction: string) => {
if (!access.includes(ingestorAction)) {
access.push(ingestorAction);
}
});
}
Expand Down
8 changes: 4 additions & 4 deletions src/pages/AccessManagement/PrivilegeTR.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ const PrivilegeTR: FC<PrivilegeTRProps> = (props) => {
privilege: selectedPrivilege,
});
}
if (selectedPrivilege === 'reader' || selectedPrivilege === 'writer' || selectedPrivilege === 'ingester') {
if (selectedPrivilege === 'reader' || selectedPrivilege === 'writer' || selectedPrivilege === 'ingestor') {
if (getLogStreamListData?.data?.find((stream) => stream.name === SelectedStream)) {
if (tagInput !== '' && tagInput !== undefined && selectedPrivilege === 'reader') {
getRoleData?.data?.push({
Expand Down Expand Up @@ -210,7 +210,7 @@ const PrivilegeTR: FC<PrivilegeTRProps> = (props) => {
}
return true;
}
if (selectedPrivilege === 'writer' || selectedPrivilege === 'ingester') {
if (selectedPrivilege === 'writer' || selectedPrivilege === 'ingestor') {
if (
getRoleData?.data?.find(
(role: any) => role.privilege === selectedPrivilege && role.resource?.stream === SelectedStream,
Expand Down Expand Up @@ -369,15 +369,15 @@ const PrivilegeTR: FC<PrivilegeTRProps> = (props) => {
<Select
placeholder="Select privilege"
label="Select a privilege to assign"
data={['admin', 'editor', 'writer', 'reader', 'ingester']}
data={['admin', 'editor', 'writer', 'reader', 'ingestor']}
onChange={(value) => {
setSelectedPrivilege(value ?? '');
}}
value={selectedPrivilege}
nothingFoundMessage="No options"
/>

{selectedPrivilege === 'reader' || selectedPrivilege === 'writer' || selectedPrivilege === 'ingester' ? (
{selectedPrivilege === 'reader' || selectedPrivilege === 'writer' || selectedPrivilege === 'ingestor' ? (
<>
<Select
placeholder="Pick one"
Expand Down
8 changes: 4 additions & 4 deletions src/pages/AccessManagement/Roles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const Roles: FC = () => {
privilege: selectedPrivilege,
});
}
if (selectedPrivilege === 'reader' || selectedPrivilege === 'writer' || selectedPrivilege === 'ingester') {
if (selectedPrivilege === 'reader' || selectedPrivilege === 'writer' || selectedPrivilege === 'ingestor') {
if (getLogStreamListData?.data?.find((stream) => stream.name === SelectedStream)) {
if (tagInput !== '' && tagInput !== undefined && selectedPrivilege === 'reader') {
userRole?.push({
Expand Down Expand Up @@ -160,7 +160,7 @@ const Roles: FC = () => {
}
return true;
}
if (selectedPrivilege === 'writer' || selectedPrivilege === 'ingester') {
if (selectedPrivilege === 'writer' || selectedPrivilege === 'ingestor') {
if (getLogStreamListData?.data?.find((stream) => stream.name === SelectedStream)) {
return false;
}
Expand Down Expand Up @@ -282,15 +282,15 @@ const Roles: FC = () => {
<Select
placeholder="Select privilege"
label="Select a privilege to assign"
data={['admin', 'editor', 'writer', 'reader', 'ingester']}
data={['admin', 'editor', 'writer', 'reader', 'ingestor']}
onChange={(value) => {
setSelectedPrivilege(value ?? '');
}}
value={selectedPrivilege}
nothingFoundMessage="No options"
/>

{selectedPrivilege === 'reader' || selectedPrivilege === 'writer' || selectedPrivilege === 'ingester' ? (
{selectedPrivilege === 'reader' || selectedPrivilege === 'writer' || selectedPrivilege === 'ingestor' ? (
<>
<Select
placeholder="Pick one"
Expand Down