Feat/add insee multiselect and licence groups

CHANGELOG.md

@@ -2,8 +2,23 @@
 
 ## Current (in progress)
 
+- Move Pagination to datagouv-components [#365](https://github.com/etalab/udata-front/pull/365)
+- Fix release CI [#380](https://github.com/etalab/udata-front/pull/380)
+- Add stories to Resource component [#364](https://github.com/etalab/udata-front/pull/364)
+- Move Well to datagouv-components [#382](https://github.com/etalab/udata-front/pull/382)
+- Add markdown editor [#351](https://github.com/etalab/udata-front/pull/351)
 - Add codes and optgroups in Multiselect to display Insee codes and Licence groups [#347] (https://github.com/etalab/udata-front/pull/347)
 
+## 3.5.4 (2024-03-20)
+
+- Fix footer links and some translations [#366](https://github.com/etalab/udata-front/pull/366)
+- Show error when dataset discussion from url doesn't exist [#367](https://github.com/etalab/udata-front/pull/367)
+- Hide quality score on "work in progress" backends [#370](https://github.com/etalab/udata-front/pull/370)
+- Add a new vite config for development [#372](https://github.com/etalab/udata-front/pull/372)
+- Fix structure tab not shown [#369](https://github.com/etalab/udata-front/pull/369)
+- Update sentry configuration to ignore aborted requests [#368](https://github.com/etalab/udata-front/pull/368)
+- Fix CI not using udata release when needed [#363](https://github.com/etalab/udata-front/pull/363)
+
 ## 3.5.3 (2024-02-22)
 
 - Show a map of datasets' spatial coverage [#354](https://github.com/etalab/udata-front/pull/354)

udata_front/theme/gouvfr/assets/js/components/MultiSelect/MultiSelect.vue

@@ -296,7 +296,6 @@ export default defineComponent({
        * @type {Promise<import("axios").AxiosResponse<Array<Data> | {data: Array<Data> }>>}
        */
       const request = api.get(props.listUrl)
-      console.log(request)
       return request
       .then(resp => {
         let data = resp.data;

udata_front/theme/gouvfr/assets/js/pages/PublishingForm/Step2DescribeDataset.vue

@@ -293,8 +293,8 @@
                     :placeholder="$t('Spatial granularity')"
                     :searchPlaceholder="$t('Search a granularity...')"
                     :initialOptions="granularities"
-                    :values="dataset.spatial.granularity"
-                    @change="(value) => dataset.spatial.granularity = value"
+                    :values="dataset.spatial?.granularity"
+                    @change="(value: string) => dataset.spatial ? dataset.spatial.granularity = value : dataset.spatial = {granularity: value}"
                     :hasWarning="fieldHasWarning('spatial_information')"
                     :allOption="$t('Select an option')"
                     :addAllOption="false"
@@ -318,6 +318,7 @@
 export type Step2DescribeDatasetProps = {
   originalDataset: NewDataset,
   steps: Array<string>,
+  granularities: Array<SpatialGranularity>
 };
 </script>
 <script setup lang="ts">
@@ -339,145 +340,89 @@ import { license_groups_options, quality_description_length, title } from "../..
 import { useI18n } from 'vue-i18n';
 import { getLicensesUrl } from '../../api/licenses';
 import { getFrequenciesUrl } from '../../api/datasets';
-import { NewDataset, PublishingFormAccordionState } from '../../types';
+import { NewDataset, PublishingFormAccordionState, SpatialGranularity } from '../../types';
 
-export default defineComponent({
-  components: { Accordion, AccordionGroup, Container, InputGroup, LinkedToAccordion, MultiSelect, Stepper, Well, Sidemenu },
-  emits: ["next"],
-  props: {
-    originalDataset: {
-      /** @type {import("vue").PropType<import("../../types").NewDataset>} */
-      type: Object,
-      required: true
-    },
-    steps: {
-      type: Array,
-      required: true,
-    },
-    granularities: {
-      /** @type {import("vue").PropType<Array<import("../../types").SpatialGranularity>>} */
-      type: Array,
-      required: true
-    }
-  },
-  tags: { required: tagsRequired },
-  temporal_coverage: { required: temporalCoverageRequired },
-  title: { required },
-};
+const emit = defineEmits(["next"]);
+const props = defineProps<Step2DescribeDatasetProps>();
 
-const { getErrorText, getFunctionalState, getWarningText, hasError, hasWarning, validateRequiredRules, v$, vWarning$ } = useFunctionalState(dataset, requiredRules, warningRules);
+const { t } = useI18n();
+const { id: nameDatasetAccordionId } = useUid("accordion");
+const { id: addAcronymAccordionId } = useUid("accordion");
+const { id: writeAGoodDescriptionAccordionId } = useUid("accordion");
+const { id: useTagsAccordionId } = useUid("accordion");
+const { id: selectLicenseAccordionId } = useUid("accordion");
+const { id: chooseFrequencyAccordionId } = useUid("accordion");
+const { id: addTemporalCoverageAccordionId } = useUid("accordion");
+const { id: addSpatialInformationAccordionId } = useUid("accordion");
 
-    const frequenciesUrl = getFrequenciesUrl();
-    const licensesUrl = getLicensesUrl();
-    const licensesGroups = license_groups_options?.map(([name, values]) => ({
-      name,
-      values
-    }));
-    const formatSpatialZones = (data) => {
-      const suggestions = data.map(item => {
-      const matchingGranularity = props.granularities.find(granularity => granularity.id === item.level);
-      if (matchingGranularity) {
-        return {
-          ...item,
-          description: matchingGranularity.name,
-        };
-      } else {
-        return {
-          ...item,
-        };
-      }
-    });
-    return suggestions;
-    }
-
-    const notUnknown = not(t("The value must be different than unknown."), sameAs("unknown"));
-    const tagsRequired = requiredWithCustomMessage(t("Adding tags helps improve the SEO of your data."));
-    const temporalCoverageRequired = requiredWithCustomMessage(t("You did not provide the temporal coverage."));
-    const spatialGranularityRequired = requiredWithCustomMessage(t("You have not specified the spatial granularity."));
+const dataset = reactive({...props.originalDataset});
+if(!dataset.spatial) {
+  dataset.spatial = {
+    zones: undefined,
+    granularity: undefined,
+  }
+}
 
-    const requiredRules = {
-      description: { required },
-      frequency: { required },
-      title: { required },
+const frequenciesUrl = getFrequenciesUrl();
+const licensesUrl = getLicensesUrl();
+const licensesGroups = license_groups_options?.map(([name, values]) => ({
+  name,
+  values
+}));
+const formatSpatialZones = (data) => {
+  const suggestions = data.map(item => {
+  const matchingGranularity = props.granularities.find(granularity => granularity.id === item.level);
+  if (matchingGranularity) {
+    return {
+      ...item,
+      description: matchingGranularity.name,
     };
-
-    const warningRules = {
-      acronym: {},
-      description: {required, minLengthValue: minLengthWarning(quality_description_length), },
-      frequency: { required, notUnknown },
-      license: { required },
-      spatial: {
-        granularity: { required: spatialGranularityRequired },
-      },
-      tags: { required: tagsRequired },
-      temporal_coverage: { required: temporalCoverageRequired },
-      title: { required },
+  } else {
+    return {
+      ...item,
     };
+  }
+});
+return suggestions;
+}
 
-    const { getErrorText, getFunctionalState, getWarningText, hasError, hasWarning, validateRequiredRules, v$, vWarning$ } = useFunctionalState(dataset, requiredRules, warningRules);
-
-    /**
-     * @type {import("vue").ComputedRef<Record<string, import("../../types").PublishingFormAccordionState>>}
-     */
-    const state = computed(() => {
-      return {
-        acronym: vWarning$.value.acronym.$dirty ? "info" : "disabled",
-        title: getFunctionalState(vWarning$.value.title.$dirty, v$.value.title.$invalid, vWarning$.value.title.$error),
-        description: getFunctionalState(vWarning$.value.description.$dirty, v$.value.description.$invalid, vWarning$.value.description.$error),
-        tags: getFunctionalState(vWarning$.value.tags.$dirty, false, vWarning$.value.tags.$error),
-        license: getFunctionalState(vWarning$.value.license.$dirty, false, vWarning$.value.license.$error),
-        frequency: getFunctionalState(vWarning$.value.frequency.$dirty, v$.value.frequency.$invalid, vWarning$.value.frequency.$error),
-        temporal_coverage: getFunctionalState(vWarning$.value.temporal_coverage.$dirty, false, vWarning$.value.temporal_coverage.$error),
-        spatial_information: getFunctionalState(vWarning$.value.spatial.granularity.$dirty, false, vWarning$.value.spatial.granularity.$error),
-      };
-    });
+const notUnknown = not(t("The value must be different than unknown."), sameAs("unknown"));
+const tagsRequired = requiredWithCustomMessage(t("Adding tags helps improve the SEO of your data."));
+const temporalCoverageRequired = requiredWithCustomMessage(t("You did not provide the temporal coverage."));
+const spatialGranularityRequired = requiredWithCustomMessage(t("You have not specified the spatial granularity."));
 
-    /**
-     *
-     * @param {string} field
-     */
-    const fieldHasError = (field) => hasError(state, field);
+const requiredRules = {
+  description: { required },
+  frequency: { required },
+  title: { required },
+};
 
-    /**
-     *
-     * @param {string} field
-     */
-    const fieldHasWarning = (field) => hasWarning(state, field);
+const warningRules = {
+  acronym: {},
+  description: {required, minLengthValue: minLengthWarning(parseInt(quality_description_length ?? "0"))},
+  frequency: { required, notUnknown },
+  license: { required },
+  spatial: {
+    granularity: { required: spatialGranularityRequired },
+  },
+  tags: { required: tagsRequired },
+  temporal_coverage: { required: temporalCoverageRequired },
+  title: { required },
+};
 
-    const submit = () => {
-      validateRequiredRules().then(valid => {
-        if(valid) {
-          emit("next", dataset);
-        }
-      });
-    };
+const { getErrorText, getFunctionalState, getWarningText, hasError, hasWarning, validateRequiredRules, v$, vWarning$ } = useFunctionalState(dataset, requiredRules, warningRules);
 
-    return {
-      addAcronymAccordionId,
-      nameDatasetAccordionId,
-      writeAGoodDescriptionAccordionId,
-      useTagsAccordionId,
-      selectLicenseAccordionId,
-      chooseFrequencyAccordionId,
-      addTemporalCoverageAccordionId,
-      addSpatialInformationAccordionId,
-      dataset,
-      editIcon,
-      frequenciesUrl,
-      licensesUrl,
-      licensesGroups,
-      state,
-      fieldHasError,
-      fieldHasWarning,
-      formatSpatialZones,
-      getErrorText,
-      getWarningText,
-      submit,
-      title,
-      v$,
-      vWarning$,
-    };
-  },
+const state = computed<Record<string, PublishingFormAccordionState>>(() => {
+  return {
+    acronym: vWarning$.value.acronym.$dirty ? "info" : "disabled",
+    title: getFunctionalState(vWarning$.value.title.$dirty, v$.value.title.$invalid, vWarning$.value.title.$error),
+    description: getFunctionalState(vWarning$.value.description.$dirty, v$.value.description.$invalid, vWarning$.value.description.$error),
+    tags: getFunctionalState(vWarning$.value.tags.$dirty, false, vWarning$.value.tags.$error),
+    license: getFunctionalState(vWarning$.value.license.$dirty, false, vWarning$.value.license.$error),
+    frequency: getFunctionalState(vWarning$.value.frequency.$dirty, v$.value.frequency.$invalid, vWarning$.value.frequency.$error),
+    temporal_coverage: getFunctionalState(vWarning$.value.temporal_coverage.$dirty, false, vWarning$.value.temporal_coverage.$error),
+    spatial_information: getFunctionalState(vWarning$.value.spatial.granularity.$dirty, false, vWarning$.value.spatial.granularity.$error),
+  };
 });
 
 const fieldHasError = (field: string) => hasError(state, field);