[5.2] [4.1 ScheduledTasks]Edits for run task #36725

niharikamahajan02 · 2022-01-18T03:38:28Z

Pull Request for Issue #36453 .

Summary of Changes

Edits for run task.

niharikamahajan02 · 2022-01-20T16:19:28Z

Please review. Thanks

tecpromotion · 2022-01-22T08:43:39Z

Please review. Thanks

Please check whether you have taken over all comments from your previous PRs.
Furthermore, I have the impression, but still have to test it, that again not all occurrences have been renamed.
Please also check this with a full text search over the whole repo.
And please keep the code up to date.

niharikamahajan02 · 2022-01-22T13:04:51Z

But sir , it is working fine after running the command (npm run build:js )

tecpromotion · 2022-01-22T16:46:58Z

administrator/language/en-GB/com_scheduler.ini

@@ -102,6 +102,14 @@ COM_SCHEDULER_OPTION_ORPHANED_SHOW="Show Orphaned"
 COM_SCHEDULER_PERMISSION_TESTRUN="Test task"


Suggested change

COM_SCHEDULER_PERMISSION_TESTRUN="Test task"

COM_SCHEDULER_PERMISSION_RUN_TASK="Run task"

@niharikamahajan02 please check this constant and the string. You have already renamed it in the access.xml.

tecpromotion · 2022-01-22T16:50:53Z

Should this also be adapted?

joomla-cms/plugins/system/schedulerunner/schedulerunner.php

Line 92 in 8388459

$mapping['onAjaxRunSchedulerTest'] = 'runTestCron';

and

joomla-cms/plugins/system/schedulerunner/schedulerunner.php

Line 255 in 8388459

public function runTestCron(Event $event)

Perhaps with runTaskCron

tecpromotion · 2022-01-22T16:54:20Z

And maybe also replace onAjaxRunSchedulerTest with onAjaxRunSchedulerTask?

@ditsuke what do you think about this improvements?

tecpromotion · 2022-01-22T17:02:21Z

build/media_source/com_scheduler/js/admin-view-run-test-task.es6.js

