@dative-gpi/foundation-core-components 1.1.23 → 1.1.24-unit-formatter

package/components/lists/dataCategories/FSBaseDataCategoriesList.vue

@@ -41,18 +41,17 @@
         <template
           #item.tile="{ index, item }"
         >
-          <FSCard
+          <FSClickable
             :key="index"
             padding="12px"
             height="60px"
             width="233px"
-            :variant="isSelected(item.id) ? CardVariants.Standard : CardVariants.Background"
-            :color="ColorEnum.Primary"
+            :color="isSelected(item.id) ? ColorEnum.Primary : ColorEnum.Dark"
             @click="$emit('update:modelValue', [item.id])"
             v-bind="$attrs"
           >
             <template
-              #default="{ contentVariant }"
+              #default
             >
               <FSRow
                 align="center-center"
@@ -67,11 +66,11 @@
                 <FSIcon
                   :color="item.correlated ? ColorEnum.Primary : ColorEnum.Light"
                   :icon="item.correlated ? 'mdi-link' : 'mdi-link-off'"
-                  :variant="contentVariant"
+                  variant="dark"
                 />
               </FSRow>
             </template>
-          </FSCard>
+          </FSClickable>
         </template>
       </FSDataTable>
     </FSFadeOut>
@@ -82,7 +81,7 @@
 import { defineComponent, type PropType, ref, watch } from "vue";
 import _ from "lodash";
 
-import {CardVariants, ColorEnum} from "@dative-gpi/foundation-shared-components/models";
+import {ColorEnum} from "@dative-gpi/foundation-shared-components/models";
 
 import { useDataCategories } from "@dative-gpi/foundation-core-services/composables";
 import type { DataCategoryFilters } from "@dative-gpi/foundation-core-domain/models";
@@ -90,10 +89,10 @@ import type { DataCategoryFilters } from "@dative-gpi/foundation-core-domain/mod
 import FSDataTable from "../FSDataTable.vue";
 import FSCol from "@dative-gpi/foundation-shared-components/components/FSCol.vue";
 import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
-import FSCard from "@dative-gpi/foundation-shared-components/components/FSCard.vue";
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
 import FSSpan from "@dative-gpi/foundation-shared-components/components/FSSpan.vue";
 import FSFadeOut from "@dative-gpi/foundation-shared-components/components/FSFadeOut.vue";
+import FSClickable from "@dative-gpi/foundation-shared-components/components/FSClickable.vue";
 import FSSearchField from "@dative-gpi/foundation-shared-components/components/fields/FSSearchField.vue";
 import FSButtonCheckbox from "@dative-gpi/foundation-shared-components/components/buttons/FSButtonCheckbox.vue";
 
