COM-20083: Package submission page (ezsystems#153)

* COM-20083: Package submission page https://jira.ez.no/browse/COM-20083 * Update app/Resources/views/themes/ezplatform/full/package_submit_success.html.twig Co-Authored-By: ciastektk <tomasz.kryszan@ez.no> * Update app/Resources/views/themes/ezplatform/full/package_add.html.twig Co-Authored-By: ciastektk <tomasz.kryszan@ez.no> * Update app/config/workflows.yml Co-Authored-By: ciastektk <tomasz.kryszan@ez.no> * Update app/config/workflows.yml Co-Authored-By: ciastektk <tomasz.kryszan@ez.no> * Update app/config/workflows.yml Co-Authored-By: ciastektk <tomasz.kryszan@ez.no>
ezecosystem · Feb 1, 2019 · aac0576 · aac0576
1 parent 5ba1aa6
commit aac0576
Show file tree

Hide file tree

Showing 45 changed files with 2,073 additions and 86 deletions.
diff --git a/app/Resources/views/themes/ezplatform/full/package_add.html.twig b/app/Resources/views/themes/ezplatform/full/package_add.html.twig
@@ -0,0 +1,54 @@
+{% extends '@ezdesign/pagelayout.html.twig' %}
+
+{% block content %}
+    <div class="container-fluid package-add__container">
+        <div class="container">
+            <div class="row package-add__header mx-0">
+                <div class="col-md-4 col-xs-12 pl-md-0">
+                    <h1 class="package-add__title">Submit a Package</h1>
+                </div>
+                <div class="col-md-8 col-xs-12 pr-md-0">
+                    {% include '@ezdesign/parts/package/publication_status.html.twig' with {'step' : 'submission' } %}
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-9">
+                    {{ form_start(addForm) }}
+                    <div class="form-group">
+                        {{ form_label(addForm.url) }}
+                        {{ form_widget(addForm.url) }}
+                        <div class="form-error">
+                            {{ form_errors(addForm.url) }}
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        {{ form_label(addForm.name) }}
+                        {{ form_widget(addForm.name) }}
+                        <div class="form-error">
+                            {{ form_errors(addForm.name) }}
+                        </div>
+                    </div>
+                    <div class="form-group multiple-select">
+                        {{ form_label(addForm.categories) }}
+                        {{ form_widget(addForm.categories) }}
+                        <div class="form-error">
+                            {{ form_errors(addForm.categories) }}
+                        </div>
+                    </div>
+                    <div class="form-group text-md-center form-btn">
+                        <input type="submit" value="Submit Package" class="btn btn-primary">
+                    </div>
+                    {{ form_end(addForm) }}
+                </div>
+                <div class="col-md-3">
+                    <div class="doc-info">
+                        <span>Don't you have a packagist URL?</span>
+                        <a class="d-block" href="https://doc.ezplatform.com/en/latest/tutorials/extending_admin_ui/1_creating_a_bundle/" target="_blank">
+                            Here is how to get one
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/app/Resources/views/themes/ezplatform/full/package_list.html.twig b/app/Resources/views/themes/ezplatform/full/package_list.html.twig
@@ -34,18 +34,20 @@
                 </div>
                 <div class="col-md-10">
                     <div class="row">
-                        <div class="col-md-12">
-                            <div id="find-bundle" class="package-list__search">
+                        <div class="col-md-8 package-list__search">
+                            <div id="find-bundle">
                                 <div class="form-row align-items-center">
                                     {{ render_esi(controller('app.controller.package:renderSearchPackageForm', {"searchText": searchText})) }}
                                 </div>
                             </div>
                         </div>
+                        <div class="col-md-4 text-right">
+                            <a href="{{ path(ez_route('_ezplatform_package_add')) }}" class="btn btn-blue rounded">Add Package</a>
+                        </div>
                     </div>
-                    <div class="row">
+                    <div class="row package-list__content">
                         <div class="col-md-12">
-                            <div class="package-list__content">
-                                {% if items is defined and items|length > 0 %}
+                            {% if items is defined and items|length > 0 %}
                                 <div class="row align-items-center">
                                     <div class="col-xs-12 col-md-9 package-list__keyword">
                                         {% if search is defined and search is not empty %}
@@ -71,14 +73,13 @@
                                         {{ pagerfanta(pager, 'package_list') }}
                                     </div>
                                 </div>
-                                {% else %}
-                                    <div class="row">
-                                        <div class="col-12">
-                                            <h2>Packages not found</h2>
-                                        </div>
+                            {% else %}
+                                <div class="row">
+                                    <div class="col-12">
+                                        <h2>Packages not found</h2>
                                     </div>
-                                {% endif %}
-                            </div>
+                                </div>
+                            {% endif %}
                         </div>
                     </div>
                 </div>

diff --git a/app/Resources/views/themes/ezplatform/full/package_submit_success.html.twig b/app/Resources/views/themes/ezplatform/full/package_submit_success.html.twig
@@ -0,0 +1,29 @@
+{% extends '@ezdesign/pagelayout.html.twig' %}
+
+{% block content %}
+    <div class="container-fluid package-add__container">
+        <div class="container">
+            <div class="row package-add__header mx-0">
+                <div class="col-md-4 col-xs-12 pl-md-0">
+                    <h3 class="package-add__title">Submit a Package</h3>
+                </div>
+                <div class="col-md-8 col-xs-12 pr-md-0">
+                    {% include '@ezdesign/parts/package/publication_status.html.twig' with {'step' : 'moderation' } %}
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12 text-center submission-success">
+                    <img class="submission-success__img img-fluid" src="{{ asset('assets/images/package-submission-success.png') }}">
+                    <div class="submission-success__msg">
+                        <p>The package was submitted for review.</p>
+                        <p>We will review the package and will publish it on Package Directory</p>
+                    </div>
+                    <div class="submission-success__buttons">
+                        <a class="btn" href="{{ path(ez_route('_ezplatform_package_list')) }}">Go to Package Catalog</a>
+                        <a class="btn" href="{{ path(ez_route('_ezplatform_package_add')) }}">Submit another package</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/app/Resources/views/themes/ezplatform/parts/package/publication_status.html.twig b/app/Resources/views/themes/ezplatform/parts/package/publication_status.html.twig
@@ -0,0 +1,16 @@
+{% if step is defined %}
+    <ul class="package-add__publication text-md-right">
+        <li class="publication__step {% if step == 'submission' %}publication__step--active{% endif %}">
+            <p>
+                <span class="publication__step--number">1</span>
+                Submission
+            </p>
+        </li>
+        <li class="publication__step {% if step == 'moderation' %}publication__step--active{% endif %}">
+            <p>
+                <span class="publication__step--number">2</span>
+                Moderation
+            </p>
+        </li>
+    </ul>
+{% endif %}
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -8,6 +8,7 @@ imports:
     - { resource: config_ezplatform_page.yml }
     - { resource: custom_tags.yml }
     - { resource: services/ }
+    - { resource: workflows.yml }
 
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration

diff --git a/app/config/default_parameters.yml b/app/config/default_parameters.yml
@@ -118,3 +118,5 @@ parameters:
 
     # Admin siteaccess group name
     admin_group_name: admin_group
+
+    app.workflow.publish_on_last_stage: [package_workflow]
diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -73,6 +73,11 @@ _ezplatform_blog_ajax:
         "page": '\d+'
 
 # PACKAGE LIST
+_ezplatform_package_add:
+    path: /packages/add
+    defaults: { _controller: app.controller.package:addPackageAction }
+    methods: [GET, POST]
+
 _ezplatform_package_list:
     path: /packages/{page}
     defaults: { _controller: app.controller.package:showPackageListAction, page: 1 }

diff --git a/app/config/services/cache.yml b/app/config/services/cache.yml
diff --git a/app/config/services/controller.yml b/app/config/services/controller.yml
@@ -21,7 +21,7 @@ services:
             - '@ezpublish.api.service.search'
             - '@ezpublish.urlalias_router'
             - '@app.query_type.packages'
-            - '@app.package.service'
+            - '@AppBundle\Service\Package\PackageService'
             - '@form.factory'
             - '@router.default'
             - '@eztags.api.service.tags'

diff --git a/app/config/services/event.yml b/app/config/services/event.yml
@@ -0,0 +1,8 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    AppBundle\Event\Workflow\PublishOnLastStageSubscriber:
+        arguments:
+            $publishOnLastStageWorkflows: '%app.workflow.publish_on_last_stage%'
diff --git a/app/config/services/github.yml b/app/config/services/github.yml
diff --git a/app/config/services/package.yml b/app/config/services/package.yml
diff --git a/app/config/services/packagist.yml b/app/config/services/packagist.yml
@@ -2,7 +2,7 @@ services:
     app.packagist_api_client:
         class: Packagist\Api\Client
     app.packagist_api_mapper:
-        class: AppBundle\Service\Packagist\Mapper
+        class: AppBundle\Mapper\PackageMapper
         arguments: ['%packages.excluded_maintainers%']
     app.packagist_service_provider:
         class: AppBundle\Service\Packagist\PackagistServiceProvider

diff --git a/app/config/services/service.yml b/app/config/services/service.yml
@@ -0,0 +1,26 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    AppBundle\Service\:
+        resource: '../../../src/AppBundle/Service/*'
+
+    AppBundle\Service\Package\PackageService:
+        arguments:
+            $parentLocationId: '%packages.location_id%'
+            $tagsService: '@ezpublish.api.service.tags'
+
+    AppBundle\Service\Cache\CacheService:
+        arguments:
+            $cacheExpirationTime: '%packages.cache_expiration_time%'
+
+    AppBundle\Service\GitHub\GitHubServiceProvider:
+        arguments:
+            $authenticationToken: '%env(GITHUB_TOKEN)%'
+
+    GitHub\Client:
+        class: Github\Client
+
+    EzSystems\EzPlatformAdminUi\UI\Dataset\ContentDraftsDataset:
+        class: EzSystems\EzPlatformAdminUi\UI\Dataset\ContentDraftsDataset
diff --git a/app/config/services/validator.yml b/app/config/services/validator.yml
@@ -0,0 +1,8 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: false
+
+    AppBundle\Validator\:
+        resource: '../../../src/AppBundle/Validator/*'
diff --git a/app/config/workflows.yml b/app/config/workflows.yml
@@ -0,0 +1,24 @@
+ezpublish:
+    system:
+        default:
+            workflows:
+                package_workflow:
+                    name: "Package workflow"
+                    matchers:
+                        content_type: package
+                        content_status: draft
+                    stages:
+                        draft:
+                            label: 'In Review'
+                            color: '#4a69bd'
+                        approved:
+                            label: 'Approved'
+                            color: '#0f0'
+                            last_stage: true
+                    initial_stage: draft
+                    transitions:
+                        to_approved:
+                            from: draft
+                            to: approved
+                            label: 'Approve'
+                            icon: '/bundles/ezplatformadminui/img/ez-icons.svg#approved'