Skip to content

Commit

Permalink
Merge pull request INTER-Mediator#1860 from msyk/master
Browse files Browse the repository at this point in the history
Date updated, also composer.json and package.json are just on root.
  • Loading branch information
matsuo authored Feb 5, 2024
2 parents 1706ce1 + e8b2708 commit 6e036ec
Show file tree
Hide file tree
Showing 21 changed files with 238 additions and 15,444 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "inter-mediator/inter-mediator",
"version": "12",
"time": "2023-11-16",
"time": "2024-02-04",
"repositories": [
{
"type": "git",
Expand Down
18 changes: 10 additions & 8 deletions composer.lock

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

9 changes: 6 additions & 3 deletions dist-docs/change_log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ Please check: https://github.com/INTER-Mediator/INTER-Mediator
Also the Migration Guide (Japanese) might be informative:
https://inter-mediator.info/ja/for-developers/migration.html

Ver.12 (In Development)
Ver.13 (In Development)

Ver.12 (Februrary xx, 2024)
- PHP Ver.7.4 is the minimum version.
- Type description added to most PHP code. The Export class and the OperationLogExtension class are added types, and
your inherited class has to add them. The extending-class based methods didn't add types.
Expand All @@ -19,9 +21,10 @@ Ver.12 (In Development)
- INTERMediator.prepareToScrollBack and scrollBack methods are for retrieving scroll position on backing from detail.
samples/Sample_forDebugging/longlist.html is a sample of these methods.
- On query condition, the value surrounded by @ is handled with the field name. For example, {field: "a", value: "b"}
generates the where clause `a` = "b", othewise {field: "a", value: "@b@"} generates `a` = `b`.
generates the where clause `a` = "b", otherwise {field: "a", value: "@b@"} generates `a` = `b`.
- Forever booted the service server, but it replaced with nodaemon. $stopSSEveryQuit in params.php doesn't work anymore.
- /spec/Manual-Tests/End-to-End-Test.md is added, and it records the result of manual end-to-end tests.
- INTERMediator.clearCondition method clears page number of pagination. Also no parameter clears all conditions.
- [INFO] In the Ver.9, the following change was made with compatibility. The setUpdatedRecord method doesn't call the
setDataToUpdatedRecord anymore.
- (Ver.9) The setUpdatedRecord method in database classes renamed to setDataToUpdatedRecord. For the compatibility,
Expand All @@ -30,7 +33,7 @@ Ver.12 (In Development)
- [BUG FIX] The data-im="_@condition:..." way with numeric field and the "match" operator didn't expand the condition
clause with '%term%' value. As far as PostgreSQL goes, the casting to text is automatically applied it.
- [BUG FIX] The INPUT[type=datetime-local] elements reported someone edit your modified data, but it was new record data
after updateing is not adjusted to UTC correctly. Also INTERMediatorLib.dateTimeStringISO and some method returns
after updating is not adjusted to UTC correctly. Also INTERMediatorLib.dateTimeStringISO and some method returns
browser local date and time.
- [BUG FIX] Fix an error when using PHP 8.3.0 or later / PHP 8.1.25 / PHP 8.2.12 and $appLocale is undefined in
params.php.
Expand Down
79 changes: 7 additions & 72 deletions dist-docs/installfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,77 +4,12 @@ distDocDir=$(cd $(dirname "$0"); pwd)
originalPath=$(dirname "${distDocDir}")
cd "${originalPath}"

param=""
mv '__Did_you_run_composer_update.txt' spec/tempfile
composer update --with-all-dependencies
mv spec/tempfile '__Did_you_run_composer_update.txt'

if [ $# -gt 1 ]; then
echo "*** No parameter of just 1 parameter is allowed. ***" 1>&2
exit 1
fi
cd spec/run
npm update

for opt in "$@"
do
case "$opt" in
-[0-9])
param=${opt}
;;
* )
echo "invalid option -- $opt"
exit 1
esac
done


choice=${param:1}
if [ ${#param} = 0 ]; then
/bin/echo "-------------------------------------------------"
/bin/echo "Choose the task for composer/package json files:"
/bin/echo ' (1) Clear lock files on root'
/bin/echo ' (2) spec/<files for PHP7> to root'
/bin/echo ' (3) root/<files for PHP7> to spec/'
/bin/echo ' (4) Update lock files'
/bin/echo -n "Type 1, 2, 3 or 4, and then type return----> "
read choice
/bin/echo ""
else
/bin/echo "Choice by command line parameter: ${choice}"
fi

case ${choice} in
1 )
/bin/echo "Remove lock files from root"
rm composer.lock package-lock.json
;;
2 )
/bin/echo "From spec as for PHP 7 to root"
cp spec/composer7.json composer.json
cp spec/composer7.lock composer.lock
cp spec/package7.json package.json
cp spec/package-lock7.json package-lock.json
;;
3 )
/bin/echo "From root to spec as for PHP 7"
cp composer.json spec/composer7.json
cp composer.lock spec/composer7.lock
cp package.json spec/package7.json
cp package-lock.json spec/package-lock7.json
;;
4 )
mv '__Did_you_run_composer_update.txt' spec/tempfile
/bin/echo "## From spec as for PHP 7 to root"
cp spec/composer7.json composer.json
rm composer.lock
cp spec/package7.json package.json
rm package-lock.json

/bin/echo "## composer update"
composer update --with-all-dependencies

/bin/echo "## From root to spec as for PHP 7"
cp composer.json spec/composer7.json
cp composer.lock spec/composer7.lock
cp package.json spec/package7.json
cp package-lock.json spec/package-lock7.json

mv spec/tempfile '__Did_you_run_composer_update.txt'
;;
esac
cd ../run-safari
npm update
18 changes: 15 additions & 3 deletions 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 params.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@
$bootWithInstalledNode = false;
$preventSSAutoBoot = false;
$backSeconds = 3600 * 24 * 2; // The seconds value that detect the outdated registering records.
$foreverLog = '/tmp/nodemon.log';
*/
$foreverLog = '/tmp/nodemon.log'; */

/* Operation Log
* ===================
* the table named 'operationlog' is required.
Expand Down
3 changes: 1 addition & 2 deletions samples/E2E-Test/AuthPage/Auth_Basic_MySQL.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
</header>
<div id="wrapper">
<div class="container">
<h1>JavaScript Component Test for jQuery File Upload</h1>
<p>This sample requires jQuery File Upload.</p>
<h1>Testing Authentication</h1>
<button id="logout_link" onclick="INTERMediatorOnPage.logout();location.reload()">Logout</button>
<table>
<thead>
Expand Down
3 changes: 1 addition & 2 deletions samples/E2E-Test/AuthPage/Auth_Basic_PostgreSQL.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
</header>
<div id="wrapper">
<div class="container">
<h1>JavaScript Component Test for jQuery File Upload</h1>
<p>This sample requires jQuery File Upload.</p>
<h1>Testing Authentication</h1>
<button id="logout_link" onclick="INTERMediatorOnPage.logout();location.reload()">Logout</button>
<table>
<thead>
Expand Down
3 changes: 1 addition & 2 deletions samples/E2E-Test/AuthPage/Auth_Basic_SQLite.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
</header>
<div id="wrapper">
<div class="container">
<h1>JavaScript Component Test for jQuery File Upload</h1>
<p>This sample requires jQuery File Upload.</p>
<h1>Testing Authentication</h1>
<button id="logout_link" onclick="INTERMediatorOnPage.logout();location.reload()">Logout</button>
<table>
<thead>
Expand Down
7 changes: 7 additions & 0 deletions samples/E2E-Test/SearchPage/searching_MySQL.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@
break;
}
}

function clearConditions() {
IMLibLocalContext.clearAllConditions()
INTERMediator.clearCondition('postalcode')
INTERMediator.constructMain(IMLibContextPool.contextFromName('postalcode'))
}
</script>
</head>
<body>
Expand All @@ -87,6 +93,7 @@
<option value="1000000">1000000</option>
</select>
<button id="_im_test_button_search" data-im="_@update:postalcode">Search</button>
<button onclick="clearConditions()">Clear</button>
</th>
</tr>
<tr>
Expand Down
7 changes: 7 additions & 0 deletions samples/E2E-Test/SearchPage/searching_PostgreSQL.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@
break;
}
}

function clearConditions() {
IMLibLocalContext.clearAllConditions()
INTERMediator.clearCondition('postalcode')
INTERMediator.constructMain(IMLibContextPool.contextFromName('postalcode'))
}
</script>
</head>
<body>
Expand All @@ -87,6 +93,7 @@
<option value="1000000">1000000</option>
</select>
<button id="_im_test_button_search" data-im="_@update:postalcode">Search</button>
<button onclick="clearConditions()">Clear</button>
</th>
</tr>
<tr>
Expand Down
7 changes: 7 additions & 0 deletions samples/E2E-Test/SearchPage/searching_SQLite.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@
break;
}
}

function clearConditions() {
IMLibLocalContext.clearAllConditions()
INTERMediator.clearCondition('postalcode-search')
INTERMediator.constructMain(IMLibContextPool.contextFromName('postalcode-search'))
}
</script>
</head>
<body>
Expand Down Expand Up @@ -90,6 +96,7 @@
<option value="1000000">1000000</option>
</select>
<button id="_im_test_button_search" data-im="_@update:postalcode-search">Search</button>
<button onclick="clearConditions()">Clear</button>
</th>
</tr>
<tr>
Expand Down
26 changes: 26 additions & 0 deletions spec/Manual-Tests/End-to-End-Test.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,32 @@ The format of below is: [commit code from git log], [Version from composer.json]
The test is identified by .conf.js files in the /spec/run directory.
The test 'wdio-chrome.conf.js' and 'wdio-firefox.conf.js' are running on GitHub Actions.

- commit 54e0853ffc0135451baf56c4ec8ffb99a1103473 (Sun Feb 4 14:25:34 2024 +0900),
INTER-Mediator Ver.12 (2023-11-16),
wdio-edge.conf.js,
PHP 8.3.2 (Homebrew based)+MySQL 8.3.0/PostgreSQL 14.10_1/SQLite 3.43.2+MicrosoftEdge (v121.0.2277.98) on mac,
by Masayuki Nii <[email protected]>, OK

- commit 54e0853ffc0135451baf56c4ec8ffb99a1103473 (Sun Feb 4 14:25:34 2024 +0900),
INTER-Mediator Ver.12 (2023-11-16),
wdio-sync-edge.conf.js,
PHP 8.3.2 (Homebrew based)+MySQL 8.3.0/PostgreSQL 14.10_1/SQLite 3.43.2+MicrosoftEdge (v121.0.2277.98) on mac,
by Masayuki Nii <[email protected]>, OK

- commit 54e0853ffc0135451baf56c4ec8ffb99a1103473 (Sun Feb 4 14:25:34 2024 +0900),
INTER-Mediator Ver.12 (2023-11-16),
wdio-sync-chrome.conf.js,
PHP 8.3.2 (Homebrew based)+MySQL 8.3.0/PostgreSQL 14.10_1/SQLite 3.43.2+chrome (v120.0.6099.234) on mac,
by Masayuki Nii <[email protected]>, OK

- commit 54e0853ffc0135451baf56c4ec8ffb99a1103473 (Sun Feb 4 14:25:34 2024 +0900),
INTER-Mediator Ver.12 (2023-11-16),
wdio-search-chrome.conf.js,
PHP 8.3.2 (Homebrew based)+MySQL 8.3.0/PostgreSQL 14.10_1/SQLite 3.43.2+chrome (v120.0.6099.234) on mac,
by Masayuki Nii <[email protected]>, OK

- Tests in wdio-search-edge.conf.js are integrated into wdio-edge.conf.js.

- commit f529a39c53f8afc6baea956747bf11af455db226 (Sun Dec 24 13:56:23 2023 +0900),
INTER-Mediator Ver.12 (2023-11-16),
wdio-search-chrome.conf.js,
Expand Down
Loading

0 comments on commit 6e036ec

Please sign in to comment.