From 4560b82e5fbcf7f20cf90420c45af368f3fe0d31 Mon Sep 17 00:00:00 2001
From: Julio <gugli100@gmail.com>
Date: Wed, 27 Oct 2021 16:04:00 +0200
Subject: [PATCH] Pages: Add enabled filter + admin can see enabled=false + add
 link in settings

---
 assets/vue/components/page/Form.vue           | 25 ++++++++-----------
 assets/vue/pages/Home.vue                     |  2 +-
 assets/vue/views/page/Create.vue              |  4 ++-
 assets/vue/views/page/List.vue                |  9 ++++---
 public/main/admin/index.php                   |  1 +
 .../DataProvider/Extension/PageExtension.php  |  4 +++
 src/CoreBundle/Entity/Page.php                |  3 ++-
 7 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/assets/vue/components/page/Form.vue b/assets/vue/components/page/Form.vue
index caa97b81d8..3d72a16633 100644
--- a/assets/vue/components/page/Form.vue
+++ b/assets/vue/components/page/Form.vue
@@ -11,18 +11,17 @@
     />
 
     <div class="q-gutter-sm">
-      <q-checkbox v-model="item.enabled" :label="$t('Enabled')" />
+      <q-checkbox v-model="item.enabled" :label="$t('Enabled')"/>
     </div>
 
-    <q-select v-model="item.category" :options="categories" :label="$t('Category')"
-
-              option-value="id"
-              option-label="title"
-
+    <q-select
+        v-model="item.category"
+        :options="categories" :label="$t('Category')"
+        option-value="id"
+        option-label="title"
     />
 
-    <q-select v-model="item.locale" :options="locales" :label="$t('Locale')" />
-
+    <q-select v-model="item.locale" :options="locales" :label="$t('Locale')"/>
 
     <TinyEditor
         id="item_content"
@@ -58,11 +57,8 @@ import {computed, ref} from "vue";
 import {mapGetters, useStore} from "vuex";
 import isEmpty from 'lodash/isEmpty';
 
-import Dropdown from "primevue/dropdown";
-
 export default {
   name: 'PageForm',
-  components:{Dropdown},
   setup () {
     let locales = ref([]);
     const store = useStore();
@@ -98,7 +94,7 @@ export default {
       title: null,
       content: null,
       locale: null,
-      enabled: null,
+      enabled: true,
     };
   },
   computed: {
@@ -110,8 +106,6 @@ export default {
       if (this.values) {
         this.values.creator = this.currentUser['@id'];
         this.values.url = '/api/access_urls/' + window.access_url_id;
-
-
         if (!isEmpty(this.values.category)) {
           this.values.category = this.values.category['@id'];
         }
@@ -139,6 +133,9 @@ export default {
       title: {
         required,
       },
+      enabled: {
+        required,
+      },
       content: {
         required,
       },
diff --git a/assets/vue/pages/Home.vue b/assets/vue/pages/Home.vue
index f17be59af1..1f9a1111df 100644
--- a/assets/vue/pages/Home.vue
+++ b/assets/vue/pages/Home.vue
@@ -56,7 +56,7 @@ export default {
       console.log(error);
     });
 
-    axios.get(ENTRYPOINT + 'pages.json?category.title=home').then(response => {
+    axios.get(ENTRYPOINT + 'pages.json?category.title=home&enabled=1').then(response => {
       if (Array.isArray(response.data)) {
         state.pages = response.data;
       }
diff --git a/assets/vue/views/page/Create.vue b/assets/vue/views/page/Create.vue
index 5c5d332177..76c76b606f 100644
--- a/assets/vue/views/page/Create.vue
+++ b/assets/vue/views/page/Create.vue
@@ -32,7 +32,9 @@ export default {
   },
   data() {
     return {
-      item: {}
+      item: {
+        enabled: true
+      }
     };
   },
   computed: {
diff --git a/assets/vue/views/page/List.vue b/assets/vue/views/page/List.vue
index bf89d0c30c..697f85c166 100644
--- a/assets/vue/views/page/List.vue
+++ b/assets/vue/views/page/List.vue
@@ -10,10 +10,10 @@
           <v-icon icon="mdi-file-plus"/>
           {{ $t('New page') }}
         </Button>
-        <Button label="{{ $t('Delete selected') }}" class="btn btn-danger " @click="confirmDeleteMultiple" :disabled="!selectedItems || !selectedItems.length">
-          <v-icon icon="mdi-delete"/>
-          {{ $t('Delete selected') }}
-        </Button>
+<!--        <Button label="{{ $t('Delete selected') }}" class="btn btn-danger " @click="confirmDeleteMultiple" :disabled="!selectedItems || !selectedItems.length">-->
+<!--          <v-icon icon="mdi-delete"/>-->
+<!--          {{ $t('Delete selected') }}-->
+<!--        </Button>-->
       </div>
     </div>
   </div>
@@ -53,6 +53,7 @@
 
     <Column field="locale" :header="$t('Locale')" />
     <Column field="category.title" :header="$t('Category')" />
+    <Column field="enabled" :header="$t('Enabled')" />
 
     <Column :exportable="false">
       <template #body="slotProps">
diff --git a/public/main/admin/index.php b/public/main/admin/index.php
index 2285e807bd..db38c52ded 100644
--- a/public/main/admin/index.php
+++ b/public/main/admin/index.php
@@ -339,6 +339,7 @@ if (api_is_platform_admin()) {
     $items[] = ['url' => 'settings.php?category=Plugins', 'label' => get_lang('Plugins')];
     $items[] = ['url' => 'settings.php?category=Regions', 'label' => get_lang('Regions')];
     $items[] = ['url' => 'system_announcements.php', 'label' => get_lang('Portal news')];
+    $items[] = ['url' => '/resources/pages', 'label' => get_lang('Pages')];
     $items[] = [
         'url' => api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=admin',
         'label' => get_lang('Global agenda'),
diff --git a/src/CoreBundle/DataProvider/Extension/PageExtension.php b/src/CoreBundle/DataProvider/Extension/PageExtension.php
index 605e7bd56f..646ac31672 100644
--- a/src/CoreBundle/DataProvider/Extension/PageExtension.php
+++ b/src/CoreBundle/DataProvider/Extension/PageExtension.php
@@ -62,5 +62,9 @@ final class PageExtension implements QueryCollectionExtensionInterface //, Query
                 ->setParameter('locale', $request->getLocale())
             ;
         }
+
+        if (!$this->security->isGranted('ROLE_ADMIN')) {
+            $qb->andWhere("$alias.enabled = 1");
+       }
     }
 }
diff --git a/src/CoreBundle/Entity/Page.php b/src/CoreBundle/Entity/Page.php
index 8fec3e5d01..77235f65c5 100644
--- a/src/CoreBundle/Entity/Page.php
+++ b/src/CoreBundle/Entity/Page.php
@@ -26,7 +26,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 #[ApiResource(
     collectionOperations: [
         'get' => [
-            'security' => "is_granted('ROLE_USER')",
+            //'security' => "is_granted('ROLE_USER')",
         ],
         'post' => [
             'security' => "is_granted('ROLE_ADMIN')",
@@ -54,6 +54,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 #[ApiFilter(SearchFilter::class, properties: [
     'locale' => 'exact',
     'url' => 'exact',
+    'enabled' => 'exact',
     'category' => 'exact',
     'category.title' => 'partial',
 ])]