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.

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

Pull request update/241217 #495

Merged
merged 4 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ def _get_aws_insecure(self, config, resources, excluded_pools,
if s_groups is None:
continue
security_groups_map = region_sg_map[region]
for group in s_groups:
group_id = group['GroupId']
for group_id in s_groups:
instances = security_groups_map.get(group_id, [])
instances.append(instance)
security_groups_map[group_id] = instances
Expand Down
40 changes: 20 additions & 20 deletions jira_ui/ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions jira_ui/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"react-markdown": "^9.0.1",
"react-router-dom": "^6.19.0",
"remark-gfm": "^4.0.0",
"vite": "^5.4.6",
"vite-tsconfig-paths": "^5.0.1"
"vite": "^5.4.11",
"vite-tsconfig-paths": "^5.1.4"
},
"scripts": {
"start": "vite",
Expand Down
6 changes: 3 additions & 3 deletions ngui/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.18",
"@uiw/react-textarea-code-editor": "^2.1.1",
"@vitejs/plugin-react-swc": "^3.7.0",
"@vitejs/plugin-react-swc": "^3.7.2",
"ajv": "^8.12.0",
"analytics": "^0.8.1",
"axios": "^1.7.4",
Expand Down Expand Up @@ -74,8 +74,8 @@
"typescript": "^5.3.3",
"unist-util-visit": "^5.0.0",
"uuid": "^9.0.0",
"vite": "^5.4.6",
"vite-tsconfig-paths": "^5.0.1"
"vite": "^5.4.11",
"vite-tsconfig-paths": "^5.1.4"
},
"scripts": {
"start": "vite",
Expand Down
64 changes: 32 additions & 32 deletions ngui/ui/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 29 additions & 15 deletions ngui/ui/src/components/PowerSchedules/PowerSchedules.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,7 @@ const PowerSchedules = ({
const actionBarDefinition = {
title: {
messageId: "powerSchedulesTitle"
},
items: [
{
key: "btn-add",
dataTestId: "btn_add",
icon: <AddOutlinedIcon fontSize="small" />,
messageId: "add",
color: "success",
variant: "contained",
type: "button",
requiredActions: ["EDIT_PARTNER"],
action: () => navigate(CREATE_POWER_SCHEDULE)
}
]
}
};

const tableData = useMemo(() => powerSchedules, [powerSchedules]);
Expand Down Expand Up @@ -169,7 +156,34 @@ const PowerSchedules = ({
<>
<ActionBar data={actionBarDefinition} />
<PageContentWrapper>
{isGetPowerSchedulesLoading ? <TableLoader /> : <Table withSearch data={tableData} columns={columns} pageSize={50} />}
{isGetPowerSchedulesLoading ? (
<TableLoader />
) : (
<Table
withSearch
data={tableData}
columns={columns}
actionBar={{
show: true,
definition: {
items: [
{
key: "btn-add",
dataTestId: "btn_add",
icon: <AddOutlinedIcon fontSize="small" />,
messageId: "add",
color: "success",
variant: "contained",
type: "button",
requiredActions: ["EDIT_PARTNER"],
action: () => navigate(CREATE_POWER_SCHEDULE)
}
]
}
}}
pageSize={50}
/>
)}
</PageContentWrapper>
</>
);
Expand Down
Loading
Loading