diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..592d72f --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,59 @@ +on: + push: + # Sequence of patterns matched against refs/tags + tags: + - '3*' + +name: create_release + +jobs: + build: + name: create_release + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Slack Notification on Start + uses: rtCamp/action-slack-notify@v2.2.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }} + SLACK_CHANNEL: notify-nc3-release + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: "#f0ad4e" + SLACK_MESSAGE: "Start Job" + + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token + with: + tag_name: ${{ github.ref }} + release_name: ${{ github.ref }} + body: | + NetCommons ${{ github.ref }} released. + draft: false + prerelease: false + + # テスト成功時はこちらのステップが実行される + - name: Slack Notification on Finish + uses: rtCamp/action-slack-notify@v2.2.0 + if: success() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }} + SLACK_CHANNEL: notify-nc3-release + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: good + SLACK_MESSAGE: "Job Success" + + # テスト失敗時はこちらのステップが実行される + - name: Slack Notification on Failure + uses: rtCamp/action-slack-notify@v2.2.0 + if: failure() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: danger + SLACK_MESSAGE: "Job Failure" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..6da4321 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,168 @@ +on: + push: + branches: + - main + - master + pull_request: + branches: + - main + - master + +name: tests + +jobs: + setup: + name: setup + runs-on: ubuntu-latest + steps: + - name: Slack Notification on Start + uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: "#f0ad4e" + + tests: + name: tests + needs: setup + runs-on: ubuntu-latest + strategy: + matrix: + php: [ '7.1', '7.2', '7.3', '7.4' ] + mysql: [ '5.7', '8.0' ] + + env: + NC3_BUILD_DIR: "/opt/nc3" + NC3_DOCKER_DIR: "/opt/docker" + NC3_GIT_URL: "git://github.com/NetCommons3/NetCommons3.git" + NC3_GIT_BRANCH: "master" + PLUGIN_BUILD_DIR: ${{ github.workspace }} + PHP_VERSION: ${{ matrix.php }} + MYSQL_VERSION: ${{ matrix.mysql }} + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: cakephp_test + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + steps: + - uses: actions/checkout@v2 + + - name: Fix up git URLs + run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig + + - name: environment + run: | + echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}" + echo "PLUGIN_BUILD_DIR=${PLUGIN_BUILD_DIR}" + echo "PHP_VERSION=${PHP_VERSION}" + echo "MYSQL_VERSION=${MYSQL_VERSION}" + ls -al ${PLUGIN_BUILD_DIR} + + - name: docker-compose install + run: | + curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose + chmod +x ~/docker-compose + sudo mv ~/docker-compose /usr/local/bin/docker-compose + docker-compose --version + + - name: git clone nc3 + run: git clone -b ${NC3_GIT_BRANCH} ${NC3_GIT_URL} ${NC3_BUILD_DIR} + + - name: git clone nc3_docker + run: git clone https://github.com/NetCommons3/nc3app-docker.git ${NC3_DOCKER_DIR} + + - name: docker-compose start + run: | + cd ${NC3_DOCKER_DIR} + docker-compose up -d + docker-compose start + + - run: docker ps + + - name: check libraries + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/start-on-docker.sh + + - name: nc3 build + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/app-build.sh + + - name: phpcs (PHP CodeSniffer) + if: always() + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh + + - name: phpmd (PHP Mess Detector) + if: always() + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh + + - name: phpcpd (PHP Copy/Paste Detector) + if: always() + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh + + - name: gjslint (JavaScript Style Check) + if: always() + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh + + - name: phpdoc (PHP Documentor) + if: always() + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh + + - name: phpunit (PHP UnitTest) + if: always() + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh + sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build + +# - name: push coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# COVERALLS_FLAG_NAME: ${{ matrix.php }} +# run: | +# cd ${NC3_BUILD_DIR} +# ls -la ${NC3_BUILD_DIR} +# vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v + + - name: docker-compose remove + if: always() + run: | + cd ${NC3_DOCKER_DIR} + docker-compose rm -f + + # テスト失敗時はこちらのステップが実行される + - name: Slack Notification on Failure + uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' && failure() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}(php${{ matrix.php }}, mysql${{ matrix.mysql }})" + SLACK_COLOR: danger + + teardown: + name: teardown + runs-on: ubuntu-latest + needs: tests + steps: + # テスト成功時はこちらのステップが実行される + - name: Slack Notification on Success + uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' && success() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: good diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index cf653bc..0000000 --- a/.travis.yml +++ /dev/null @@ -1,41 +0,0 @@ -language: php - -php: - - 5.4 - - 5.5 - - 5.6 - - 7.0 - - 7.1 - -sudo: false - -env: - matrix: - - NETCOMMONS_VERSION=master DB=mysql - global: - - secure: "tRLhQkdKz4sHxMo/HDEl04RWb4/S/7f8OiElsxQEW1PEGqi2QNAhPlUauMCchaSvTJc2rp8bMq+Qmken7NkmkURgC3N/1UbYcOsFlVm2SX8hIztgXBXbLtNNy9vv18xthV9qXqlG1SUaTJqJasHS/YUJHsq3nV9OhQYCybJE0vA=" - - GIT_COMMITTER_NAME=s-nakajima - - GIT_COMMITTER_EMAIL=nakajimashouhei@gmail.com - - GIT_AUTHOR_NAME=s-nakajima - - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com - -before_script: - - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3 - - git clone git://github.com/NetCommons3/NetCommons3 $NETCOMMONS_BUILD_DIR - - cd $NETCOMMONS_BUILD_DIR - - git checkout $NETCOMMONS_VERSION - - travis_wait . tools/build/plugins/cakephp/travis/pre.sh - - . tools/build/plugins/cakephp/travis/environment.sh - -script: - - . tools/build/plugins/cakephp/travis/main.sh - -after_script: - - . tools/build/plugins/cakephp/travis/post.sh - -notifications: - email: - recipients: - - netcommons3@googlegroups.com - on_success: never # default: change - on_failure: always # default: always diff --git a/Controller/MenuFrameSettingsController.php b/Controller/MenuFrameSettingsController.php index 08bf03f..e8ac5ac 100644 --- a/Controller/MenuFrameSettingsController.php +++ b/Controller/MenuFrameSettingsController.php @@ -119,6 +119,14 @@ public function edit() { //不要パラメータ除去 unset($this->request->data['save']); //登録処理 + foreach ($this->request->data['MenuRooms'] as $i => $menuRoom) { + $roomId = $menuRoom['MenuFramesRoom']['room_id'] ?? null; + $pageId = $menuRoom['MenuFramesRoom']['page_id_top'] ?? null; + $isHidden = + $this->request->data['Menus'][$roomId][$pageId]['MenuFramesPage']['is_hidden'] ?? null; + $this->request->data['MenuRooms'][$i]['MenuFramesRoom']['is_hidden'] = $isHidden; + } + if ($this->MenuFrameSetting->saveMenuFrameSetting($this->request->data)) { return $this->redirect(NetCommonsUrl::backToPageUrl()); } diff --git a/Controller/MenusController.php b/Controller/MenusController.php index 7512473..51b3c74 100644 --- a/Controller/MenusController.php +++ b/Controller/MenusController.php @@ -81,7 +81,7 @@ public function index() { ) )); - if ($count1 && $count2) { + if (!$count1 && $count2) { $options = array( MenuFrameSetting::DISPLAY_TYPE_HEADER, MenuFrameSetting::DISPLAY_TYPE_FOOTER, diff --git a/Model/MenuFrameSetting.php b/Model/MenuFrameSetting.php old mode 100755 new mode 100644 diff --git a/Model/MenuFramesPage.php b/Model/MenuFramesPage.php index ef54c41..cf4f6e8 100644 --- a/Model/MenuFramesPage.php +++ b/Model/MenuFramesPage.php @@ -92,8 +92,11 @@ public function getMenuData($options = array()) { $this->Page->alias . '.room_id', $this->Page->alias . '.root_id', $this->Page->alias . '.parent_id', - $this->Page->alias . '.lft', - $this->Page->alias . '.rght', + //$this->Page->alias . '.lft', + //$this->Page->alias . '.rght', + $this->Page->alias . '.weight', + $this->Page->alias . '.sort_key', + $this->Page->alias . '.child_count', $this->Page->alias . '.permalink', $this->PagesLanguage->alias . '.page_id', $this->PagesLanguage->alias . '.name', @@ -155,7 +158,8 @@ public function getMenuData($options = array()) { ), ), 'order' => array( - $this->Page->alias . '.lft' => 'asc', + //$this->Page->alias . '.lft' => 'asc', + $this->Page->alias . '.sort_key' => 'asc', ) ), $options, ['conditions' => $pageLangConditions]); diff --git a/Model/MenuFramesRoom.php b/Model/MenuFramesRoom.php index f919477..ef9a52b 100644 --- a/Model/MenuFramesRoom.php +++ b/Model/MenuFramesRoom.php @@ -186,7 +186,8 @@ private function __getDefaultQueryOptions() { ), ), 'order' => array( - $this->Room->alias . '.lft' => 'asc', + //$this->Room->alias . '.lft' => 'asc', + $this->Room->alias . '.sort_key' => 'asc', ) ); } diff --git a/README.md b/README.md index 03e4ea0..02f036e 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,6 @@ -Menus +Menus ===== -Menus for NetCommons3 - -[![Build Status](https://api.travis-ci.org/NetCommons3/Menus.png?branch=master)](https://travis-ci.org/NetCommons3/Menus) -[![Coverage Status](https://coveralls.io/repos/NetCommons3/Menus/badge.png?branch=master)](https://coveralls.io/r/NetCommons3/Menus?branch=master) - -| dependencies | status | -| ------------ | ------ | -| composer.json | [![Dependency Status](https://www.versioneye.com/user/projects/53e35a2de0a229603f00006f/badge.png)](https://www.versioneye.com/user/projects/53e35a2de0a229603f00006f) | +[![Tests Status](https://github.com/NetCommons3/Menus/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/NetCommons3/Menus/actions/workflows/tests.yml) +[![Coverage Status](https://coveralls.io/repos/NetCommons3/Menus/badge.svg?branch=master)](https://coveralls.io/r/NetCommons3/Menus?branch=master) +[![Stable Version](https://img.shields.io/packagist/v/netcommons/menus.svg?label=stable)](https://packagist.org/packages/netcommons/menus) diff --git a/Test/Case/Model/MenuFrameSetting/GetMenuFrameSettingTest.php b/Test/Case/Model/MenuFrameSetting/GetMenuFrameSettingTest.php index 12c3e7c..344b248 100644 --- a/Test/Case/Model/MenuFrameSetting/GetMenuFrameSettingTest.php +++ b/Test/Case/Model/MenuFrameSetting/GetMenuFrameSettingTest.php @@ -66,6 +66,7 @@ public function dataProvider() { 'id' => '2', 'frame_key' => 'frame_2', 'display_type' => 'major', + 'is_private_room_hidden' => null, 'created_user' => null, 'created' => null, 'modified_user' => null, @@ -74,6 +75,7 @@ public function dataProvider() { array('frameKey' => 'frame_8', 'expected' => array( 'frame_key' => 'frame_8', 'display_type' => 'major', + 'is_private_room_hidden' => null, 'created_user' => null, 'created' => null, 'modified_user' => null, diff --git a/Test/Case/Model/MenuFrameSetting/SaveMenuFrameSettingTest.php b/Test/Case/Model/MenuFrameSetting/SaveMenuFrameSettingTest.php index f45155d..ca34f35 100644 --- a/Test/Case/Model/MenuFrameSetting/SaveMenuFrameSettingTest.php +++ b/Test/Case/Model/MenuFrameSetting/SaveMenuFrameSettingTest.php @@ -63,6 +63,7 @@ private function __data() { 'id' => '3', 'frame_key' => 'frame_3', 'display_type' => 'major', + 'is_private_room_hidden' => null, ), ); diff --git a/Test/Case/Model/MenuFrameSetting/SaveTest.php b/Test/Case/Model/MenuFrameSetting/SaveTest.php index 59f2aab..c93246c 100644 --- a/Test/Case/Model/MenuFrameSetting/SaveTest.php +++ b/Test/Case/Model/MenuFrameSetting/SaveTest.php @@ -63,6 +63,7 @@ private function __data() { 'id' => '3', 'frame_key' => 'frame_3', 'display_type' => 'major', + 'is_private_room_hidden' => null, ), 'Menus' => array( 1 => array( diff --git a/Test/Case/View/Elements/Menus/footer/IndexTest.php b/Test/Case/View/Elements/Menus/footer/IndexTest.php index f52280f..d913b0d 100644 --- a/Test/Case/View/Elements/Menus/footer/IndexTest.php +++ b/Test/Case/View/Elements/Menus/footer/IndexTest.php @@ -64,8 +64,6 @@ public function setUp() { */ public function testIndex() { $frameId = '4'; - Current::write('Page.id', '4'); - Current::write('Page.permalink', 'home'); //テスト実行 $this->_testGetAction('/test_menus/test_view_elements_menus_footer_index/index?frame_id=' . $frameId, diff --git a/Test/Case/View/Elements/Menus/header/IndexTest.php b/Test/Case/View/Elements/Menus/header/IndexTest.php index bb91eff..6f34703 100644 --- a/Test/Case/View/Elements/Menus/header/IndexTest.php +++ b/Test/Case/View/Elements/Menus/header/IndexTest.php @@ -64,8 +64,6 @@ public function setUp() { */ public function testIndex() { $frameId = '1'; - Current::write('Page.id', '4'); - Current::write('Page.permalink', 'home'); //テスト実行 $this->_testGetAction('/test_menus/test_view_elements_menus_header_index/index?frame_id=' . $frameId, @@ -108,7 +106,7 @@ private function __assertLink($frameId, $pageId, $permalink, $active, $name, $ha '<\/li>'; } elseif ($hasDropMark) { $pattern = - '
  • '; } } else { if ($hasChild) { - $listTagStart = '
  • '; } diff --git a/View/Helper/MenuFormHelper.php b/View/Helper/MenuFormHelper.php index 6c046a5..285a382 100644 --- a/View/Helper/MenuFormHelper.php +++ b/View/Helper/MenuFormHelper.php @@ -76,7 +76,7 @@ public function checkboxMenuFramesRoom($roomId, $room, $pageId) { 'div' => false, 'value' => '0', 'hiddenField' => '1', - 'checked' => ! isset($this->_View->request->data[$prefixInput][$isHidden]), + 'checked' => ! Hash::get($this->_View->request->data, $prefixInput . '.' . $isHidden, false), 'ng-click' => 'disableChildPages($event, ' . json_encode($domChildPageIds) . ')', )); $name = ''; @@ -117,7 +117,7 @@ public function checkboxMenuFramesPage($roomId, $room, $pageId, $menu, $rootRoom } list($roomPrefixInput, $roomIsHidden, ) = $this->_getRoomPrefix($rootRoomId, $rootRoom); - $roomDisabled = isset($this->_View->request->data[$roomPrefixInput][$roomIsHidden]); + $roomDisabled = Hash::get($this->_View->request->data, $roomPrefixInput)[$roomIsHidden] ?? null; $prefixInput = 'Menus.' . $roomId . '.' . $pageId . '.MenuFramesPage'; @@ -142,7 +142,8 @@ public function checkboxMenuFramesPage($roomId, $room, $pageId, $menu, $rootRoom 'prefixInput' => $prefixInput, 'pageId' => $pageId, 'nest' => $nest, - 'displayWhenClicking' => $menu['Page']['lft'] + 1 !== (int)$menu['Page']['rght'], + //'displayWhenClicking' => $menu['Page']['lft'] + 1 !== (int)$menu['Page']['rght'], + 'displayWhenClicking' => (bool)$menu['Page']['child_count'], 'domChildPageIds' => $domChildPageIds, 'roomDisabled' => $roomDisabled, 'pageNameCss' => $this->_getPageNameCss($room, $pageId), @@ -191,6 +192,17 @@ protected function _getRoomPrefix($roomId, $room) { $pageIdTop = Space::getPageIdSpace(Space::PUBLIC_SPACE_ID); } + $prefixInput = 'MenuRooms.' . $roomId . '.MenuFramesRoom'; + $html .= $this->NetCommonsForm->hidden($prefixInput . '.id'); + $html .= $this->NetCommonsForm->hidden($prefixInput . '.frame_key', + array('value' => $this->_View->request->data['Frame']['key'])); + $html .= $this->NetCommonsForm->hidden( + $prefixInput . '.page_id_top', array('value' => $pageIdTop) + ); + $html .= $this->NetCommonsForm->hidden( + $prefixInput . '.room_id', array('value' => $roomId) + ); + $prefixInput = 'Menus.' . $roomId . '.' . $pageIdTop . '.MenuFramesPage'; $isFidden = 'is_hidden'; diff --git a/View/Helper/MenuHelper.php b/View/Helper/MenuHelper.php index 3c1f144..018b53b 100644 --- a/View/Helper/MenuHelper.php +++ b/View/Helper/MenuHelper.php @@ -84,7 +84,8 @@ public function renderParent($displayType = null) { $parentPageIds[] = $parentPage['Page']['id']; } $childPages = $this->_View->viewVars['pages'][1]['ChildPage']; - $childPages = Hash::sort($childPages, '{n}.lft', 'asc'); + //$childPages = Hash::sort($childPages, '{n}.lft', 'asc'); + $childPages = Hash::sort($childPages, '{n}.sort_key', 'asc'); $parentPageIds = array_merge([$childPages[0]['id']], $parentPageIds); $parentPageIds = array_unique($parentPageIds); @@ -318,7 +319,7 @@ protected function _displayPage($pageId, $menu) { * @return bool */ public function isActive($page) { - return Current::read('Page.permalink') === (string)$page['Page']['permalink']; + return Current::read('Page.id') === (string)$page['Page']['id']; } /** @@ -390,7 +391,6 @@ protected function _getIndent($treePageId, $page) { if ($page['Page']['root_id'] === Page::PUBLIC_ROOT_PAGE_ID) { $indent--; } - return $indent; } diff --git a/View/MenuFrameSettings/edit.ctp b/View/MenuFrameSettings/edit.ctp index 0bc8ac8..334dd1d 100644 --- a/View/MenuFrameSettings/edit.ctp +++ b/View/MenuFrameSettings/edit.ctp @@ -1,6 +1,6 @@ * @author Shohei Nakajima @@ -15,7 +15,7 @@
    - element('MenuFrameSettings/edit_form'); ?> + element('Menus.MenuFrameSettings/edit_form'); ?>
    diff --git a/View/Menus/index.ctp b/View/Menus/index.ctp index 25ec9cf..8146601 100644 --- a/View/Menus/index.ctp +++ b/View/Menus/index.ctp @@ -10,8 +10,9 @@ * @copyright Copyright 2014, NetCommons Project */ ?> - - - +'; + echo $this->Menu->renderMain(); + echo ''; +} \ No newline at end of file diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 524bb93..6ba8a27 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,8 @@ + + + app/Plugin/Menus @@ -14,6 +17,6 @@ - +