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

Jump to bottom

Add Modular code for sql query box (page) and codemirror related pages #14493

Merged

devenbansod merged 16 commits into phpmyadmin:gsoc-js-refactoring from Piyush3079:Mod_Js_Sql_Js

Aug 14, 2018

Contributor

Piyush3079 commented Jul 20, 2018 •

edited

Loading

This pr contains the files needed for modular code for making sql queries.

This pr is in continuation of the pr Mod_Js_Structuring_1. Before reviewing this pr review and merge Mod_Js_Structuring_1

Before submitting pull request, please check that every commit:

Has proper Signed-Off-By
Has commit message which describes it
Is needed on it's own, if you have just minor fixes to previous commits, you can squash them
Any new functionality is covered by tests

Contributor

phpmyadmin-bot commented Jul 20, 2018

This pull requests contains too many commits, in most cases it is caused by wrong merge target. In case you have forked master branch you should also ask merging to master branch. See GitHub documentation for more details.

1 similar comment

Contributor

phpmyadmin-bot commented Jul 29, 2018

This pull requests contains too many commits, in most cases it is caused by wrong merge target. In case you have forked master branch you should also ask merging to master branch. See GitHub documentation for more details.

devenbansod changed the base branch from master to gsoc-js-refactoring

August 1, 2018 11:31

Contributor

phpmyadmin-bot commented Aug 1, 2018

This pull requests contains too many commits, in most cases it is caused by wrong merge target. In case you have forked master branch you should also ask merging to master branch. See GitHub documentation for more details.

devenbansod self-requested a review

August 7, 2018 00:41

devenbansod self-assigned this

Contributor

phpmyadmin-bot commented Aug 7, 2018

This pull requests contains too many commits, in most cases it is caused by wrong merge target. In case you have forked master branch you should also ask merging to master branch. See GitHub documentation for more details.

1 similar comment

Contributor

phpmyadmin-bot commented Aug 7, 2018

This pull requests contains too many commits, in most cases it is caused by wrong merge target. In case you have forked master branch you should also ask merging to master branch. See GitHub documentation for more details.

Member

devenbansod commented Aug 7, 2018

Please rebase

Contributor Author

Piyush3079 commented Aug 7, 2018 •

edited

Loading

This pr is not the next one, next pr is #14524, so we need to first complete this pr(#14524). Although I will rebase this also but we need to merge that first.

Piyush3079 force-pushed the Mod_Js_Sql_Js branch from 374c8d9 to f503797 Compare

August 7, 2018 08:46

Member

devenbansod commented Aug 9, 2018

Please rebase.

Piyush3079 force-pushed the Mod_Js_Sql_Js branch 10 times, most recently from 912910f to 7cc998d Compare

August 10, 2018 08:04

Piyush3079 added 7 commits

August 10, 2018 13:36


          Weekly progress.

8c986d8

1). Microhistory added in classes for modular code
2). Code is structured and camel casing of varables is done for removing linter warnings.
3). JQuery plugins are added in some files.
4). jQplot is working for server_status_queries and server_status_monitor.
5). Work started for Dabatase, SQl and Table files.
Some changes are stll left for server_status_monitor and sql.js
Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Edit package.json for updated-jqplot package. Adding eslint scripts a…

2c64359

…nd script for creating production build edited

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Adding jQplot package and its plugins and tablesorter are as module i…

63a54d1

…n js files and removed from php files.

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          No need to review this commit as these files are directly copied from…

91afae1

… old vendor and plugins folder. These files can be ignored during review.

They are not availabe as npm mpdule right now and their alternative are largerr in size with the same functionality.
So they are being used as it is.
Their size will be reduced in the outpul bundle after using webpack plugins to emove comments from js files.
Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Separating basic functions needed for initialising codemirror and inl…

c9ac456

…ine codemirror, saving and getting saved queries and making profiling charts.

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Edit codemirror sql plugin for modular code.

2c9118e

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Adding codemirror in pma console.

8506ce9

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