@@ -103,7 +102,7 @@ export default defineComponent({
     FSDataTable,
     FSCol,
     FSFadeOut,
-    FSCard,
+    FSClickable,
     FSRow,
     FSSpan,
     FSSearchField,
@@ -147,7 +146,6 @@ export default defineComponent({
     return {
       fetchingDataCategories,
       dataCategories,
-      CardVariants,
       ColorEnum,
       search,
       correlated,

package/components/lists/dataDefinitions/FSBaseDataDefinitionsList.vue

@@ -28,18 +28,17 @@
     <template
       #item.tile="{ index, item }"
     >
-      <FSCard
+      <FSClickable
         :key="index"
         padding="12px"
         height="60px"
         width="233px"
-        :color="ColorEnum.Primary"
-        :variant="isSelected(item.id) ? CardVariants.Standard : CardVariants.Background"
+        :color="isSelected(item.id) ? ColorEnum.Primary : ColorEnum.Light"
         @click="$emit('update:modelValue', [item.id])"
         v-bind="$attrs"
       >
         <template
-          #default="{ contentVariant }"
+          #default
         >
           <FSRow
             align="center-center"
@@ -55,12 +54,11 @@
             <v-spacer/>
             <FSIcon
               :color="ColorEnum.Primary"
-              :variant="contentVariant"
               icon="mdi-link"
             />
           </FSRow>
         </template>
-      </FSCard>
+      </FSClickable>
     </template>
   </FSDataTable>
 </template>
@@ -69,7 +67,7 @@
 import { defineComponent, type PropType, watch } from "vue";
 import _ from "lodash";
 
-import { CardVariants, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+import {ColorEnum} from "@dative-gpi/foundation-shared-components/models";
 
 import { useDataDefinitions } from "@dative-gpi/foundation-core-services/composables";
 import type { DataDefinitionFilters } from "@dative-gpi/foundation-core-domain/models";
@@ -78,7 +76,7 @@ import FSDataTable from "../FSDataTable.vue";
 import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
 import FSSpan from "@dative-gpi/foundation-shared-components/components/FSSpan.vue";
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
-import FSCard from "@dative-gpi/foundation-shared-components/components/FSCard.vue";
+import FSClickable from "@dative-gpi/foundation-shared-components/components/FSClickable.vue";
 import FSButtonCheckbox from "@dative-gpi/foundation-shared-components/components/buttons/FSButtonCheckbox.vue";
 
 export default defineComponent({
@@ -86,7 +84,7 @@ export default defineComponent({
   components: {
     FSButtonCheckbox,
     FSDataTable,
-    FSCard,
+    FSClickable,
     FSSpan,
     FSIcon,
     FSRow,
@@ -125,7 +123,6 @@ export default defineComponent({
     return {
       fetchingDataDefinitions,
       dataDefinitions,
-      CardVariants,
       ColorEnum,
       isSelected
     };

package/components/lists/deviceOrganisations/FSBaseDeviceOrganisationsList.vue

@@ -115,29 +115,6 @@
         {{ item.ownerAddress ? item.ownerAddress.formattedAddress : '' }}
       </FSSpan>
     </template>
-    <template
-      #item.subgroupings="{ item }"
-    >
-      <FSSubgroupingsChipGroup
-        :subgroupings="item.subgroupings"
-      />
-    </template>
-    <template
-      #filter.subgroupings-custom="{ filter, toggle, variant }"
-    >
-      <FSSubgroupingChip
-        v-if="filter.value && subgroupingMap[filter.value]"
-        width="100%"
-        :groupingLabel="subgroupingMap[filter.value].groupingLabel"
-        :groupingIcon="subgroupingMap[filter.value].groupingIcon"
-        :groupingColor="subgroupingMap[filter.value].groupingColor"
-        :label="subgroupingMap[filter.value].label"
-        :icon="subgroupingMap[filter.value].icon"
-        :color="'primary'"
-        :variant="variant"
-        @click="toggle()"
-      />
-    </template>
     <template
       #item.actions="{ item }"
     >
@@ -211,19 +188,15 @@ import FSDeviceOrganisationTileUI from "@dative-gpi/foundation-shared-components
 import FSStatusesCarousel from "@dative-gpi/foundation-shared-components/components/deviceOrganisations/FSStatusesCarousel.vue";
 import FSConnectivity from "@dative-gpi/foundation-shared-components/components/deviceOrganisations/FSConnectivity.vue";
 import FSWorstAlert from "@dative-gpi/foundation-shared-components/components/deviceOrganisations/FSWorstAlert.vue";
-import FSSubgroupingChip from "@dative-gpi/foundation-shared-components/components/FSSubgroupingChip.vue";
 import FSIconCheck from "@dative-gpi/foundation-shared-components/components/FSIconCheck.vue";
 import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
 import FSImage from "@dative-gpi/foundation-shared-components/components/FSImage.vue";
 import FSSpan from '@dative-gpi/foundation-shared-components/components/FSSpan.vue';
-import FSSubgroupingsChipGroup from "../subgroupings/FSSubgroupingsChipGroup.vue";
 
 export default defineComponent({
   name: "FSBaseDeviceOrganisationsList",
   components: {
     FSDeviceOrganisationTileUI,
-    FSSubgroupingsChipGroup,
-    FSSubgroupingChip,
     FSStatusesCarousel,
     FSConnectivity,
     FSWorstAlert,
@@ -288,33 +261,7 @@ export default defineComponent({
       return entities.value;
     });
 
-    const subgroupingFilters = computed(() => {
-      const filters: { value: string | null, text: string }[] = [{
-        value: null,
-        text: "—"
-      }];
-      
-      const uniqueSubgroupings = _.uniqBy(
-        entities.value.flatMap(device => device.subgroupings),
-        'id'
-      );
-      
-      filters.push(...uniqueSubgroupings.map(subgrouping => ({
-        value: subgrouping.id,
-        text: `${subgrouping.groupingLabel} - ${subgrouping.label}`
-      })));
-      
-      return filters.sort((a, b) => a.text.localeCompare(b.text));
-    });
-
-    const subgroupingMap = computed(() => {
-      return _.chain(entities.value)
-        .flatMap(device => device.subgroupings)
-        .keyBy('id')
-        .value();
-    });
-
-    const headersOptions = computed((): Record<string, any> => ({
+    const headersOptions = computed(() => ({
       status: {
         fixedFilters: [{
           value: true,
@@ -392,17 +339,6 @@ export default defineComponent({
         },
         sort: (a: DeviceOrganisationAlert, b: DeviceOrganisationAlert) => alphanumericSort(a?.criticity, b?.criticity)
       },
-      subgroupings: {
-
-        fixedFilters: subgroupingFilters.value,
-        methodFilterRaw: (value: string | null, item: DeviceOrganisationInfos) => {
-          if (!value) {
-            return item.subgroupings.length === 0;
-          }
-          return item.subgroupings.some(s => s.id === value);
-        },
-        sort: (a: any[], b: any[]) => a.length - b.length
-      },
       ...customProperties.value.reduce((acc, cp) => ({
         ...acc,
         [`meta.${cp.code}`]: {
@@ -446,7 +382,6 @@ export default defineComponent({
       deviceOrganisations,
       ConnectivityStatus,
       customProperties,
-      subgroupingMap,
       headersOptions,
       isSelected
     };

package/components/lists/folders/FSBaseFoldersList.vue

@@ -58,6 +58,8 @@ import { defineComponent, type PropType, watch } from "vue";
 
 import { useFolders } from "@dative-gpi/foundation-core-services/composables";
 
+import { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
+import { FoldersListType } from "@dative-gpi/foundation-core-components/utils";
 import type { FolderFilters, DashboardInfos } from "@dative-gpi/foundation-core-domain/models";
 
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
@@ -117,7 +119,9 @@ export default defineComponent({
       fetchingFolders,
       folders,
       onSelect,
-      isSelected
+      isSelected,
+      FoldersListType,
+      DashboardType
     };
   }
 });

package/components/lists/groupings/FSBaseGroupingsList.vue

@@ -2,10 +2,12 @@
   <FSDataTable
     defaultMode="iterator"
     :loading="fetchingGroupings"
-    :singleSelect="$props.singleSelect"
-    :selectable="$props.selectable"
     :items="groupings"
     :itemTo="$props.itemTo"
+    :selectable="$props.selectable"
+    :showSearch="$props.showSearch"
+    :singleSelect="$props.singleSelect"
+    :disableTable="$props.disableTable"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
@@ -72,7 +74,7 @@ export default defineComponent({
       type: Function as PropType<(item: GroupingInfos) => Partial<RouteLocation>>,
       required: false
     },
-    groupingFilters: {
+    groupingsFilters: {
       type: Object as PropType<GroupingFilters>,
       required: false,
       default: null
@@ -92,6 +94,16 @@ export default defineComponent({
       required: false,
       default: () => []
     },
+    showSearch: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    disableTable: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
   },
   emits: ["update:modelValue"],
   setup(props) {
@@ -101,9 +113,9 @@ export default defineComponent({
       return props.modelValue.includes(id);
     };
 
-    watch(() => props.groupingFilters, (next, previous) => {
+    watch(() => props.groupingsFilters, (next, previous) => {
       if ((!next && !previous) || !_.isEqual(next, previous)) {
-        fetchGroupings(props.groupingFilters);
+        fetchGroupings(props.groupingsFilters);
       }
     }, { immediate: true });
 

package/components/lists/groups/FSSimpleGroupsList.vue

@@ -26,7 +26,6 @@ export default defineComponent({
       default: () => ({})
     }
   },
-  innheritAttrs: false,
   setup(props){
     const { entities: groups, getMany, fetching } = useGroups();
 

package/components/lists/locations/FSBaseLocationsList.vue

@@ -31,14 +31,14 @@
     >
       <FSLocationTileUI
         :key="index"
-        v-bind="item"
         :bottomColor="item.colors"
+        :address="item.address.placeLabel"
         :selectable="$props.selectable"
-        :singleSelect="$props.singleSelect"
+        :singleSelect="singleSelect"
         :modelValue="isSelected(item.id)"
         :to="$props.itemTo && $props.itemTo(item)"
         @update:modelValue="toggleSelect(item)"
-        :address="item.address.formattedAddress"
+        v-bind="item"
       />
     </template>
   </FSDataTable>

package/components/lists/userOrganisations/FSBaseUserOrganisationsList.vue

@@ -50,13 +50,6 @@
         :value="item.allowSms"
       />
     </template>
-    <template
-      #item.allowNotifications="{ item }"
-    >
-      <FSIconCheck
-        :value="item.allowNotifications"
-      />
-    </template>
     <template
       #item.tags="{ item }"
     >
@@ -84,15 +77,6 @@
         {{ userTypeLabel(item.userType) }}
       </FSSpan>
     </template>
-    <template
-      #item.lastActivity="{ item }"
-    >
-      <FSSpan
-        font="text-overline"
-      >
-        {{ epochToLongTimeFormat(item.lastActivity) }}
-      </FSSpan>
-    </template>
     <template
       #item.tile="{ index, item, toggleSelect }"
     >
@@ -113,8 +97,6 @@ import { defineComponent, type PropType, watch } from "vue";
 import { type RouteLocation } from "vue-router";
 import _ from "lodash";
 
-import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
-
 import type { UserOrganisationFilters, UserOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
 import { userTypeLabel, userValidityLabel } from "@dative-gpi/foundation-core-components/utils";
 import { useUserOrganisations } from "@dative-gpi/foundation-core-services/composables";
@@ -167,7 +149,6 @@ export default defineComponent({
   emits: ["update:modelValue"],
   setup(props) {
     const { getMany: fetchUserOrganisations, entities: userOrganisations, fetching: fetchingUserOrganisations } = useUserOrganisations();
-    const { epochToLongTimeFormat } = useDateFormat();
 
     const isSelected = (id: string): boolean => {
       return props.modelValue.includes(id);
@@ -184,8 +165,7 @@ export default defineComponent({
       userOrganisations,
       userValidityLabel,
       userTypeLabel,
-      isSelected,
-      epochToLongTimeFormat,
+      isSelected
     };
   }
 });

package/components/lists/userOrganisations/{FSUserOrganisationsChipGroup.vue → FSChipUserOrganisationsList.vue}

@@ -12,7 +12,7 @@
   <FSChipGroup
     v-else
     :color="ColorEnum.Light"
-    :items="userOrganisations?.map(u => u.name)"
+    :labels="userOrganisations?.map(u => u.name)"
     v-bind="$attrs"
   />
 </template>
@@ -28,7 +28,7 @@ import FSLoader from "@dative-gpi/foundation-shared-components/components/FSLoad
 import FSChipGroup from "@dative-gpi/foundation-shared-components/components/FSChipGroup.vue";
   
 export default defineComponent({
-  name: "FSUserOrganisationsChipGroup",
+  name: "FSChipUserOrganisationsList",
   components: {
     FSChipGroup,
     FSLoader,

package/components/tiles/FSLocationTile.vue

@@ -11,7 +11,7 @@
     :label="entity.label"
     :code="entity.code"
     :color="entity.color"
-    :address="entity.address.formattedAddress"
+    :address="entity.address.placeLabel"
     :deviceCount="entity.deviceOrganisationsCount"
     :selectable="$props.selectable"
     :modelValue="modelValue"
@@ -51,7 +51,6 @@ export default defineComponent({
     }
   },
   emits: ['update:modelValue'],
-  inheritAttrs: false,
   setup(props) {
     const { get, getting, entity } = useLocation();
 

package/package.json

@@ -4,7 +4,7 @@
     "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
   },
   "sideEffects": false,
-  "version": "1.1.23",
+  "version": "1.1.24-unit-formatter",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,21 +13,21 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.1.23",
-    "@dative-gpi/foundation-core-services": "1.1.23",
-    "@dative-gpi/foundation-shared-components": "1.1.23",
-    "@dative-gpi/foundation-shared-domain": "1.1.23",
-    "@dative-gpi/foundation-shared-services": "1.1.23"
+    "@dative-gpi/foundation-core-domain": "1.1.24-unit-formatter",
+    "@dative-gpi/foundation-core-services": "1.1.24-unit-formatter",
+    "@dative-gpi/foundation-shared-components": "1.1.24-unit-formatter",
+    "@dative-gpi/foundation-shared-domain": "1.1.24-unit-formatter",
+    "@dative-gpi/foundation-shared-services": "1.1.24-unit-formatter"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
     "color": "^4.2.3",
-    "vue": "^3.5.26"
+    "vue": "^3.4.38"
   },
   "devDependencies": {
     "@types/color": "3.0.6",
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "b89c8c5be537d450306310fa9dbec12a4477eed6"
+  "gitHead": "ac04fd5da2ebd73bfb31ff6ffc4f5ff54a872e9e"
 }

package/utils/dashboards.ts

@@ -1,14 +1,15 @@
+import type { DashboardOrganisationInfos, DashboardOrganisationTypeInfos, DashboardShallowInfos, FolderInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { DashboardExplorerElementType, DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
+import { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
 
 const { $tr } = useTranslationsProvider();
 
 export const dashboardTypeLabel = (type: DashboardType): string => {
   switch (type) {
     case DashboardType.None:             return $tr("ui.common.none", "None");
-    case DashboardType.Organisation:     return $tr("ui.common.custom", "Custom");
-    case DashboardType.Shallow:          return $tr('ui.dashboard-type.shallow', 'Shallow copy');
+    case DashboardType.Organisation:     return $tr('ui.dashboard-type.shallow', 'Shallow copy');
+    case DashboardType.Shallow:          return $tr("ui.common.custom", "Custom");
     case DashboardType.OrganisationType: return $tr("ui.common.shared", "Shared");
   }
 };
@@ -22,12 +23,29 @@ export const dashboardTypeColor = (type: DashboardType): ColorBase => {
   }
 };
 
-export const dashboardExplorerElementTypeLabel = (type: DashboardExplorerElementType): string => {
-  switch (type) {
-    case DashboardExplorerElementType.Folder:                    return $tr("ui.common.folder", "Folder");
-    case DashboardExplorerElementType.DashboardOrganisation:     return $tr("ui.common.custom", "Custom");
-    case DashboardExplorerElementType.DashboardShallow:          return $tr("ui.dashboard-type.shallow", "Shallow copy");
-    case DashboardExplorerElementType.DashboardOrganisationType: return $tr("ui.common.shared", "Shared");
-    default:                                                     return $tr("ui.common.none", "None");
-  }
-};
+export interface DashboardShallowListItem extends DashboardShallowInfos {
+  dashboardType: DashboardType.Shallow
+  type: FoldersListType.Dashboard
+}
+
+export interface DashboardOrganisationListItem extends DashboardOrganisationInfos {
+  dashboardType: DashboardType.Organisation
+  type: FoldersListType.Dashboard
+}
+
+export interface OrganisationTypeDashboardListItem extends DashboardOrganisationTypeInfos {
+  dashboardType: DashboardType.OrganisationType
+}
+
+export interface FolderListItem extends FolderInfos {
+  dashboardType: DashboardType.None
+  type: FoldersListType.Folder
+}
+
+export enum FoldersListType {
+  Dashboard = "dashboard",
+  Folder = "folder"
+}
+
+export type DashboardsListItem = DashboardShallowListItem | DashboardOrganisationListItem | OrganisationTypeDashboardListItem;
+export type FoldersListItem = DashboardShallowListItem | DashboardOrganisationListItem | FolderListItem;

package/utils/tables.ts

@@ -1,35 +1,29 @@
 
-export const DASHBOARDS_EXPLORER_MAIN = "ui.tables.dashboard-explorer-element.main";
-export const DASHBOARDS_ORGANISATION_TYPE_MAIN = "ui.tables.dashboard-organisation-type.main";
-
-export const DEVICES_EXPLORER_MAIN = "ui.tables.device-explorer-element.main";
+export const DASHBOARDS_EXPLORER_MAIN = "ui.tables.folder-mock.explorer-main";
+export const DASHBOARDS_EXPLORER_SHARED = "ui.tables.dashboard-mock.explorer-shared";
+export const DEVICES_EXPLORER_MAIN = "ui.tables.group-mock.explorer-main";
 
 export const DEVICES_LIST_MAIN = "ui.tables.device.main";
 export const DEVICES_MAINTENANCE = "ui.tables.device.maintenance";
 export const LOCATIONS_LIST_MAIN = "ui.tables.location.main";
 
-export const CHARTS_LIST_ORGANISATION = "ui.tables.chart.organisation";
+export const CHARTS_LIST_MAIN = "ui.tables.chart.main";
 export const CHARTS_LIST_SHARED = "ui.tables.chart.shared";
 
 export const SCENARIOS_LIST_MAIN = "ui.tables.scenario.main";
-export const SCENARIOS_LIST_ORGANISATION = "ui.tables.scenario.organisation";
 export const SCENARIOS_LIST_SHARED = "ui.tables.scenario.shared";
 export const CONNECTIVITY_SCENARIOS_LIST_MAIN = "ui.tables.connectivity-scenario.main";
 
 export const ALERTS_LIST_MAIN = "ui.tables.alert.main";
 export const CONNECTIVITY_ALERTS_LIST_MAIN = "ui.tables.connectivity-alert.main";
 
-export const GROUPINGS_LIST_MAIN = "ui.tables.grouping.main";
-
-export const CHARTS_LIST_SELECT = "ui.tables.chart.select";
-export const DATA_CATEGORIES_SELECT = "ui.tables.data-category.select";
 export const DEVICES_SELECT = "ui.tables.device.select";
 export const GROUPS_SELECT = "ui.tables.group.select";
 export const LOCATIONS_SELECT = "ui.tables.location.select";
 export const MODELS_SELECT = "ui.tables.model.select";
-export const DASHBOARDS_SELECT = "ui.tables.dashboard-explorer-element.select";
-export const GROUPINGS_SELECT = "ui.tables.grouping.select";
-export const SUBGROUPINGS_SELECT = "ui.tables.subgrouping.select";
+export const DASHBOARDS_SELECT = "ui.tables.dashboard-mock.select";
+
+export const WIDGET_DASHBOARDS_EXPLORER = "ui.tables.folder-mock.widget";
 
 export const LOCATION_DEVICES = "ui.tables.device.location-devices";
 export const DEVICE_ALERTS = "ui.tables.alert.device-alerts";

package/utils/users.ts

@@ -29,4 +29,4 @@ export const userValidityLabel = (validity: UserValidityState): string => {
     case UserValidityState.AccountValidated:  return $tr("ui.user-validity.account-validated", "Validated");
     default:                                  return "";
   }
-}
+}