Partage d'export enregistré et génération asynchrone des exports

src/Bundle/ChillMainBundle/Resources/public/lib/api/export.ts

@@ -0,0 +1,18 @@
+import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
+import { ExportGeneration } from "ChillMainAssets/types";
+
+export const fetchExportGenerationStatus = async (
+    exportGenerationId: string,
+): Promise<ExportGeneration> =>
+    makeFetch(
+        "GET",
+        `/api/1.0/main/export-generation/${exportGenerationId}/object`,
+    );
+
+export const generateFromSavedExport = async (
+    savedExportUuid: string,
+): Promise<ExportGeneration> =>
+    makeFetch(
+        "POST",
+        `/api/1.0/main/export/export-generation/create-from-saved-export/${savedExportUuid}`,
+    );

src/Bundle/ChillMainBundle/Resources/public/lib/api/return_path.ts

@@ -0,0 +1,3 @@
+export function buildReturnPath(location: Location): string {
+    return location.pathname + location.search;
+}

src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js

@@ -12,6 +12,11 @@ function loadDynamicPicker(element) {
   let apps = element.querySelectorAll('[data-module="pick-dynamic"]');
 
   apps.forEach(function (el) {
+    let suggested;
+    let as_id;
+    let submit_on_adding_new_entity;
+    let label;
+    let isCurrentUserPicker;
     const isMultiple = parseInt(el.dataset.multiple) === 1,
       uniqId = el.dataset.uniqid,
       input = element.querySelector(
@@ -22,12 +27,13 @@ function loadDynamicPicker(element) {
         ? JSON.parse(input.value)
         : input.value === "[]" || input.value === ""
           ? null
-          : [JSON.parse(input.value)],
-      suggested = JSON.parse(el.dataset.suggested),
-      as_id = parseInt(el.dataset.asId) === 1,
-      submit_on_adding_new_entity =
-        parseInt(el.dataset.submitOnAddingNewEntity) === 1,
-      label = el.dataset.label;
+          : [JSON.parse(input.value)];
+    suggested = JSON.parse(el.dataset.suggested);
+    as_id = parseInt(el.dataset.asId) === 1;
+    submit_on_adding_new_entity =
+      parseInt(el.dataset.submitOnAddingNewEntity) === 1;
+    label = el.dataset.label;
+    isCurrentUserPicker = uniqId.startsWith("pick_user_or_me_dyn");
 
     if (!isMultiple) {
       if (input.value === "[]") {
@@ -44,6 +50,7 @@ function loadDynamicPicker(element) {
         ':uniqid="uniqid" ' +
         ':suggested="notPickedSuggested" ' +
         ':label="label" ' +
+        ':isCurrentUserPicker="isCurrentUserPicker" ' +
         '@addNewEntity="addNewEntity" ' +
         '@removeEntity="removeEntity" ' +
         '@addNewEntityProcessEnded="addNewEntityProcessEnded"' +
@@ -61,6 +68,7 @@ function loadDynamicPicker(element) {
           as_id,
           submit_on_adding_new_entity,
           label,
+          isCurrentUserPicker,
         };
       },
       computed: {
@@ -89,7 +97,8 @@ function loadDynamicPicker(element) {
                 const ids = this.picked.map((el) => el.id);
                 input.value = ids.join(",");
               }
-              console.log(entity);
+              console.log(this.picked);
+              // console.log(entity);
             }
           } else {
             if (

src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js

@@ -1,14 +0,0 @@
-import { download_report } from "../../lib/download-report/download-report";
-
-window.addEventListener("DOMContentLoaded", function (e) {
-  const export_generate_url = window.export_generate_url;
-
-  if (typeof export_generate_url === "undefined") {
-    console.error("Alias not found!");
-    throw new Error("Alias not found!");
-  }
-
-  const query = window.location.search,
-    container = document.querySelector("#download_container");
-  download_report(export_generate_url + query.toString(), container);
-});

src/Bundle/ChillMainBundle/Resources/public/types.ts

@@ -1,4 +1,5 @@
 import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";
+import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
 
 export interface DateTime {
     datetime: string;
@@ -201,6 +202,16 @@ export interface WorkflowAttachment {
     genericDoc: null | GenericDoc;
 }
 
+export interface ExportGeneration {
+    id: string;
+    type: "export_generation";
+    exportAlias: string;
+    createdBy: User | null;
+    createdAt: DateTime | null;
+    status: StoredObjectStatus;
+    storedObject: StoredObject;
+}
+
 export interface PrivateCommentEmbeddable {
     comments: Record<number, string>;
 }

src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue

@@ -0,0 +1,141 @@
+<script setup lang="ts">
+import {
+    trans,
+    EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING,
+    EXPORT_GENERATION_TOO_MANY_RETRIES,
+    EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT,
+    EXPORT_GENERATION_EXPORT_READY,
+} from "translator";
+import { computed, onMounted, ref } from "vue";
+import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
+import { fetchExportGenerationStatus } from "ChillMainAssets/lib/api/export";
+import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
+import { ExportGeneration } from "ChillMainAssets/types";
+
+interface AppProps {
+    exportGenerationId: string;
+    title: string;
+    createdDate: string;
+}
+
+const props = defineProps<AppProps>();
+
+const exportGeneration = ref<ExportGeneration | null>(null);
+
+const status = computed<StoredObjectStatus>(
+    () => exportGeneration.value?.status ?? "pending",
+);
+const storedObject = computed<null | StoredObject>(() => {
+    if (exportGeneration.value === null) {
+        return null;
+    }
+
+    return exportGeneration.value?.storedObject;
+});
+
+const isPending = computed<boolean>(() => status.value === "pending");
+const isFetching = computed<boolean>(
+    () => tryiesForReady.value < maxTryiesForReady,
+);
+const isReady = computed<boolean>(() => status.value === "ready");
+const isFailure = computed<boolean>(() => status.value === "failure");
+const filename = computed<string>(() => `${props.title}-${props.createdDate}`);
+
+/**
+ * counter for the number of times that we check for a new status
+ */
+let tryiesForReady = ref<number>(0);
+
+/**
+ * how many times we may check for a new status, once loaded
+ */
+const maxTryiesForReady = 120;
+
+const checkForReady = function (): void {
+    if (
+        "ready" === status.value ||
+        "empty" === status.value ||
+        "failure" === status.value ||
+        // stop reloading if the page stays opened for a long time
+        tryiesForReady.value > maxTryiesForReady
+    ) {
+        return;
+    }
+
+    tryiesForReady.value = tryiesForReady.value + 1;
+    setTimeout(onObjectNewStatusCallback, 5000);
+};
+
+const onObjectNewStatusCallback = async function (): Promise<void> {
+    exportGeneration.value = await fetchExportGenerationStatus(
+        props.exportGenerationId,
+    );
+
+    if (isPending.value) {
+        checkForReady();
+        return Promise.resolve();
+    }
+
+    return Promise.resolve();
+};
+
+onMounted(() => {
+    onObjectNewStatusCallback();
+});
+</script>
+
+<template>
+    <div id="waiting-screen">
+        <div
+            v-if="isPending && isFetching"
+            class="alert alert-danger text-center"
+        >
+            <div>
+                <p>
+                    {{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
+                </p>
+            </div>
+
+            <div>
+                <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
+                <span class="sr-only">Loading...</span>
+            </div>
+        </div>
+        <div v-if="isPending && !isFetching" class="alert alert-info">
+            <div>
+                <p>
+                    {{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
+                </p>
+            </div>
+        </div>
+        <div v-if="isFailure" class="alert alert-danger text-center">
+            <div>
+                <p>
+                    {{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
+                </p>
+            </div>
+        </div>
+        <div v-if="isReady" class="alert alert-success text-center">
+            <div>
+                <p>
+                    {{ trans(EXPORT_GENERATION_EXPORT_READY) }}
+                </p>
+
+                <p v-if="storedObject !== null">
+                    <document-action-buttons-group
+                        :stored-object="storedObject"
+                        :filename="filename"
+                    ></document-action-buttons-group>
+                </p>
+            </div>
+        </div>
+    </div>
+</template>
+
+<style scoped lang="scss">
+#waiting-screen {
+    > .alert {
+        min-height: 350px;
+    }
+}
+</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/index.ts

@@ -0,0 +1,15 @@
+import { createApp } from "vue";
+import App from "./App.vue";
+
+const el = document.getElementById("app");
+
+if (null === el) {
+    console.error("div element app was not found");
+    throw new Error("div element app was not found");
+}
+
+const exportGenerationId = el?.dataset.exportGenerationId as string;
+const title = el?.dataset.exportTitle as string;
+const createdDate = el?.dataset.exportGenerationDate as string;
+
+createApp(App, { exportGenerationId, title, createdDate }).mount(el);

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue

@@ -1,10 +1,26 @@
 <template>
     <ul :class="listClasses" v-if="picked.length && displayPicked">
         <li v-for="p in picked" @click="removeEntity(p)" :key="p.type + p.id">
-            <span class="chill_denomination">{{ p.text }}</span>
+            <span
+                v-if="'me' === p"
+                class="chill_denomination current-user updatedBy"
+                >{{ trans(USER_CURRENT_USER) }}</span
+            >
+            <span v-else class="chill_denomination">{{ p.text }}</span>
         </li>
     </ul>
     <ul class="record_actions">
+        <li v-if="isCurrentUserPicker" class="btn btn-sm btn-misc">
+            <label class="flex items-center gap-2">
+                <input
+                    :checked="picked.indexOf('me') >= 0 ? true : null"
+                    ref="itsMeCheckbox"
+                    :type="multiple ? 'checkbox' : 'radio'"
+                    @change="selectItsMe"
+                />
+                {{ trans(USER_CURRENT_USER) }}
+            </label>
+        </li>
         <li class="add-persons">
             <add-persons
                 :options="addPersonsOptions"
@@ -24,119 +40,83 @@
     </ul>
 </template>
 
-<script>
-import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
+<script setup>
+import { ref, computed } from "vue";
+import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue"; // eslint-disable-line
 import { appMessages } from "./i18n";
+import { trans, USER_CURRENT_USER } from "translator";
 
-export default {
-    name: "PickEntity",
-    props: {
-        multiple: {
-            type: Boolean,
-            required: true,
-        },
-        types: {
-            type: Array,
-            required: true,
-        },
-        picked: {
-            required: true,
-        },
-        uniqid: {
-            type: String,
-            required: true,
-        },
-        removableIfSet: {
-            type: Boolean,
-            default: true,
-        },
-        displayPicked: {
-            // display picked entities.
-            type: Boolean,
-            default: true,
-        },
-        suggested: {
-            type: Array,
-            default: [],
-        },
-        label: {
-            type: String,
-            required: false,
-        },
-    },
-    emits: ["addNewEntity", "removeEntity", "addNewEntityProcessEnded"],
-    components: {
-        AddPersons,
-    },
-    data() {
-        return {
-            key: "",
-        };
-    },
-    computed: {
-        addPersonsOptions() {
-            return {
-                uniq: !this.multiple,
-                type: this.types,
-                priority: null,
-                button: {
-                    size: "btn-sm",
-                    class: "btn-submit",
-                },
-            };
-        },
-        translatedListOfTypes() {
-            if (this.label !== "") {
-                return this.label;
-            }
+const props = defineProps({
+    multiple: Boolean,
+    types: Array,
+    picked: Array,
+    uniqid: String,
+    removableIfSet: { type: Boolean, default: true },
+    displayPicked: { type: Boolean, default: true },
+    suggested: { type: Array, default: () => [] },
+    label: String,
+    isCurrentUserPicker: { type: Boolean, default: false },
+});
 
-            let trans = [];
-            this.types.forEach((t) => {
-                if (this.$props.multiple) {
-                    trans.push(appMessages.fr.pick_entity[t].toLowerCase());
-                } else {
-                    trans.push(
-                        appMessages.fr.pick_entity[t + "_one"].toLowerCase(),
-                    );
-                }
-            });
+const emit = defineEmits([
+    "addNewEntity",
+    "removeEntity",
+    "addNewEntityProcessEnded",
+]);
 
-            if (this.$props.multiple) {
-                return (
-                    appMessages.fr.pick_entity.modal_title + trans.join(", ")
-                );
-            } else {
-                return (
-                    appMessages.fr.pick_entity.modal_title_one +
-                    trans.join(", ")
-                );
-            }
-        },
-        listClasses() {
-            return {
-                "list-suggest": true,
-                "remove-items": this.$props.removableIfSet,
-            };
-        },
-    },
-    methods: {
-        addNewSuggested(entity) {
-            this.$emit("addNewEntity", { entity: entity });
-        },
-        addNewEntity({ selected, modal }) {
-            selected.forEach((item) => {
-                this.$emit("addNewEntity", { entity: item.result });
-            }, this);
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-            this.$emit("addNewEntityProcessEnded");
-        },
-        removeEntity(entity) {
-            if (!this.$props.removableIfSet) {
-                return;
-            }
-            this.$emit("removeEntity", { entity: entity });
-        },
-    },
+const itsMeCheckbox = ref(null);
+const addPersons = ref(null);
+
+const addPersonsOptions = computed(() => ({
+    uniq: !props.multiple,
+    type: props.types,
+    priority: null,
+    button: { size: "btn-sm", class: "btn-submit" },
+}));
+
+const translatedListOfTypes = computed(() => {
+    if (props.label) return props.label;
+    let trans = props.types.map((t) =>
+        props.multiple
+            ? appMessages.fr.pick_entity[t].toLowerCase()
+            : appMessages.fr.pick_entity[t + "_one"].toLowerCase(),
+    );
+    return props.multiple
+        ? appMessages.fr.pick_entity.modal_title + trans.join(", ")
+        : appMessages.fr.pick_entity.modal_title_one + trans.join(", ");
+});
+
+const listClasses = computed(() => ({
+    "list-suggest": true,
+    "remove-items": props.removableIfSet,
+}));
+
+const selectItsMe = (event) =>
+    event.target.checked ? addNewSuggested("me") : removeEntity("me");
+
+const addNewSuggested = (entity) => {
+    emit("addNewEntity", { entity });
+};
+
+const addNewEntity = ({ selected, modal }) => {
+    selected.forEach((item) => emit("addNewEntity", { entity: item.result }));
+    addPersons.value?.resetSearch();
+    modal.showModal = false;
+    emit("addNewEntityProcessEnded");
+};
+
+const removeEntity = (entity) => {
+    if (!props.removableIfSet) return;
+    if (entity === "me" && itsMeCheckbox.value) {
+        itsMeCheckbox.value.checked = false;
+    }
+    emit("removeEntity", { entity });
 };
 </script>
+
+<style lang="scss" scoped>
+.current-user {
+    color: var(--bs-body-color);
+    background-color: var(--bs-chill-l-gray) !important;
+}
+</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/App.vue

@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import GenerateButton from "ChillMainAssets/vuejs/SavedExportButtons/Component/GenerateButton.vue";
+
+interface SavedExportButtonsConfig {
+    savedExportUuid: string;
+    savedExportAlias: string;
+}
+
+const props = defineProps<SavedExportButtonsConfig>();
+</script>
+
+<template>
+    <generate-button
+        :saved-export-uuid="props.savedExportUuid"
+    ></generate-button>
+</template>
+
+<style scoped lang="scss"></style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/Component/GenerateButton.vue

@@ -0,0 +1,186 @@
+<script setup lang="ts">
+import {
+    trans,
+    SAVED_EXPORT_EXECUTE,
+    EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING_SHORT,
+    EXPORT_GENERATION_TOO_MANY_RETRIES,
+    EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT,
+    EXPORT_GENERATION_EXPORT_READY,
+} from "translator";
+import {
+    fetchExportGenerationStatus,
+    generateFromSavedExport,
+} from "ChillMainAssets/lib/api/export";
+import { computed, ref } from "vue";
+import { ExportGeneration } from "ChillMainAssets/types";
+import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
+import DownloadButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/DownloadButton.vue";
+import { useToast } from "vue-toast-notification";
+import "vue-toast-notification/dist/theme-sugar.css";
+
+interface SavedExportButtonGenerateConfig {
+    savedExportUuid: string;
+}
+
+const props = defineProps<SavedExportButtonGenerateConfig>();
+const emits = defineEmits<{
+    (e: "generate");
+}>();
+
+const toast = useToast();
+const exportGeneration = ref<ExportGeneration | null>(null);
+
+const status = computed<StoredObjectStatus | "inactive">(
+    () => exportGeneration.value?.status ?? "inactive",
+);
+const storedObject = computed<null | StoredObject>(() => {
+    if (exportGeneration.value === null) {
+        return null;
+    }
+
+    return exportGeneration.value?.storedObject;
+});
+
+const isInactive = computed<boolean>(() => status.value === "inactive");
+const isPending = computed<boolean>(() => status.value === "pending");
+const isFetching = computed<boolean>(
+    () => tryiesForReady.value < maxTryiesForReady,
+);
+const isReady = computed<boolean>(() => status.value === "ready");
+const isFailure = computed<boolean>(() => status.value === "failure");
+const filename = computed<string>(() => {
+    if (null === exportGeneration.value) {
+        return "";
+    }
+
+    return `${exportGeneration.value?.storedObject.title}-${exportGeneration.value?.createdAt?.datetime8601}`;
+});
+const externalDownloadLink = computed<string>(
+    () => `/fr/main/export-generation/${exportGeneration.value?.id}/wait`,
+);
+const classes = computed<Record<string, boolean>>(() => {
+    return {};
+});
+const buttonClasses = computed<Record<string, boolean>>(() => {
+    return { btn: true, "btn-outline-primary": true };
+});
+
+/**
+ * counter for the number of times that we check for a new status
+ */
+let tryiesForReady = ref<number>(0);
+
+/**
+ * how many times we may check for a new status, once loaded
+ */
+const maxTryiesForReady = 120;
+
+const checkForReady = function (): void {
+    if (
+        "ready" === status.value ||
+        "empty" === status.value ||
+        "failure" === status.value ||
+        // stop reloading if the page stays opened for a long time
+        tryiesForReady.value > maxTryiesForReady
+    ) {
+        return;
+    }
+
+    tryiesForReady.value = tryiesForReady.value + 1;
+    setTimeout(
+        onObjectNewStatusCallback,
+        tryiesForReady.value < 10 ? 1500 : 5000,
+    );
+};
+
+const onExportGenerationSuccess = function (): void {
+    toast.success(trans(EXPORT_GENERATION_EXPORT_READY));
+};
+
+const onObjectNewStatusCallback = async function (): Promise<void> {
+    if (null === exportGeneration.value) {
+        checkForReady();
+        return Promise.resolve();
+    }
+
+    const newExportGeneration = await fetchExportGenerationStatus(
+        exportGeneration.value?.id,
+    );
+
+    if (newExportGeneration.status !== exportGeneration.value.status) {
+        if (newExportGeneration.status === "ready") {
+            onExportGenerationSuccess();
+        }
+    }
+
+    exportGeneration.value = newExportGeneration;
+
+    if (isPending.value) {
+        checkForReady();
+        return Promise.resolve();
+    }
+
+    return Promise.resolve();
+};
+
+const onClickGenerate = async (): Promise<void> => {
+    emits("generate");
+    exportGeneration.value = await generateFromSavedExport(
+        props.savedExportUuid,
+    );
+
+    onObjectNewStatusCallback();
+
+    return Promise.resolve();
+};
+</script>
+
+<template>
+    <button
+        v-if="isInactive"
+        :class="buttonClasses"
+        type="button"
+        @click="onClickGenerate"
+    >
+        <i class="fa fa-cog"></i> {{ trans(SAVED_EXPORT_EXECUTE) }}
+    </button>
+    <template v-if="isPending && isFetching">
+        <span class="btn">
+            <i class="fa fa-cog fa-spin fa-fw"></i>
+            <span class="pending-message">{{
+                trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING_SHORT)
+            }}</span>
+            <a :href="externalDownloadLink" class="externalDownloadLink">
+                <i class="bi bi-box-arrow-up-right"></i>
+            </a>
+        </span>
+    </template>
+    <div v-if="isPending && !isFetching" :class="buttonClasses">
+        <span>{{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}</span>
+    </div>
+    <download-button
+        v-else-if="isReady && storedObject?.currentVersion !== null"
+        :classes="buttonClasses"
+        :stored-object="storedObject"
+        :at-version="storedObject?.currentVersion"
+        :filename="filename"
+    ></download-button>
+    <div v-else-if="isFailure" :class="classes">
+        <span class="btn">
+            <i class="bi bi-exclamation-triangle"></i>
+            <span class="pending-message">{{
+                trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT)
+            }}</span>
+        </span>
+    </div>
+</template>
+
+<style scoped lang="scss">
+.pending-message {
+    font-style: italic;
+}
+
+.externalDownloadLink {
+    margin-left: 1rem;
+}
+</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/index.ts

@@ -0,0 +1,13 @@
+import { createApp } from "vue";
+
+import App from "./App.vue";
+
+const buttons = document.querySelectorAll<HTMLDivElement>(
+    "[data-generate-export-button]",
+);
+
+buttons.forEach((button) => {
+    const savedExportUuid = button.dataset.savedExportUuid as string;
+
+    createApp(App, { savedExportUuid, savedExportAlias: "" }).mount(button);
+});

src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.html.twig

@@ -446,11 +446,31 @@ Toutes les classes btn-* de bootstrap sont fonctionnelles
 </div>
 
 <div class="row">
-    <h1>Badges</h1>
+    <h1>Entity badges</h1>
 
     <span class="badge-accompanying-work-type-simple">Action d'accompagnement</span>
     <span class="badge-activity-type-simple">Type d'échange</span>
     <span class="badge-calendar-simple">Rendez-vous</span>
 </div>
 
+
+    <h1>Badges</h1>
+
+    <p>
+        <span class="badge bg-primary">Primary</span>
+        <span class="badge bg-secondary">Secondary</span>
+        <span class="badge bg-success">Success</span>
+        <span class="badge bg-danger">Danger</span>
+        <span class="badge bg-warning">Warning</span>
+        <span class="badge bg-info">Info</span>
+        <span class="badge bg-light">Light</span>
+        <span class="badge bg-dark">Dark</span>
+        <span class="badge bg-chill-blue">chill-blue</span>
+        <span class="badge bg-chill-green">chill-green</span>
+        <span class="badge bg-chill-yellow">chill-yellow</span>
+        <span class="badge bg-chill-orange">chill-orange</span>
+        <span class="badge bg-chill-red">chill-red</span>
+        <span class="badge bg-chill-beige">chill-beige</span>
+    </p>
+
 {% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Export/_navbar.html.twig

@@ -1,12 +1,14 @@
 <ul class="nav nav-pills justify-content-center">
-    <li class="nav-item">
-        <a href="{{ chill_path_forward_return_path('chill_main_export_index') }}" class="nav-link {% if current == 'common' %}active{% endif %}">
-            {{ 'Exports list'|trans }}
-        </a>
-    </li>
+    {% if is_granted('CHILL_MAIN_COMPOSE_EXPORT') %}
+        <li class="nav-item">
+            <a href="{{ chill_path_forward_return_path('chill_main_export_index') }}" class="nav-link {% if current == 'common' %}active{% endif %}">
+                {{ 'Exports list'|trans }}
+            </a>
+        </li>
+    {% endif %}
     <li class="nav-item">
         <a href="{{ chill_path_forward_return_path('chill_main_export_saved_list_my') }}" class="nav-link {% if current == 'my' %}active{% endif %}">
-            {{ 'saved_export.My saved exports'|trans }}
+            {{ 'saved_export.Saved exports'|trans }}
         </a>
     </li>
-</ul>
+</ul>

src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig

@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  <info@champs-libres.coop> / <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,49 @@
 
 {% block title %}{{ 'Exports list'|trans }}{% endblock %}
 
+{% block css %}
+    {{ parent() }}
+    <style lang="css">
+        .export-title {
+            margin-top: 2rem;
+            margin-bottom: 1rem;
+        }
+    </style>
+{% endblock %}
+
+{% macro render_export_card(export, export_alias, generations) %}
+    <div class="col">
+        <div class="card h-100">
+            <div class="card-body">
+                <h2 class="card-title">{{ export.title|trans }}</h2>
+                <p class="card-text my-3">{{ export.description|trans }}</p>
+            </div>
+            {% if generations|length > 0 %}
+                <ul class="list-group list-group-flush">
+                    {% for generation in generations %}
+                        <li class="list-group-item">
+                            <a href="{{ chill_path_add_return_path('chill_main_export-generation_wait', {'id': generation.id}) }}">{{ generation.createdAt|format_datetime('short', 'short') }}</a>
+                            {% if generation.status == 'pending' %}
+                                &nbsp;<span class="badge bg-info">{{ 'export.generation.Export generation is pending_short'|trans }}</span>
+                            {% elseif generation.status == 'failure' %}
+                                &nbsp;<span class="badge bg-warning">{{ 'export.generation.Error_short'|trans }}</span>
+                            {% endif %}
+                        </li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
+            <div class="card-footer">
+                <ul class="record_actions slim">
+                    <li>
+                        <a class="btn btn-submit" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
+                            {{ 'Create an export'|trans }}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+{% endmacro %}
 
 {% block content %}
 
@@ -28,45 +71,23 @@
     <div class="col-md-10 exports-list">
 
         <div class="container mt-4">
-            
+
             {% for group, exports in grouped_exports %}{%  if group != '_' %}
-                <h2 class="display-6">{{ group|trans }}</h2>
-                <div class="row flex-bloc">
+                <h1 class="display-6 export-title">{{ group|trans }}</h1>
+                <div class="row row-cols-1 row-cols-md-3 g-2">
                     {% for export_alias, export in exports %}
-                    <div class="item-bloc">
-                        <div class="item-row card-body">
-                            <h2 class="card-title">{{ export.title|trans }}</h2>
-                            <p class="card-text my-3">{{ export.description|trans }}</p>
-                            <p>
-                                <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
-                                    {{ 'Create an export'|trans }}
-                                </a>
-                            </p>
-                        </div>
-                    </div>
+                        {{ _self.render_export_card(export, export_alias, last_executions[export_alias]) }}
                     {% endfor %}
                 </div>
             {% endif %}{% endfor %}
-            
+
             {% if grouped_exports|keys|length > 1 and grouped_exports['_']|length > 0 %}
-                <h2 class="display-6">{{ 'Ungrouped exports'|trans }}</h2>
+                <h2 class="display-6 export-title">{{ 'Ungrouped exports'|trans }}</h2>
             {% endif %}
-            
-            <div class="row flex-bloc">
+
+            <div class="row row-cols-1 row-cols-md-3 g-2">
             {% for export_alias,export in grouped_exports['_'] %}
-    
-                <div class="item-bloc">
-                    <div class="item-row card-body">
-                        <h2 class="card-title">{{ export.title|trans }}</h2>
-                        <p class="card-text my-3">{{ export.description|trans }}</p>
-                        <p>
-                            <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
-                                {{ 'Create an export'|trans }}
-                            </a>
-                        </p>
-                    </div>
-                </div>
-                
+                {{ _self.render_export_card(export, export_alias, last_executions[export_alias]) }}
             {% endfor %}
             </div>
         </div>

src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig

@@ -40,15 +40,15 @@
 
             <h3 class="m-3">{{ 'Center'|trans }}</h3>
 
-            {{ form_widget(form.centers.center) }}
+            {{ form_widget(form.centers.centers) }}
 
             <div class="mb-3 mt-3">
                 <input id="toggle-check-all" class="btn btn-misc" type= "button" onclick='uncheckAll(this)' value="{{ 'uncheck all centers'|trans|e('html_attr') }}"/>
             </div>
 
-            {% if form.centers.regroupment is defined %}
+            {% if form.centers.regroupments is defined %}
                 <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
-                {{ form_widget(form.centers.regroupment) }}
+                {{ form_widget(form.centers.regroupments) }}
             {% endif %}
         </section>
 

src/Bundle/ChillMainBundle/Resources/views/ExportGeneration/wait.html.twig

@@ -0,0 +1,61 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('page_download_exports') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('page_download_exports') }}
+{% endblock %}
+
+ {% block title exportGeneration.linkedToSavedExport ? exportGeneration.savedExport.title : ('Download export'|trans) %}
+
+{% block content %}
+    <h1>{{ block('title') }}</h1>
+    <div id="app"
+         data-export-generation-id="{{ exportGeneration.id | escape('html_attr') }}"
+         data-export-generation-date="{{ exportGeneration.createdAt.format('Ymd-His') }}"
+         data-export-title="{{ export.title|trans }}"
+    ></div>
+
+    <ul class="sticky-form-buttons record_actions">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_export_saved_list_my') }}" class="btn btn-cancel">
+                {{ 'export.generation.Come back later'|trans|chill_return_path_label }}
+            </a>
+        </li>
+        {% if not exportGeneration.linkedToSavedExport %}
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_main_export_saved_create_from_export_generation', {'id': exportGeneration.id}) }}" class="btn btn-save">
+                    {{ 'Save'|trans }}
+                </a>
+            </li>
+        {% else %}
+            {% if exportGeneration.configurationDifferentFromSavedExport %}
+                <li>
+                    <div class="dropdown">
+                        <button class="btn btn-save dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">{{ 'Save'|trans }}</button>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li class="dropdown-item">
+                                <a href="{{ chill_path_add_return_path('chill_main_export_saved_create_from_export_generation', {'id': exportGeneration.id, 'title': exportGeneration.savedExport.title ~ ' (' ~ 'saved_export.Duplicated'|trans ~ ' ' ~ null|format_datetime('short', 'medium') ~ ')'}) }}" class="btn">
+                                    <i class="bi bi-copy"></i> {{ 'saved_export.Save to new saved export'|trans }}
+                                </a>
+                            </li>
+                            {% if is_granted('CHILL_MAIN_EXPORT_SAVED_EDIT', exportGeneration.savedExport) %}
+                                <li class="dropdown-item">
+                                    <form method="POST" action="{{ path('chill_main_export_saved_options_edit', {'savedExport': exportGeneration.savedExport.id, 'exportGeneration': exportGeneration.id }) }}">
+                                        <button type="submit" class="btn">
+                                            <i class="bi bi-floppy"></i> {{ 'saved_export.Update current saved export'|trans }}
+                                        </button>
+                                    </form>
+                                </li>
+                            {% endif %}
+                        </ul>
+                    </div>
+                </li>
+            {% endif %}
+        {% endif %}
+    </ul>
+{% endblock content %}

src/Bundle/ChillMainBundle/Resources/views/SavedExport/edit.html.twig

@@ -2,6 +2,16 @@
 
 {% block title %}{{ 'saved_export.Edit'|trans }}{% endblock %}
 
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
 {% block content %}
 <div class="col-10">
     <h1>{{ block('title') }}</h1>
@@ -10,9 +20,13 @@
     {{ form_row(form.title) }}
     {{ form_row(form.description) }}
 
+    {% if form.share is defined %}
+        {{ form_row(form.share) }}
+    {% endif %}
+
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">{{ 'Cancel'|trans }}</a>
+            <a href="{{ chill_return_path_or('chill_main_export_saved_list_my') }}" class="btn btn-cancel">{{ 'Cancel'|trans }}</a>
         </li>
         <li>
             <button type="submit" class="btn btn-save">{{ 'Save'|trans }}</button>
@@ -20,4 +34,4 @@
     </ul>
     {{ form_end(form) }}
 </div>
-{% endblock %}
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig

@@ -1,6 +1,88 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
-{% block title %}{{ 'saved_export.My saved exports'|trans }}{% endblock %}
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_saved_export_button') }}
+    <style lang="css">
+        .export-title {
+            margin-top: 2rem;
+            margin-bottom: 1rem;
+        }
+    </style>
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_saved_export_button') }}
+{% endblock %}
+
+{% block title %}{{ 'saved_export.Saved exports'|trans }}{% endblock %}
+
+
+{% macro render_export_card(saved, export, export_alias, generations) %}
+    <div class="col">
+        <div class="card h-100">
+            <div class="card-header">
+                {{ export.title|trans }}
+            </div>
+            <div class="card-body">
+                <h2 class="card-title">{{ saved.title }}</h2>
+                {% if app.user is same as saved.user %}
+                    <p class="card-text tags">
+                        {% if app.user is same as saved.user %}<span class="badge bg-primary">{{ 'saved_export.Owner'|trans }}</span>{% endif %}
+                        {% if saved.isShared() %}<span class="badge bg-info">{{  'saved_export.Shared with others'|trans }}</span>{% endif %}
+                    </p>
+                {% else %}
+                    <p class="card-text tags">
+                        Partagé par <span class="badge-user">{{ saved.user|chill_entity_render_box }}</span>
+                    </p>
+                {% endif %}
+                <p class="card-text my-3">{{ saved.description|chill_markdown_to_html }}</p>
+            </div>
+            {% if generations|length > 0 %}
+                <ul class="list-group list-group-flush">
+                    {% for generation in generations %}
+                        <li class="list-group-item">
+                            <a href="{{ chill_path_add_return_path('chill_main_export-generation_wait', {'id': generation.id}) }}">{{ generation.createdAt|format_datetime('short', 'short') }}</a>
+                            {% if generation.status == 'pending' %}
+                                &nbsp;<span class="badge bg-info">{{ 'export.generation.Export generation is pending_short'|trans }}</span>
+                            {% elseif generation.status == 'failure' %}
+                                &nbsp;<span class="badge bg-warning">{{ 'export.generation.Error_short'|trans }}</span>
+                            {% endif %}
+                        </li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
+            <div class="card-footer">
+                <ul class="record_actions slim">
+                    <li>
+                        <div class="" data-generate-export-button data-saved-export-uuid="{{ saved.id|escape('html_attr') }}"></div>
+                    </li>
+                    <li>
+                        <div class="dropdown">
+                            <button class="btn btn-outline-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                {{ 'Actions'|trans }}
+                            </button>
+                            <ul class="dropdown-menu">
+                                {% if is_granted('CHILL_MAIN_EXPORT_SAVED_EDIT', saved) %}
+                                    <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': saved.id }) }}" class="dropdown-item"><i class="fa fa-pencil"></i> {{ 'saved_export.update_title_and_description'|trans }}</a></li>
+                                {% endif %}
+                                {# reminder: the controller already checked that the user can generate saved exports #}
+                                <li><a href="{{ chill_path_add_return_path('chill_main_export_new', {'alias': saved.exportAlias,'from_saved': saved.id }) }}" class="dropdown-item"><i class="fa fa-pencil"></i> {{ 'saved_export.update_filters_aggregators_and_execute'|trans }}</a></li>
+                                {% if is_granted('CHILL_MAIN_EXPORT_SAVED_DUPLICATE', saved) %}
+                                    <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_duplicate', {'id': saved.id}) }}" class="dropdown-item"><i class="fa fa-copy"></i> {{ 'saved_export.Duplicate'|trans }}</a></li>
+                                {% endif %}
+                                {% if is_granted('CHILL_MAIN_EXPORT_SAVED_DELETE', saved) %}
+                                    <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': saved.id }) }}" class="dropdown-item"><i class="fa fa-trash"></i> {{ 'Delete'|trans }}</a></li>
+                                {% endif %}
+                            </ul>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+{% endmacro %}
 
 {% block content %}
     <div class="col-md-10 exports-list">
@@ -8,6 +90,7 @@
         {{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'my'}) }}
 
         <div class="container mt-4">
+            {{ filter|chill_render_filter_order_helper }}
 
             {% if total == 0 %}
                 <p class="chill-no-data-statement" >{{ 'saved_export.Any saved export'|trans }}</p>
@@ -15,71 +98,23 @@
 
             {% for group, saveds in grouped_exports %}
                 {% if group != '_' %}
-                    <h2 class="display-6">{{ group }}</h2>
-                    <div class="row flex-bloc">
+                    <h1 class="display-6 export-title">{{ group }}</h1>
+                    <div class="row row-cols-1 row-cols-md-3 g-2">
                         {% for s in saveds %}
-                            <div class="item-bloc">
-                                <div class="item-row card-body">
-                                    <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
-                                    <h2 class="card-title">{{ s.saved.title }}</h2>
-
-                                    <div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div>
-
-                                    <div class="card-text my-3">
-                                        {{ s.saved.description|chill_markdown_to_html }}
-                                    </div>
-
-                                    <div>
-                                        <ul class="record_actions">
-                                            <li>
-                                                <div class="dropdown">
-                                                    <button class="btn btn-outline-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                                        {{ 'Actions'|trans }}
-                                                    </button>
-                                                    <ul class="dropdown-menu">
-                                                        <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="dropdown-item"><i class="fa fa-pencil"></i> {{ 'saved_export.update_title_and_description'|trans }}</a></li>
-                                                        <li><a href="{{ chill_path_add_return_path('chill_main_export_new', {'alias': s.saved.exportAlias,'from_saved': s.saved.id }) }}" class="dropdown-item"><i class="fa fa-pencil"></i> {{ 'saved_export.update_filters_aggregators_and_execute'|trans }}</a></li>
-                                                        <li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="dropdown-item"><i class="fa fa-cog"></i> {{ 'saved_export.execute'|trans }}</a></li>
-                                                        <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="dropdown-item"><i class="fa fa-trash"></i> {{ 'Delete'|trans }}</a></li>
-                                                    </ul>
-                                                </div>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
+                            {{ _self.render_export_card(s.saved, s.export, s.saved.exportAlias, last_executions[s.saved.id.toString()]) }}
                         {% endfor %}
                     </div>
                 {% endif %}
             {% endfor %}
 
             {% if grouped_exports|keys|length > 1 and grouped_exports['_']|default([])|length > 0 %}
-                <h2 class="display-6">{{ 'Ungrouped exports'|trans }}</h2>
+                <h2 class="display-6 export-title">{{ 'Ungrouped exports'|trans }}</h2>
             {% endif %}
 
             <div class="row flex-bloc">
                 {% for saveds in grouped_exports['_']|default([]) %}
                     {% for s in saveds %}
-                        <div class="item-bloc">
-                            <div class="item-row card-body">
-                                <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
-                                <h2 class="card-title">{{ s.saved.title }}</h2>
-
-                                <div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div>
-
-                                <div class="card-text my-3">
-                                    {{ s.saved.description|chill_markdown_to_html }}
-                                </div>
-
-                                <div>
-                                    <ul class="record_actions">
-                                        <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li>
-                                        <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li>
-                                        <li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
+                        {{ _self.render_export_card(s.saved, s.export, s.saved.exportAlias, last_executions[s.saved.id.toString()]) }}
                     {% endfor %}
                 {% endfor %}
             </div>

src/Bundle/ChillMainBundle/Resources/views/SavedExport/new.html.twig

@@ -2,14 +2,35 @@
 
 {% block title %}{{ 'saved_export.New'|trans }}{% endblock %}
 
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
 {% block content %}
 <div class="col-10">
     <h1>{{ block('title') }}</h1>
 
     {{ form_start(form) }}
     {{ form_row(form.title) }}
+
+    {% if showWarningAutoGeneratedDescription|default(false) %}
+        <div class="alert alert-info" role="alert">
+            {{ 'saved_export.Alert auto generated description'|trans }}
+        </div>
+    {% endif %}
+
     {{ form_row(form.description) }}
 
+    {% if form.share is defined %}
+        {{ form_row(form.share) }}
+    {% endif %}
+
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">{{ 'Cancel'|trans }}</a>
@@ -20,4 +41,4 @@
     </ul>
     {{ form_end(form) }}
 </div>
-{% endblock %}
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig

@@ -10,19 +10,19 @@
 
                 {% for flashMessage in app.session.flashbag.get('success') %}
                     <div class="col-8 alert alert-success flash_message">
-                        <span>{{ flashMessage|raw }}</span>
+                        <span>{{ flashMessage|trans }}</span>
                     </div>
                 {% endfor %}
 
                 {% for flashMessage in app.session.flashbag.get('error') %}
                     <div class="col-8 alert alert-danger flash_message">
-                        <span>{{ flashMessage|raw }}</span>
+                        <span>{{ flashMessage|trans }}</span>
                     </div>
                 {% endfor %}
 
                 {% for flashMessage in app.session.flashbag.get('notice') %}
                     <div class="col-8 alert alert-warning flash_message">
-                        <span>{{ flashMessage|raw }}</span>
+                        <span>{{ flashMessage|trans }}</span>
                     </div>
                 {% endfor %}