Skip to content

Commit 071f57b

Browse files
committed
Merge remote-tracking branch 'origin/master' into spassky
2 parents 7e3a128 + 90252f1 commit 071f57b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1997
-913
lines changed

.github/workflows/yarn_lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Node
1616
uses: actions/setup-node@v4
1717
with:
18-
node-version: "18"
18+
node-version: "20"
1919
cache: yarn
2020
registry-url: https://npm.manageiq.org/
2121
- name: Update yarn.lock

.yarn/releases/yarn-4.9.1.cjs renamed to .yarn/releases/yarn-4.9.2.cjs

Lines changed: 273 additions & 279 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ npmAuditExcludePackages:
2727
# pending | moderate | GHSA-jpcq-cgw6-v4j6 | jquery >=1.0.3 <3.5.0 | 2.2.4, 3.4.1 brought in by manageiq-ui-classic@workspace:., patternfly@npm:3.59.5
2828
# pending | moderate | GHSA-rmxg-73gg-4p98 | jquery >=1.12.3 <3.0.0 | 2.2.4 brought in by manageiq-ui-classic@workspace:.
2929

30-
yarnPath: .yarn/releases/yarn-4.9.1.cjs
30+
yarnPath: .yarn/releases/yarn-4.9.2.cjs

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
[![Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ManageIQ/manageiq/ui?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1010

11-
[![Build history for spassky branch](https://buildstats.info/github/chart/ManageIQ/manageiq-ui-classic?branch=spassky&buildCount=50&includeBuildsFromPullRequest=false&showstats=false)](https://github.com/ManageIQ/manageiq-ui-classic/actions?query=branch%3Amaster)
12-
1311
ManageIQ UI Classic is the UI that has been split out of the main [manageiq repo](https://github.com/ManageIQ/manageiq).
1412

1513
## Development Setup

Rakefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ namespace :spec do
8686

8787
namespace :cypress do
8888
task :run_with_rails do
89-
# Set the rate limit to a large number to avoid 429: Too Many Requests errors
90-
# which can occur as cypress very quickly hits a lots of endpoints.
91-
puts "\n== Removing rate limit =="
92-
exit $?.exitstatus unless system("bundle exec rails runner 'MiqServer.my_server.add_settings_for_resource(:server => {:rate_limiting => {:request => {:limit => 99999}, :ui_login => {:limit => 99999}}})'")
93-
9489
puts "\n== Starting Rails server =="
9590
rails_pid = Bundler.with_original_env do
9691
spawn("bin/rails s", [:out, :err] => "/dev/null")

app/controllers/application_controller/ci_processing.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def syncvms
349349
# Refresh the power states for selected or single VMs
350350
def refreshvms(privilege = DEFAULT_PRIVILEGE)
351351
if privilege == DEFAULT_PRIVILEGE
352-
ActiveSupport::Deprecation.warn(<<-MSG.strip_heredoc)
352+
Vmdb::Deprecation.warn(<<-MSG.strip_heredoc, caller_locations[1..-1])
353353
Please pass the privilege you want to check for when refreshing
354354
MSG
355355
privilege = params[:pressed]

app/controllers/miq_task_controller.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ def cancel_task
128128
# Delete selected tasks
129129
def delete_tasks
130130
assert_privileges("miq_task_delete")
131-
delete_tasks_from_table(find_checked_items, "Delete selected tasks")
131+
132+
new_checked_items = find_checked_items.select { |item| params["select-row-#{item}"] == "on" }
133+
134+
delete_tasks_from_table(new_checked_items, "Delete selected tasks")
132135
jobs
133136
@refresh_partial = "layouts/tasks"
134137
end

app/javascript/components/settings-tasks-form/index.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
44
import { FormSpy } from '@data-driven-forms/react-form-renderer';
55
import createSchema from './settings-tasks-form.schema';
66
import loadTable from './load-table-helper';
7-
import GtlView from '../gtl-view';
87

98
const SettingsTasksForm = ({
109
allTasks, zones, users, timePeriods, taskStates, tz,
@@ -47,7 +46,6 @@ const SettingsTasksForm = ({
4746
loadDefaultTable();
4847
}}
4948
/>
50-
<GtlView showUrl="/miq_task/show" />
5149
</div>
5250
);
5351
};

app/javascript/notifications/backend.js

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,17 @@ export function convert(resource) {
2424
}
2525

2626
export function load(useLimit) {
27-
const promises = [];
2827
const limitFragment = useLimit ? `&limit=${maxNotifications}` : '';
2928

30-
promises.push(API.get(`/api/notifications?expand=resources&attributes=details&sort_by=id&sort_order=desc${limitFragment}`)
29+
return API.get(`/api/notifications?expand=resources&attributes=details&sort_by=id&sort_order=desc${limitFragment}`)
3130
.then((data) => {
3231
const notifications = data.resources.map(convert);
3332

3433
return {
3534
notifications,
36-
subcount: data.subcount,
35+
subcount: data.count
3736
};
38-
}));
39-
40-
if (useLimit) {
41-
// get real subcount
42-
promises.push(API.get('/api/notifications'));
43-
}
44-
45-
return Promise.all(promises).then(([{ notifications, subcount }, meta]) => ({
46-
notifications,
47-
subcount: meta ? meta.subcount : subcount,
48-
}));
37+
});
4938
}
5039

5140
const bulkAction = (action) => (notifications) => API.post(`/api/notifications/`, {

app/javascript/oldjs/locale/de.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)