Piyush3079 force-pushed the Mod_Js_Sql_Js branch from 7cc998d to fe5def0 Compare

August 10, 2018 08:08

Piyush3079 added 5 commits

August 10, 2018 13:38


          Adding variable used for codemirror in the head of the page at the to…

7d47250

…p of the scripts.

Imports changes as per new directory stucture for sql.
Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Updating Sql utility function file, sql source file containing code f…

cc75483

…or various sql related events, adding function for sql editor and inline sql editor in functions.js

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Ctrl plus enter to submit query event in functions.js

661c9f7

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Add modular Sql.js to table sql and database sql and SqlQueryForm mod…

3ae93ad

…ified accordingly

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Add multi column sort in server_sql for add and remove column sort on…

5e3e36e

… table browse.

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

Piyush3079 force-pushed the Mod_Js_Sql_Js branch 5 times, most recently from 57d7f2f to 3b11fca Compare

August 11, 2018 08:39

codecov bot commented Aug 11, 2018 •

edited

Loading

Codecov Report

Merging #14493 into gsoc-js-refactoring will increase coverage by 0.03%.
The diff coverage is 68.96%.

@@                    Coverage Diff                    @@
##             gsoc-js-refactoring   #14493      +/-   ##
=========================================================
+ Coverage                  50.53%   50.56%   +0.03%     
- Complexity                 14434    14439       +5     
=========================================================
  Files                        501      501              
  Lines                      68012    68002      -10     
=========================================================
+ Hits                       34372    34388      +16     
+ Misses                     33640    33614      -26

devenbansod approved these changes

View reviewed changes

Member

devenbansod left a comment

LGTM, just a few minor comments.

Great job on this, I acknowledge these files were indeed tricky to manage given their dependencies strewn throughout.

db_search.php Outdated

               $scripts->addFile('sql.js');
-              $scripts->addFile('makegrid.js');
+              // $scripts->addFile('makegrid.js');

Member

devenbansod Aug 14, 2018

Please remove if not needed

js/functions.js Outdated

-                  if (codemirror_editor) {
-                      $(codemirror_editor.getWrapperElement()).off('keydown');
-                  }
+                  // $(document).off('click', 'a.inline_edit_sql');

Member

devenbansod Aug 14, 2018

Please remove if not needed

package.json

@@ @@ -24,7 +25,7 @@ @@
                   "js-cookie": "2.2.0",
                   "sprintf-js": "^1.1.1",
                   "tracekit": "0.4.5",
-                  "updated-jqplot": "1.0.9",
+                  "updated-jqplot": "1.0.9-2",

Member

devenbansod Aug 14, 2018

Is such a specific version required?

Contributor Author

Piyush3079 Aug 14, 2018

The previous version was not working with webpack. It was giving some errors related to global scoping. so I have added this updated package.

server_sql.php Outdated

-              $scripts->addFile('makegrid.js');
-              $scripts->addFile('vendor/jquery/jquery.uitablefilter.js');
-              $scripts->addFile('sql.js');
+              // $scripts->addFile('makegrid.js');

Member

devenbansod Aug 14, 2018

Remove if not required

Piyush3079 force-pushed the Mod_Js_Sql_Js branch from 82edabc to bc42ec9 Compare

August 14, 2018 12:41

Piyush3079 added 2 commits

August 14, 2018 18:11


          Comment code in js/functions.js to disable tirggering of codemirror l…

1c3660d

…oading from js/functions.js

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Separating sorting functions from multi_column_sort file.

1e00de8

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

Piyush3079 force-pushed the Mod_Js_Sql_Js branch from bc42ec9 to 5240ca6 Compare

August 14, 2018 13:01

Piyush3079 added 2 commits

August 14, 2018 18:31


          Resolving merge errors.

6f20ffd

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>


          Add jsoc to create documentation of JavaScript code.

5240ca6

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

Piyush3079 changed the title ~~Mod js sql js~~ Add Modular code for sql query box (page) and codemirror related pages

devenbansod merged commit fc72f0d into phpmyadmin:gsoc-js-refactoring

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment