Skip to content

Commit c14f94d

Browse files
github-actions[bot]romaninsh
github-actions[bot]
authored and
romaninsh
committed
Releasing refs/heads/release/2.0.1 into master (#861)
* Fix Link to Screenshot * Add ability to customize CSS of 'content' div * Add Documentation for addContentCss() feature * Added Expressions, onLineChange() * Chapter "Changing appearance" * Improve formatting * update doc * add "Is Not" for TableColumn::FilterModel::TypeString * StyleCI * changed Css to CSS (similarly how we use e.g. renderJS) * add demo * Apply fixes from StyleCI * Add a Scrolling Modal * minor fix change function name. * remove useSuiVue Now include in Bundle * fix/CaughException Layout - When children App is created * Bump eslint-utils from 1.4.0 to 1.4.2 in /js Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.2. - [Release notes](https://github.com/mysticatea/eslint-utils/releases) - [Commits](mysticatea/eslint-utils@v1.4.0...v1.4.2) Signed-off-by: dependabot[bot] <support@github.com> * Update to changes in Modal.php * add ignore E_DEPRECATED & E_USER_DEPRECATED * add App->catch_error_types to define error types in set_error_handler * fix/#802 Array fields error in form * Apply fixes from StyleCI * Fix #8ß5 * Allow to add Attributes to <input> tag New property added: $this->inputAttr in which additional attributes are stored New function added: setInputAttr() which is a clone of View->setAttr() which fills the $this->inputAttr array Can also be used to overwrite existing attributes as $this->inputAttr is passed as second param to array_merge (at $this->app->getTag()) * update to use inputAttr * update to use inputAttr * update to use inputAttr * update to use inputAttr * style CI fixes * styleCI fixes * Add demo for custom <input> Attributes * add another demo field which uses array definition * Update TypeText.php to pass check * Fix autocomplete.html * Fix lookup.html * Fix autocomplete.pug * Fix lookup.pug * init - add jsCallback when adding or deleting a row. * feature/TreeItemSelector Form Field Initial commit * Apply fixes from StyleCI * Make Escape key clear Grid Search * feature/MultiLine Enhancement - Ability to run js when adding or deleting row. - Add new line of record when tabbing out of the last row/column * Apply fixes from StyleCI * start implementation * Apply fixes from StyleCI * remove test * changed example for ibelar * Apply fixes from StyleCI * some more notes wip * Apply fixes from StyleCI * test * Mutliline: Improve inline docs and comments (#811) * Improve inline docs and comments * Update MultiLine.php * initial testing * Fix #814 - useless code in Form.php (#818) * Fix #814 - useless code in Form.php * Update Form.php * Add Locale class * Apply fixes from StyleCI * add LocaleTest * Apply fixes from StyleCI * Update LocaleTest.php * Add credits to Lokalize services * Create .empty * Delete .empty * Fix Locale.php * refactor * code review and refactor * Apply fixes from StyleCI * updare demo * type hint and cleanup * Apply fixes from StyleCI * js cleanup and comment * add more demo * Typo. * update userAction move loader set function to jsRender so we could apply afterSuccess or jsSuccess after setAction is done. Add jsSuccess and stateContext * Apply fixes from StyleCI * fix * Feature/fix textarea (#822) * fix TextArea and DropDown zero and empty values * Apply fixes from StyleCI * Enhance Form Testing suite * Apply fixes from StyleCI * fix * fix * #823: Fix a few phpDoc comments. (#824) * #823: Fix a few phpDoc comments. * #824: Lowercase @inheritdoc . * update - include web storage for ajaxexec - code refactoring * fix modal service * update modal service * fix/DropDown unnecessary property Remove unneccessary property isValueRequired for dropdown formfield and rely on field property required instead. * update ajaexec.plugin add demos/test to gitignore * remove unused comment * update button placement and state * remove jsEvent executor from UserAction Action that required an event must be expicitly set using jsEvent * Apply fixes from StyleCI * add exception handler * Apply fixes from StyleCI * update demos * added jsExecute() * Apply fixes from StyleCI * cleanup * check for exception in each jsSubmit step * Apply fixes from StyleCI * Feature/Refactor On method Allow for on method to receive a Model UserAction as second arguments. * Apply fixes from StyleCI * Table columns support user action now * Apply fixes from StyleCI * forgot the demo * Apply fixes from StyleCI * update - Create new Class jsUserAction based on existing jsCallback - remove jsEvent executor from demos - set demos using new jsUserAction - update View method to use new jsUserAction * Apply fixes from StyleCI * Code review Add comments clean up. * Apply fixes from StyleCI * update comment * test * fix test uri for jsactions.php demo * init * merge changed * Apply fixes from StyleCI * update View::on() Add ability to setup apiConfig for jsCallback. * updated Fix dropdown when place inside a column table. * Apply fixes from StyleCI * fix typo * update method name * improve functionality and demos * Apply fixes from StyleCI * improve demo * Apply fixes from StyleCI * improve demo * improve demo * making crud work * fixes * integrated crud into actions * Apply fixes from StyleCI * Code review Add comments clean up. * Apply fixes from StyleCI * update comment * test * fix test uri for jsactions.php demo * init * merge changed * Apply fixes from StyleCI * update View::on() Add ability to setup apiConfig for jsCallback. * merge * updated Fix dropdown when place inside a column table. * Apply fixes from StyleCI * fix typo * update method name * improve functionality and demos * Apply fixes from StyleCI * improve demo * Apply fixes from StyleCI * improve demo * improve demo * crud improvements * wip * wip * Apply fixes from StyleCI * action test * Apply fixes from StyleCI * test with getting action * Apply fixes from StyleCI * change property name * setup executor from action * Apply fixes from StyleCI * Addesd public property currency_decimals in Persistence/UI * Using property currency_decimals in FormField/Money * Apply fixes from StyleCI * code cleanup * refactor and review * Apply fixes from StyleCI * clean up * add hook callback to crud * Apply fixes from StyleCI * adding native action dropdown support into crud * Apply fixes from StyleCI * update demo to contain example of redefining action executor * Apply fixes from StyleCI * Added two really nice demo pages (index and actions) * Apply fixes from StyleCI * fixed and enhancement - fixed table border - fixed js when table dropdown menu appear near end of window - Delete action should be fixed in atk4\data remove floating css class to table dropdown menu View::On method now check for action confirmation property and apply it by default * fix action in wizrd * add action to menu item * add UserConfirmation * Apply fixes from StyleCI * Add SSE operation with user confirmation example This adds an example for triggering an SSE operation after asking confirmation from the user. * Apply fixes from StyleCI * hide modal content while reloading * refactor make it more generic by applying class to loader instead of moda. * apply sorting when using action * Apply fixes from StyleCI * remove previous test * remove tutorial from actions page Added to a new page tutorial_actions for test to work again * fix double factory * Fix few bugs and add comments (#847) * add some comments while reviewing * fix action->fields bug * cleanup * CRUD refactoring * Apply fixes from StyleCI * change method name * minor fix * notify refactor * more refactoring * Apply fixes from StyleCI * more cleanup * fix comment * more cleanup * Apply fixes from StyleCI * fix actions test * fix lookup test * temp fix for lookup Seem like db value is not available. * Feature/Code Highlight (#849) * Feature/Code Highlight Display code in tutorial using Highlight.js * Apply fixes from StyleCI * add lang selection * fix * nothing * Feature/Card Deck using model action (#846) * init * Apply fixes from StyleCI * fix demo * enhancement add menu bar improve jsNotify setup * Apply fixes from StyleCI * add ability to pass View::on() defaults * add some comments while reviewing * fix action->fields bug * cleanup * CRUD refactoring * Apply fixes from StyleCI * change method name * minor fix * notify refactor * more refactoring * Apply fixes from StyleCI * more cleanup * fix comment * more cleanup * Apply fixes from StyleCI * fix actions test * fix lookup test * temp fix for lookup Seem like db value is not available. * deck refactoring * Apply fixes from StyleCI * update demo * Apply fixes from StyleCI * typo * Apply fixes from StyleCI * enhancement card template refactoring add itemSearch to deck * Apply fixes from StyleCI * add empty view when no record to show * Apply fixes from StyleCI * update * Apply fixes from StyleCI * apply partial reload on card when possible * Apply fixes from StyleCI * remove test argument * Code review * Apply fixes from StyleCI * create view from seed * nothing really * Add Github workflows (actions) (#848) * workflow * Setting current dependencies * wip * wip * wip * wip * wip * wip * wip * wip * fix * Fix unit test on Windows paths * Remove file db.github.php from Demo functional test check. * Apply fixes from StyleCI * Fix some Type Hints * Apply fixes from StyleCI * Feature/input action (#845) * Feature/Input Action * Apply fixes from StyleCI * Change in demo : exit() to $app->callExit() (#854) * Change exit() to $app->callExit() * Change direct exit call to $app->callExit(). * Change all deprecated Persistence_* to correct Persistence\* * badge * fix release bundler * fix release bundler * wip * fix release bundler * fix release bundler * fix release bundler * fix release drafter * release drafter fix * Improvement/include action caption in modal title (#852) * include action caption in modal title * [UPDATE] trim modal title * Apply fixes from StyleCI * DateTime is object and working on same object is replacing both value… (#834) * DateTime is object and working on same object is replacing both values to be same This sets $d1 and $d2 both to "YYYY-mm-dd 23:59:59" ... * Apply fixes from StyleCI * Add Instantiate App using DIContainerTrait (#855) * Cleanup actions * categorizing release drafter * categorizing release drafter * add bot that would ask for documentation * cleanup * fix release bundler * fix release bundler * fix indentation to 2 spaces * fix bundler * Setting current dependencies
1 parent 6a4a839 commit c14f94d

File tree

9 files changed

+98
-16
lines changed

9 files changed

+98
-16
lines changed

‎.github/config.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
updateDocsComment: >
2+
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would update some of our documentation based on your changes.
3+
4+
updateDocsWhiteList:
5+
- bug
6+
- chore
7+
8+
updateDocsTargetFiles:
9+
- README.md
10+
- docs/
11+

‎.github/release-drafter.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
categories:
2+
- title: "Documentation enhancements"
3+
labels:
4+
- "Documentation :books:"
5+
template: |
6+
## What’s Changed
7+
8+
$CHANGES

‎.github/workflows/bundler.yml

+27-11
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ jobs:
1111
image: atk4/image:latest # https://github.com/atk4/image
1212
steps:
1313
- uses: actions/checkout@master
14-
- name: Hack around git branches
14+
- name: Update CDN versions
1515
run: |
1616
v=$(echo ${{ github.ref }} | cut -d / -f 4)
1717
echo $v
1818
git branch
19+
sed -i "s|'https://cdn.jsdelivr.net/gh/atk4/ui.*|'https://cdn.jsdelivr.net/gh/atk4/ui@$v/public',|" src/App.php
20+
sed -i "s|public \$version.*|public \$version = '$v';|" src/App.php
1921
- name: Update to stable dependencies
2022
run: |
2123
jq 'del(."minimum-stability")|del(.require["atk4/data"])' < composer.json > tmp && mv tmp composer.json
@@ -30,18 +32,32 @@ jobs:
3032
branch: ${{ github.ref }}
3133
github_token: ${{ secrets.GITHUB_TOKEN }}
3234

33-
- name: pull-request
34-
uses: repo-sync/pull-request@v2
35-
with:
36-
source_branch: "" # If blank, default: triggered branch
37-
destination_branch: "master" # If blank, default: master
38-
pr_title: "Releasing ${{ github.ref }} into master"
39-
pr_body: |
35+
- name: pull-request-action
36+
uses: vsoch/pull-request-action@master
37+
env:
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
PULL_REQUEST_BRANCH: "master"
40+
PULL_REQUEST_TITLE: "Releasing ${{ github.ref }} into master"
41+
PULL_REQUEST_BODY: |
4042
- [ ] Review changes (must include stable dependencies)
4143
- [ ] Merge this PR into master (will delete ${{ github.ref }})
4244
- [ ] Go to Releases and create TAG from master
45+
4346
Do not merge master into develop
44-
pr_reviewer: "romaninsh"
45-
pr_assignee: "romaninsh"
46-
github_token: ${{ secrets.GITHUB_TOKEN }}
4747
48+
49+
# - name: pull-request
50+
# uses: repo-sync/pull-request@v2
51+
# with:
52+
# source_branch: "" # If blank, default: triggered branch
53+
# destination_branch: "master" # If blank, default: master
54+
# pr_title: "Releasing ${{ github.ref }} into master"
55+
# pr_body: |
56+
# - [ ] Review changes (must include stable dependencies)
57+
# - [ ] Merge this PR into master (will delete ${{ github.ref }})
58+
# - [ ] Go to Releases and create TAG from master
59+
# Do not merge master into develop
60+
# pr_reviewer: "romaninsh"
61+
# pr_assignee: "romaninsh"
62+
# github_token: ${{ secrets.GITHUB_TOKEN }}
63+
#

‎.github/workflows/release-drafter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
# Drafts your next Release notes as Pull Requests are merged into "master"
14-
- uses: toolmantim/release-drafter@v5.2.0
14+
- uses: toolmantim/release-drafter@master
1515
env:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/zip-file.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: ZIP file builder
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
autocommit:
10+
name: Update to stable dependencies
11+
if: startsWith(github.ref, 'refs/heads/release/')
12+
runs-on: ubuntu-latest
13+
container:
14+
image: atk4/image:latest # https://github.com/atk4/image
15+
steps:
16+
- uses: actions/checkout@master
17+
- name: Hack around git branches
18+
run: |
19+
v=$(echo ${{ github.ref }} | cut -d / -f 4)
20+
echo $v
21+
git branch

‎docs/quickstart.rst

+26
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Agile Toolkit will work anywhere where PHP can. Find a suitable guide on how to
2020
PHP on your platform. Having a local database is a plus, but our initial application will
2121
work without persistent database.
2222

23+
Requirements
24+
============
2325

2426
Installing
2527
==========
@@ -120,6 +122,30 @@ single ToDo item::
120122
121123
As you might have noted already, Persistence and Model are defined independently from each-other.
122124

125+
Instantiate App using DIContainerTrait (Dependency Injection)
126+
=============================================================
127+
128+
Class App use `DIContainerTrait` which allow us to inject dependency directly in constructor::
129+
130+
use Monolog\Logger;
131+
use Monolog\Handler\StreamHandler;
132+
133+
// create a log channel
134+
$logger = new Logger('name');
135+
$logger->pushHandler(new StreamHandler('path/to/your.log', Logger::WARNING));
136+
137+
use atk4\data\Persistence;
138+
use atk4\ui\App;
139+
$db = Persistence::connect("mysql://localhost:3306/database_name", "user", "password");
140+
141+
$app = new App([
142+
"title" => "Your application title",
143+
"db" => $db,
144+
"logger" => $logger
145+
]);
146+
147+
148+
123149
Form and CRUD Components
124150
========================
125151

‎src/ActionExecutor/UserAction.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function setAction(Generic $action) :View
118118

119119
// get necessary step need prior to execute action.
120120
if ($this->steps = $this->getSteps($action)) {
121-
$this->title = $this->action->owner->getModelCaption();
121+
$this->title = trim($action->caption.' '.$this->action->owner->getModelCaption());
122122

123123
$this->btns->add($this->execActionBtn = (new Button([$this->action->caption, 'blue'])));
124124

‎src/App.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ class App
3333

3434
/** @var array|false Location where to load JS/CSS files */
3535
public $cdn = [
36-
'atk' => 'https://cdn.jsdelivr.net/gh/atk4/ui@1.7.1/public',
36+
'atk' => 'https://cdn.jsdelivr.net/gh/atk4/ui@2.0.1/public',
3737
'jquery' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1',
3838
'serialize-object' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery-serialize-object/2.5.0',
3939
'semantic-ui' => 'https://cdn.jsdelivr.net/npm/fomantic-ui@2.7.2/dist',
4040
];
4141

4242
/** @var string Version of Agile UI */
43-
public $version = '2.0.0';
43+
public $version = '2.0.1';
4444

4545
/** @var string Name of application */
4646
public $title = 'Agile UI - Untitled Application';

‎src/TableColumn/FilterModel/TypeDatetime.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function setConditionForModel($m)
9292
break;
9393
case '!=':
9494
case '=':
95-
$d1 = $this->getDatetime($filter['value'])->setTime(0, 0, 0);
95+
$d1 = clone $this->getDatetime($filter['value'])->setTime(0, 0, 0);
9696
$d2 = $this->getDatetime($filter['value'])->setTime(23, 59, 59);
9797
if ($d2 >= $d1) {
9898
$value = $m->persistence->typecastSaveField($m->getField($filter['name']), $d1);

0 commit comments

Comments
 (0)