Skip to content
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

dev vs admin perspectives #156

Merged
merged 2 commits into from
Nov 14, 2024
Merged

dev vs admin perspectives #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a7716a
dev vs admin perspectives
jasonmadigan Nov 14, 2024
cc6876c
v0.0.12
jasonmadigan Nov 14, 2024
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: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kuadrant-console-plugin",
"version": "0.0.10",
"version": "0.0.12",
"description": "Kuadrant OpenShift Console plugin",
"private": true,
"license": "Apache-2.0",
Expand Down Expand Up @@ -72,7 +72,7 @@
},
"consolePlugin": {
"name": "kuadrant-console-plugin",
"version": "0.0.10",
"version": "0.0.12",
"displayName": "Kuadrant OpenShift Console Plugin",
"description": "Kuadrant OpenShift Console Plugin",
"exposedModules": {
Expand Down
53 changes: 35 additions & 18 deletions src/components/KuadrantOverviewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
ExternalLinkAltIcon,
EllipsisVIcon,
} from '@patternfly/react-icons';
import { useActiveNamespace } from '@openshift-console/dynamic-plugin-sdk';
import { useActiveNamespace, useActivePerspective } from '@openshift-console/dynamic-plugin-sdk';
import './kuadrant.css';
import ResourceList from './ResourceList';
import { sortable } from '@patternfly/react-table';
Expand Down Expand Up @@ -61,6 +61,7 @@ const KuadrantOverviewPage: React.FC = () => {
const { t } = useTranslation('plugin__kuadrant-console-plugin');
const { ns } = useParams<{ ns: string }>();
const [activeNamespace, setActiveNamespace] = useActiveNamespace();
const [activePerspective] = useActivePerspective();
const [isExpanded, setIsExpanded] = React.useState(true);
const [isOpen, setIsOpen] = React.useState(false);
const [isCreateOpen, setIsCreateOpen] = React.useState(false);
Expand Down Expand Up @@ -327,27 +328,43 @@ const KuadrantOverviewPage: React.FC = () => {
<DropdownItem value="RateLimitPolicy" key="rate-limit-policy">
{t('RateLimitPolicy')}
</DropdownItem>
<DropdownItem value="DNSPolicy" key="dns-policy">
{t('DNSPolicy')}
</DropdownItem>
<DropdownItem value="TLSPolicy" key="tls-policy">
{t('TLSPolicy')}
</DropdownItem>
{activePerspective !== 'dev' && (
<>
<DropdownItem value="DNSPolicy" key="dns-policy">
{t('DNSPolicy')}
</DropdownItem>
<DropdownItem value="TLSPolicy" key="tls-policy">
{t('TLSPolicy')}
</DropdownItem>
</>
)}
</DropdownList>
</Dropdown>
</CardTitle>
<CardBody className="pf-u-p-10">
<ResourceList
resources={[
resourceGVKMapping['AuthPolicy'],
resourceGVKMapping['DNSPolicy'],
resourceGVKMapping['RateLimitPolicy'],
resourceGVKMapping['TLSPolicy'],
]}
columns={columns}
namespace="#ALL_NS#"
paginationLimit={5}
/>
{activePerspective !== 'dev' ? (
<ResourceList
resources={[
resourceGVKMapping['AuthPolicy'],
resourceGVKMapping['DNSPolicy'],
resourceGVKMapping['RateLimitPolicy'],
resourceGVKMapping['TLSPolicy'],
]}
columns={columns}
namespace="#ALL_NS#"
paginationLimit={5}
/>
) : (
<ResourceList
resources={[
resourceGVKMapping['AuthPolicy'],
resourceGVKMapping['RateLimitPolicy'],
]}
columns={columns}
namespace="#ALL_NS#"
paginationLimit={5}
/>
)}
</CardBody>
</Card>
</FlexItem>
Expand Down
28 changes: 21 additions & 7 deletions src/components/KuadrantPoliciesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,21 @@
columns?: TableColumn<K8sResourceCommon>[];
showAlertGroup?: boolean;
paginationLimit?: number;
}> = ({ activeNamespace, columns, showAlertGroup = false, paginationLimit }) => {

Check warning on line 50 in src/components/KuadrantPoliciesPage.tsx

View workflow job for this annotation

GitHub Actions / lint 

'showAlertGroup' is assigned a value but never used
const { t } = useTranslation('plugin__kuadrant-console-plugin');
const [activePerspective] = useActivePerspective();
const history = useHistory();
const [isOpen, setIsOpen] = useState(false);

let filteredResources = resources;

// Filter out DNSPolicies and TLSPolicies if active perspective is 'dev'
if (activePerspective === 'dev') {
filteredResources = resources.filter(
(resource) => !['DNSPolicies', 'TLSPolicies'].includes(resource.name),
);
}

const onToggleClick = () => {
setIsOpen(!isOpen);
};
Expand All @@ -69,7 +79,7 @@
<ListPageBody>
<div className="co-m-nav-title--row kuadrant-resource-create-container">
<ResourceList
resources={resources.map((r) => r.gvk)}
resources={filteredResources.map((r) => r.gvk)}
namespace={activeNamespace}
columns={columns}
paginationLimit={paginationLimit}
Expand Down Expand Up @@ -98,12 +108,16 @@
<DropdownItem value="RateLimitPolicy" key="rate-limit-policy">
{t('RateLimitPolicy')}
</DropdownItem>
<DropdownItem value="DNSPolicy" key="dns-policy">
{t('DNSPolicy')}
</DropdownItem>
<DropdownItem value="TLSPolicy" key="tls-policy">
{t('TLSPolicy')}
</DropdownItem>
{activePerspective !== 'dev' && (
<>
<DropdownItem value="DNSPolicy" key="dns-policy">
{t('DNSPolicy')}
</DropdownItem>
<DropdownItem value="TLSPolicy" key="tls-policy">
{t('TLSPolicy')}
</DropdownItem>
</>
)}
</DropdownList>
</Dropdown>
</div>
Expand Down
Loading