@@ -19,12 +19,12 @@ const initRunner = () => {
  const paths = Joomla.getOptions('system.paths');
  const token = Joomla.getOptions('com_scheduler.test-task.token');
  const uri = `${paths ? `${paths.base}/index.php` : window.location.pathname}?option=com_ajax&format=json&plugin=RunSchedulerTest&group=system&id=%d${token ? `&${token}=1` : ''}`;


Suggested change

const uri = `${paths ? `${paths.base}/index.php` : window.location.pathname}?option=com_ajax&format=json&plugin=RunSchedulerTest&group=system&id=%d${token ? `&${token}=1` : ''}`;

const uri = `${paths ? `${paths.base}/index.php` : window.location.pathname}?option=com_ajax&format=json&plugin=RunSchedulerTask&group=system&id=%d${token ? `&${token}=1` : ''}`;

tecpromotion · 2022-01-22T17:02:37Z

plugins/system/schedulerunner/schedulerunner.php

@@ -89,7 +89,7 @@ public static function getSubscribedEvents(): array
 				$mapping['onContentPrepareForm'] = 'enhanceSchedulerConfig';
 				$mapping['onExtensionBeforeSave'] = 'generateWebcronKey';

-				$mapping['onAjaxRunSchedulerTest'] = 'runTestCron';
+				$mapping['onAjaxRunSchedulerTask'] = 'runTaskCron';


onAjaxRunSchedulerTask must also be fixed in the js files.
please check.

Ohh yes okk

tecpromotion · 2022-01-22T18:59:39Z

Please check this two code comments.

joomla-cms/plugins/system/schedulerunner/schedulerunner.php

Line 243 in 42f7f89

    
           	 * This method is responsible for the "test run" functionality in the Scheduler administrator backend interface.

joomla-cms/plugins/system/schedulerunner/schedulerunner.php

Line 297 in 42f7f89

    
           			 * already running. This is a fair assumption if this test run was triggered through the administrator backend,

tecpromotion · 2022-01-22T19:06:05Z

Also, please check the occurrences of 'test-task'.
This concerns file names, function calls and declarations.

@niharikamahajan02 sorry for all the comments but it's best to clean it straight away.

niharikamahajan02 · 2022-01-23T09:25:41Z

Also, please check the occurrences of 'test-task'. This concerns file names, function calls and declarations.

@niharikamahajan02 sorry for all the comments but it's best to clean it straight away.

No problem sir 😄 and yes it's better to clean them straight away now

niharikamahajan02 · 2022-01-23T09:27:46Z

Yes ,I would rename the file names, function calls and declarations also 👍

…into c1

niharikamahajan02 · 2022-01-23T12:27:31Z

Please suggest if something needs to be updated now . Thanks

ditsuke · 2022-01-23T12:54:36Z

@tecpromotion

@ditsuke what do you think about this improvements?

Thanks for tagging! I really like the changes so far.

build/media_source/com_scheduler/joomla.asset.json

niharikamahajan02 · 2022-01-23T13:22:34Z

Yes sir , changed the file name now.

HLeithner · 2023-04-07T06:46:04Z

I rebased the PR and added back removed language strings and deprecated them.

HLeithner · 2023-09-30T22:52:14Z

This pull request has been automatically rebased to 5.1-dev.

hans2103 · 2023-12-19T14:21:53Z

@niharikamahajan02 please solve the unresolved conversations of this PR. I would like to see this merged into a following Joomla version, while Run Test is the correct name for the action the button is doing

niharikamahajan02 · 2023-12-22T12:41:06Z

please review it once , I think there are some changes to be done

richard67 · 2023-12-22T12:45:04Z

please review it once , I think there are some changes to be done

@niharikamahajan02 It needs to resolve merge conflicts in files build/media_source/com_scheduler/joomla.asset.json and plugins/system/schedulerunner/schedulerunner.php. Maybe just use the clean files from the 5.1-dev branch and apply your changes again on them.

niharikamahajan02 · 2023-12-22T13:17:48Z

but they are already having "run test" in 5.1-dev

richard67 · 2023-12-22T13:19:53Z

but they are already having "run test" in 5.1-dev

@niharikamahajan02 What do you mean? Drone tests are failing, and if you go to the bottom of this PR on GitHub you clearly see there are the 2 mentioned files which have merge conflicts. If you don't know how to solve them we can help, but maybe you can try it yourself first like I have described.

applied suggested adjustments

HLeithner · 2024-04-24T09:09:52Z

This pull request has been automatically rebased to 5.2-dev.

edits for run task

617bf20

joomla-cms-bot added Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.1-dev labels Jan 18, 2022

ditsuke mentioned this pull request Jan 18, 2022

[4.1 ScheduledTasks] Run Test or Run Task? #36453

Closed

Merge branch '4.1-dev' into c1

8388459

tecpromotion reviewed Jan 22, 2022

View reviewed changes

niharikamahajan02 added 2 commits January 22, 2022 22:27

some edits and runTestCron replacement

0312369

onAjaxRunSchedulerTest to onAjaxRunSchedulerTask

3e66014

tecpromotion reviewed Jan 22, 2022

View reviewed changes

niharikamahajan02 added 2 commits January 22, 2022 22:38

more edits

1326672

more edits

42f7f89

Merge branch '4.1-dev' into c1

b37ca6b

niharikamahajan02 added 2 commits January 23, 2022 17:53

edits for test-task

46fdba4

Merge branch 'c1' of https://github.com/niharikamahajan02/joomla-cms …

714cc7e

…into c1

ditsuke suggested changes Jan 23, 2022

View reviewed changes

build/media_source/com_scheduler/joomla.asset.json Show resolved Hide resolved

build/media_source/com_scheduler/joomla.asset.json Outdated Show resolved Hide resolved

build/media_source/com_scheduler/joomla.asset.json Outdated Show resolved Hide resolved

edits

7ee422d

joomla-cms-bot added the PR-4.4-dev label Apr 7, 2023

Add back removed language strings and deprecate them

05dffa0

Hackwar added the Feature label Apr 7, 2023

laoneo removed the PR-4.2-dev label Apr 11, 2023

laoneo changed the base branch from 4.4-dev to 5.0-dev April 12, 2023 06:20

Merge branch '5.0-dev' into c1

2cc618e

joomla-cms-bot added the PR-5.0-dev label Apr 12, 2023

laoneo removed the PR-4.4-dev label Apr 12, 2023

HLeithner changed the base branch from 5.0-dev to 5.1-dev September 30, 2023 22:52

Update access.xml

43d7b3a

joomla-cms-bot added the PR-5.1-dev label Dec 22, 2023

niharikamahajan02 added 6 commits December 22, 2023 18:04

Update schedulerunner.php

e69218e

Update admin-view-run-task.es6.js

ecc1a1e

Update joomla.asset.json

c07f23b

Update com_scheduler.ini

eaf84c3

Update default.php

7438382

Update schedulerunner.php

6880884

hans2103 added a commit to hans2103/joomla-cms that referenced this pull request Jan 3, 2024

apply code changes as mentioned in joomla#36725. Based on 5.1-dev

49d1515

applied suggested adjustments

Quy added the Conflicting Files label Mar 27, 2024

HLeithner changed the base branch from 5.1-dev to 5.2-dev April 24, 2024 09:09

HLeithner changed the title ~~[4.1 ScheduledTasks]Edits for run task~~ [5.2] [4.1 ScheduledTasks]Edits for run task Apr 24, 2024

joomla-cms-bot added the PR-5.2-dev label Apr 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[5.2] [4.1 ScheduledTasks]Edits for run task #36725

[5.2] [4.1 ScheduledTasks]Edits for run task #36725

niharikamahajan02 commented Jan 18, 2022

niharikamahajan02 commented Jan 20, 2022

tecpromotion commented Jan 22, 2022

niharikamahajan02 commented Jan 22, 2022

tecpromotion Jan 22, 2022

tecpromotion commented Jan 22, 2022 •

edited

Loading

tecpromotion commented Jan 22, 2022

tecpromotion Jan 22, 2022

tecpromotion Jan 22, 2022

niharikamahajan02 Jan 22, 2022

tecpromotion commented Jan 22, 2022

tecpromotion commented Jan 22, 2022

niharikamahajan02 commented Jan 23, 2022

niharikamahajan02 commented Jan 23, 2022

niharikamahajan02 commented Jan 23, 2022

ditsuke commented Jan 23, 2022

niharikamahajan02 commented Jan 23, 2022

HLeithner commented Apr 7, 2023

HLeithner commented Sep 30, 2023

hans2103 commented Dec 19, 2023

niharikamahajan02 commented Dec 22, 2023

richard67 commented Dec 22, 2023

niharikamahajan02 commented Dec 22, 2023

richard67 commented Dec 22, 2023

HLeithner commented Apr 24, 2024

		@@ -102,6 +102,14 @@ COM_SCHEDULER_OPTION_ORPHANED_SHOW="Show Orphaned"
		COM_SCHEDULER_PERMISSION_TESTRUN="Test task"

	COM_SCHEDULER_PERMISSION_TESTRUN="Test task"
	COM_SCHEDULER_PERMISSION_RUN_TASK="Run task"

	const uri = `${paths ? `${paths.base}/index.php` : window.location.pathname}?option=com_ajax&format=json&plugin=RunSchedulerTest&group=system&id=%d${token ? `&${token}=1` : ''}`;
	const uri = `${paths ? `${paths.base}/index.php` : window.location.pathname}?option=com_ajax&format=json&plugin=RunSchedulerTask&group=system&id=%d${token ? `&${token}=1` : ''}`;

[5.2] [4.1 ScheduledTasks]Edits for run task #36725

Are you sure you want to change the base?

[5.2] [4.1 ScheduledTasks]Edits for run task #36725

Conversation

niharikamahajan02 commented Jan 18, 2022

Summary of Changes

niharikamahajan02 commented Jan 20, 2022

tecpromotion commented Jan 22, 2022

niharikamahajan02 commented Jan 22, 2022

tecpromotion Jan 22, 2022

Choose a reason for hiding this comment

tecpromotion commented Jan 22, 2022 • edited Loading

tecpromotion commented Jan 22, 2022

tecpromotion Jan 22, 2022

Choose a reason for hiding this comment

tecpromotion Jan 22, 2022

Choose a reason for hiding this comment

niharikamahajan02 Jan 22, 2022

Choose a reason for hiding this comment

tecpromotion commented Jan 22, 2022

tecpromotion commented Jan 22, 2022

niharikamahajan02 commented Jan 23, 2022

niharikamahajan02 commented Jan 23, 2022

niharikamahajan02 commented Jan 23, 2022

ditsuke commented Jan 23, 2022

niharikamahajan02 commented Jan 23, 2022

HLeithner commented Apr 7, 2023

HLeithner commented Sep 30, 2023

hans2103 commented Dec 19, 2023

niharikamahajan02 commented Dec 22, 2023

richard67 commented Dec 22, 2023

niharikamahajan02 commented Dec 22, 2023

richard67 commented Dec 22, 2023

HLeithner commented Apr 24, 2024

tecpromotion commented Jan 22, 2022 •

edited

Loading