@gisce/react-ooui 1.5.2-alpha.1 → 1.5.2-rc.0

package/src/types/index.ts

@@ -76,7 +76,7 @@ type SearchResponse = {
 };
 
 type SearchRequest = {
-  params: any[];
+  params: Array<any>;
   limit?: number;
   offset?: number;
   model: string;
@@ -84,7 +84,6 @@ type SearchRequest = {
   context?: any;
   attrs?: any;
   order?: number | string | null;
-  fieldsToRetrieve?: string[];
 };
 
 type SearchAllIdsRequest = SearchCountRequest & {
@@ -92,7 +91,7 @@ type SearchAllIdsRequest = SearchCountRequest & {
 };
 
 type SearchCountRequest = {
-  params: any[];
+  params: Array<any>;
   model: string;
   context?: any;
 };
@@ -252,102 +251,52 @@ type ExportDataOptions = {
 };
 
 type ConnectionProviderType = {
-  getActionStringForModel: (
-    model: string,
-    requestConfig?: any,
-  ) => Promise<string>;
-  getViewsForAction: (
-    {
-      action,
-      context,
-    }: {
-      action: string;
-      context?: any;
-    },
-    requestConfig?: any,
-  ) => Promise<ViewData>;
+  getActionStringForModel: (model: string) => Promise<string>;
+  getViewsForAction: ({
+    action,
+    context,
+  }: {
+    action: string;
+    context?: any;
+  }) => Promise<ViewData>;
   getView: (
-    options: GetViewRequest,
-    requestConfig?: any,
+    options: GetViewRequest
   ) => Promise<FormView | TreeView | GraphView>;
-  getFields: (options: GetFieldsRequest, requestConfig?: any) => Promise<any>;
-  searchAllIds: (
-    options: SearchAllIdsRequest,
-    requestConfig?: any,
-  ) => Promise<number[]>;
-  searchCount: (
-    options: SearchCountRequest,
-    requestConfig?: any,
-  ) => Promise<number>;
+  getFields: (options: GetFieldsRequest) => Promise<any>;
+  searchAllIds: (options: SearchAllIdsRequest) => Promise<number[]>;
+  searchCount: (options: SearchCountRequest) => Promise<number>;
   search: (options: SearchRequest) => Promise<any[]>;
-  searchForTree: (
-    options: SearchRequest,
-    requestConfig?: any,
-  ) => Promise<SearchResponse>;
-  update: (options: UpdateObjectRequest, requestConfig?: any) => Promise<any>;
-  create: (options: CreateObjectRequest, requestConfig?: any) => Promise<any>;
-  deleteObjects: (
-    options: DeleteObjectsRequest,
-    requestConfig?: any,
-  ) => Promise<any>;
-  execute: (options: ExecuteRequest, requestConfig?: any) => Promise<any>;
-  readObjects: (
-    options: ReadObjectsRequest,
-    requestConfig?: any,
-  ) => Promise<any>;
-  readEvalUiObjects: (
-    options: ReadEvalUiObjectsRequest,
-    requestConfig?: any,
-  ) => Promise<any>;
-  parseCondition: (
-    options: ParseConditionRequest,
-    requestConfig?: any,
-  ) => Promise<any>;
-  executeWorkflow: (
-    options: ExecuteRequest,
-    requestConfig?: any,
-  ) => Promise<any>;
-  createReport: (
-    options: CreateReportRequest,
-    requestConfig?: any,
-  ) => Promise<any>;
-  getReport: (options: GetReportRequest, requestConfig?: any) => Promise<any>;
-  executeOnChange: (
-    options: ExecuteOnChangeRequest,
-    requestConfig?: any,
-  ) => Promise<any>;
-  defaultGet: (options: DefaultGetRequest, requestConfig?: any) => Promise<any>;
-  getActionData: (
-    {
-      action,
-      context,
-    }: {
-      action: string;
-      context?: any;
-    },
-    requestConfig?: any,
-  ) => Promise<any>;
-  nameSearch: (options: NameSearchRequest, requestConfig?: any) => Promise<any>;
-  duplicate: (options: DuplicateRequest, requestConfig?: any) => Promise<any>;
-  evalDomain: (options: EvalDomainRequest, requestConfig?: any) => Promise<any>;
-  getLogInfo: (options: GetLogInfoRequest, requestConfig?: any) => Promise<any>;
+  searchForTree: (options: SearchRequest) => Promise<SearchResponse>;
+  update: (options: UpdateObjectRequest) => Promise<any>;
+  create: (options: CreateObjectRequest) => Promise<any>;
+  delete: (options: DeleteObjectsRequest) => Promise<any>;
+  execute: (options: ExecuteRequest) => Promise<any>;
+  readObjects: (options: ReadObjectsRequest) => Promise<any>;
+  readEvalUiObjects: (options: ReadEvalUiObjectsRequest) => Promise<any>;
+  parseCondition: (options: ParseConditionRequest) => Promise<any>;
+  executeWorkflow: (options: ExecuteRequest) => Promise<any>;
+  createReport: (options: CreateReportRequest) => Promise<any>;
+  getReport: (options: GetReportRequest) => Promise<any>;
+  executeOnChange: (options: ExecuteOnChangeRequest) => Promise<any>;
+  defaultGet: (options: DefaultGetRequest) => Promise<any>;
+  getActionData: ({
+    action,
+    context,
+  }: {
+    action: string;
+    context?: any;
+  }) => Promise<any>;
+  nameSearch: (options: NameSearchRequest) => Promise<any>;
+  duplicate: (options: DuplicateRequest) => Promise<any>;
+  evalDomain: (options: EvalDomainRequest) => Promise<any>;
+  getLogInfo: (options: GetLogInfoRequest) => Promise<any>;
   isShortcutFavorite: (
-    options: IsShortcutFavoriteOptions,
-    requestConfig?: any,
+    options: IsShortcutFavoriteOptions
   ) => Promise<number | boolean>;
-  removeFavourite: (
-    { shortcut_id }: { shortcut_id: number },
-    requestConfig?: any,
-  ) => Promise<void>;
-  addFavourite: (
-    options: IsShortcutFavoriteOptions,
-    requestConfig?: any,
-  ) => Promise<void>;
-  treeButOpen: (
-    options: TreeButOpenOptions,
-    requestConfig?: any,
-  ) => Promise<any>;
-  exportData: (options: ExportDataOptions, requestConfig?: any) => Promise<any>;
+  removeFavourite: ({ shortcut_id }: { shortcut_id: number }) => Promise<void>;
+  addFavourite: (options: IsShortcutFavoriteOptions) => Promise<void>;
+  treeButOpen: (options: TreeButOpenOptions) => Promise<any>;
+  exportData: (options: ExportDataOptions) => Promise<any>;
 };
 
 type ViewType = "tree" | "form" | "dashboard" | "graph" | "calendar";

package/src/ui/FavouriteButton.tsx

@@ -7,7 +7,8 @@ import {
   FormOutlined,
   EditOutlined,
 } from "@ant-design/icons";
-import { Button, Col, Row, Spin, Tooltip, theme, Menu, Dropdown } from "antd";
+import { Button, Col, Row, Spin, Tooltip, theme } from "antd";
+import { Menu, Dropdown } from "antd";
 import showErrorDialog from "@/ui/ActionErrorDialog";
 import {
   TabManagerContext,
@@ -60,7 +61,7 @@ const FavouriteButton = (props: Props) => {
   const { token } = useToken();
 
   const tabManagerContext = useContext(
-    TabManagerContext,
+    TabManagerContext
   ) as TabManagerContextType;
   const {
     openShortcut,

package/src/views/ActionView.tsx

@@ -82,9 +82,8 @@ function ActionView(props: Props, ref: any) {
     ? (res_id as number)
     : undefined;
 
-  const [currentId, setCurrentIdInternal] = useState<number | undefined>(
-    res_id_parsed,
-  );
+  const [currentId, setCurrentIdInternal] =
+    useState<number | undefined>(res_id_parsed);
   const [selectedRowItems, setSelectedRowItems] = useState<any[]>([]);
   const [currentItemIndex, setCurrentItemIndex] = useState<number>();
   const [results, setResults] = useState<any>([]);
@@ -96,13 +95,13 @@ function ActionView(props: Props, ref: any) {
     useState<boolean>(false);
   const [searchTreeNameSearch, setSearchTreeNameSearch] = useState<string>();
 
-  const { t } = (useContext(LocaleContext) as LocaleContextType) || {};
+  const { t } = useContext(LocaleContext) as LocaleContextType;
 
   const formRef = useRef();
   const searchTreeRef = useRef();
 
   const tabManagerContext = useContext(
-    TabManagerContext,
+    TabManagerContext
   ) as TabManagerContextType;
   const {
     setCurrentView: setCurrentViewTabContext,
@@ -119,7 +118,7 @@ function ActionView(props: Props, ref: any) {
       event.preventDefault();
       handleGoToRecordShortcut();
     },
-    [activeKey, tabs, currentView, currentItemIndex, results],
+    [activeKey, tabs, currentView, currentItemIndex, results]
   );
 
   function setCurrentId(id?: number) {
@@ -171,7 +170,7 @@ function ActionView(props: Props, ref: any) {
 
       const [, viewType] = view.viewTuple;
 
-      const viewInfo = view.info;
+      let viewInfo = view.info;
 
       switch (viewType) {
         case "dashboard": {
@@ -229,16 +228,16 @@ function ActionView(props: Props, ref: any) {
           break;
       }
     }
-    let currentViewToAssign;
+    let currentViewToAssign = undefined;
 
     if (!initialView && viewDataRetrieved.find((v) => v.type === "tree")) {
       const treeView: TreeView = viewDataRetrieved.find(
-        (v) => v.type === "tree",
+        (v) => v.type === "tree"
       ) as TreeView;
       currentViewToAssign = treeView;
     } else if (!initialView) {
       const formView: TreeView = viewDataRetrieved.find(
-        (v) => v.type === "form",
+        (v) => v.type === "form"
       ) as TreeView;
       currentViewToAssign = formView;
     } else {
@@ -254,7 +253,7 @@ function ActionView(props: Props, ref: any) {
 
     if (!currentViewToAssign) {
       showErrorDialog(
-        `Error determining the first view to show for model ${model}.\nPlease, make sure the view ids on the fields_view_get responses are the same as the ones defined in the action`,
+        `Error determining the first view to show for model ${model}.\nPlease, make sure the view ids on the fields_view_get responses are the same as the ones defined in the action`
       );
       onRemoveTab?.(tabKey);
     }
@@ -458,7 +457,7 @@ function ActionView(props: Props, ref: any) {
     } else {
       setCurrentId(undefined);
       const formView: FormView = availableViews.find(
-        (v) => v.type === "form",
+        (v) => v.type === "form"
       ) as FormView;
       setCurrentView(formView);
     }

package/src/views/RootView.tsx

@@ -10,7 +10,8 @@ import Welcome from "./Welcome";
 import TabManagerProvider from "@/context/TabManagerContext";
 import ActionView from "./ActionView";
 import { parseContext } from "@gisce/ooui";
-import LocaleContextProvider, { tForLang } from "@/context/LocaleContext";
+import LocaleContextProvider from "@/context/LocaleContext";
+import { tForLang } from "@/context/LocaleContext";
 import { ShortcutApi } from "@/ui/FavouriteButton";
 import showErrorDialog from "@/ui/ActionErrorDialog";
 import { InitialViewData, ViewType } from "@/types";
@@ -153,7 +154,7 @@ function RootView(props: RootViewProps, ref: any) {
 
     if (initialViewType) {
       const [id, type] = finalViews.find(
-        ([_, type]) => type === initialViewType,
+        ([_, type]) => type === initialViewType
       );
       initialView = { id, type };
     } else {
@@ -244,7 +245,7 @@ function RootView(props: RootViewProps, ref: any) {
 
     const parsedDomain = domain
       ? await ConnectionProvider.getHandler().evalDomain({
-          domain,
+          domain: domain,
           values: transformPlainMany2Ones({
             fields,
             values: { ...values, ...globalValues },
@@ -402,7 +403,7 @@ function RootView(props: RootViewProps, ref: any) {
     domain: any;
     context: any;
     model: string;
-    views: any[];
+    views: Array<any>;
     title: string;
     target: string;
     initialView: InitialViewData;
@@ -483,7 +484,7 @@ function RootView(props: RootViewProps, ref: any) {
         activeKey={activeKey}
         onRemoveTab={async (key: string) => {
           const canWeCloseFn = tabViewsCloseFunctions.current.get(
-            key as string,
+            key as string
           );
           const canWeClose = await canWeCloseFn?.();
 

package/src/widgets/base/Binary.tsx

@@ -2,6 +2,7 @@ import React, { useRef, useContext } from "react";
 import { Row, Col, Button, Input, Space, theme } from "antd";
 import Field from "@/common/Field";
 import { Binary as BinaryOoui } from "@gisce/ooui";
+const { useToken } = theme;
 import ButtonWithTooltip from "@/common/ButtonWithTooltip";
 import {
   FolderOpenOutlined,
@@ -18,7 +19,6 @@ import {
   openBase64InNewTab,
   toBase64,
 } from "@/helpers/filesHelper";
-const { useToken } = theme;
 
 type Props = {
   ooui: BinaryOoui;
@@ -68,7 +68,7 @@ export const BinaryInput = (props: BinaryInputProps) => {
     const name = getFieldValue("name");
 
     downloadLink.href = linkSource;
-    downloadLink.download = fileName || name;
+    downloadLink.download = fileName || name;
     downloadLink.click();
   }
 

package/src/widgets/base/Boolean.tsx

@@ -1,9 +1,10 @@
 import React from "react";
-import { Checkbox as AntCheckbox, theme } from "antd";
+import { Checkbox as AntCheckbox } from "antd";
 import styled from "styled-components";
 
 import Field from "@/common/Field";
 import { WidgetProps } from "@/types";
+import { theme } from "antd";
 
 const { defaultAlgorithm, defaultSeed } = theme;
 

package/src/widgets/base/Float.tsx

@@ -3,9 +3,9 @@ import { InputNumber, theme } from "antd";
 import Field from "@/common/Field";
 import { Float as FloatOoui } from "@gisce/ooui";
 import { WidgetProps } from "@/types";
+const { useToken } = theme;
 
 import { FormContext, FormContextType } from "@/context/FormContext";
-const { useToken } = theme;
 
 export const Float = (props: WidgetProps) => {
   const { ooui } = props;

package/src/widgets/base/Integer.tsx

@@ -33,10 +33,10 @@ export const Integer = (props: IntegerProps) => {
           }
 
           if (typeof value === "string" && !isNaN(parseFloat(value))) {
-            const truncatedValue = Math.trunc(parseFloat(value));
+            let truncatedValue = Math.trunc(parseFloat(value));
             return `${truncatedValue}`.replace(/[^0-9\-]+/g, "");
           } else if (typeof value === "number") {
-            const truncatedValue = Math.trunc(value);
+            let truncatedValue = Math.trunc(value);
             return `${truncatedValue}`.replace(/[^0-9\-]+/g, "");
           }
 

package/src/widgets/base/Label.tsx

@@ -22,10 +22,10 @@ const Label = (props: Props) => {
   const { ooui, align, responsiveBehaviour } = props;
   const { label, tooltip, fieldForLabel, labelSize, labelType } =
     ooui as LabelOoui;
-  const addColon = fieldForLabel !== null;
+  const addColon = fieldForLabel !== null ? true : false;
   const labelText = addColon && label.length > 1 ? label + " :" : label;
   const responsiveAlign = responsiveBehaviour ? "left" : "right";
-  const labelAlgin = align || (fieldForLabel ? responsiveAlign : "left");
+  const labelAlgin = align ? align : fieldForLabel ? responsiveAlign : "left";
   const { token } = useToken();
 
   const TextType = labelSize === undefined ? Text : Title;
@@ -36,16 +36,16 @@ const Label = (props: Props) => {
     >
       {tooltip && (
         <Tooltip title={tooltip}>
-          <QuestionCircleOutlined
-            className="pr-1 text-xs"
-            style={{
-              color: token.colorPrimary,
-            }}
-          />
+          <QuestionCircleOutlined className="pr-1 text-xs" style={{
+            color: token.colorPrimary
+          }} />
         </Tooltip>
       )}
       <span className="pr-2">
-        <TextType level={labelSize} type={labelType as any}>
+        <TextType
+          level={labelSize}
+          type={labelType as any}
+        >
           <Interweave content={labelText} />
         </TextType>
       </span>

package/src/widgets/base/LinkInput.tsx

@@ -74,11 +74,7 @@ export const LinkInput = (props: LinkInputProps) => {
       <Col flex="auto">
         {showInput ? (
           <Input
-            style={{
-              borderTopLeftRadius: 0,
-              borderBottomLeftRadius: 0,
-              ...requiredStyle,
-            }}
+            style={{ borderTopLeftRadius: 0, borderBottomLeftRadius: 0, ...requiredStyle }}
             id={id}
             onChange={onValueStringChange}
             value={value}
@@ -95,7 +91,6 @@ export const LinkInput = (props: LinkInputProps) => {
             href={`${linkPrefix}${value}`}
             style={{ color: token.colorPrimary, paddingRight: 15 }}
             target="_blank"
-            rel="noreferrer"
           >
             {value}
           </a>

package/src/widgets/base/MultiSelection.tsx

@@ -1,10 +1,11 @@
 import React from "react";
-import { Select, theme } from "antd";
+import { Select } from "antd";
 import styled from "styled-components";
 
 import Field from "@/common/Field";
 import { Selection as SelectionOoui } from "@gisce/ooui";
 import { WidgetProps } from "@/types";
+import { theme } from "antd";
 
 const { defaultAlgorithm, defaultSeed } = theme;
 

package/src/widgets/base/Selection.tsx

@@ -1,10 +1,11 @@
 import React from "react";
-import { Select, theme } from "antd";
+import { Select } from "antd";
 import styled from "styled-components";
 
 import Field from "@/common/Field";
 import { Selection as SelectionOoui } from "@gisce/ooui";
 import { WidgetProps } from "@/types";
+import { theme } from "antd";
 
 const { defaultAlgorithm, defaultSeed } = theme;
 
@@ -49,16 +50,9 @@ export const SelectionInput = (props: SelectionInputProps) => {
   const CustomSelect: any = required && !readOnly ? RequiredSelect : Select;
 
   return (
-    <CustomSelect
-      disabled={readOnly}
-      onChange={onChange}
-      value={value}
-      optionFilterProp="children"
-      filterOption={(input: string, option: any) =>
-        option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      }
-      showSearch
-    >
+    <CustomSelect disabled={readOnly} onChange={onChange} value={value} optionFilterProp="children" filterOption={
+      (input: string, option: any) => option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    } showSearch>
       {options}
     </CustomSelect>
   );

package/src/widgets/base/Time.tsx

@@ -3,10 +3,12 @@ import { TimePicker, theme } from "antd";
 import Field from "@/common/Field";
 import { Time as TimeOoui } from "@gisce/ooui";
 import { WidgetProps } from "@/types";
-import dayjs, { Dayjs } from "dayjs";
-import customParseFormat from "dayjs/plugin/customParseFormat";
+import dayjs from "dayjs";
+import { Dayjs } from 'dayjs';
+import customParseFormat from 'dayjs/plugin/customParseFormat'
 
-dayjs.extend(customParseFormat);
+
+dayjs.extend(customParseFormat)
 
 const Time = (props: WidgetProps) => {
   const { ooui } = props;
@@ -22,21 +24,18 @@ type TimeInputProps = {
   ooui: TimeOoui;
   value?: string;
   onChange?: (value?: string) => void;
-};
+}
 
 export const TimeInput = (props: TimeInputProps) => {
+
   const onChange = (time: Dayjs | null, timestring: string) => {
     if (props.onChange) {
-      props.onChange(timestring);
+      props.onChange(timestring)
     }
-  };
+  }
 
-  return (
-    <TimePicker
-      onChange={onChange}
-      value={props.value ? dayjs(props.value, "HH:mm:ss") : undefined}
-    />
-  );
-};
+  return <TimePicker onChange={onChange} value={props.value ? dayjs(props.value, 'HH:mm:ss') : undefined} />
+
+}
 
 export default Time;

package/src/widgets/base/many2one/Many2one.tsx

@@ -1,11 +1,16 @@
 import React, { useState, useRef, useEffect, useContext } from "react";
-import { Input, Button, Row, Col, theme } from "antd";
+import { Input, Button, Row, Col } from "antd";
 import {
   SearchOutlined,
   FolderOpenOutlined,
   LoadingOutlined,
 } from "@ant-design/icons";
 import styled from "styled-components";
+import { theme } from "antd";
+
+const { defaultAlgorithm, defaultSeed } = theme;
+
+const mapToken = defaultAlgorithm(defaultSeed);
 
 import {
   Many2one as Many2oneOoui,
@@ -20,10 +25,6 @@ import showErrorDialog from "@/ui/GenericErrorDialog";
 import { FormContext, FormContextType } from "@/context/FormContext";
 import { transformPlainMany2Ones } from "@/helpers/formHelper";
 
-const { defaultAlgorithm, defaultSeed } = theme;
-
-const mapToken = defaultAlgorithm(defaultSeed);
-
 type Props = {
   ooui: Many2oneOoui;
   onOpenDetailClick?:
@@ -57,7 +58,7 @@ interface Many2oneInputProps {
 }
 
 export const Many2oneInput: React.FC<Many2oneInputProps> = (
-  props: Many2oneInputProps,
+  props: Many2oneInputProps
 ) => {
   const { value, onChange, ooui } = props;
   const {
@@ -215,7 +216,7 @@ export const Many2oneInput: React.FC<Many2oneInputProps> = (
         transformDomainForChildWidget({
           domain,
           widgetFieldName: fieldName,
-        }),
+        })
       );
     }
 

package/src/widgets/base/many2one/Many2oneSuffix.tsx

@@ -38,12 +38,12 @@ export const Many2oneSuffix = (props: Props) => {
   const { t } = useContext(LocaleContext) as LocaleContextType;
 
   const tabManagerContext = useContext(
-    TabManagerContext,
+    TabManagerContext
   ) as TabManagerContextType;
   const { openRelate } = tabManagerContext || {};
 
   const contentRootContext = useContext(
-    ContentRootContext,
+    ContentRootContext
   ) as ContentRootContextType;
   const { processAction } = contentRootContext || {};
 
@@ -55,34 +55,22 @@ export const Many2oneSuffix = (props: Props) => {
     setIsLoading(true);
 
     try {
-      const formView = (await ConnectionProvider.getHandler().getView({
+      const formView = await ConnectionProvider.getHandler().getView({
         model,
         type: "form",
         context,
-      })) as FormView;
+      }) as FormView;
       setFormView(formView);
       let fields: string[] = [];
       const { toolbar } = formView;
-      toolbar.action
-        ?.filter((item: any) => item.hasOwnProperty("context"))
-        .map((item: any) => fields.push(...parseContextFields(item.context)));
-      toolbar.action
-        ?.filter((item: any) => item.hasOwnProperty("domain"))
-        .map((item: any) => fields.push(...parseDomainFields(item.domain)));
-      toolbar.relate
-        ?.filter((item: any) => item.hasOwnProperty("context"))
-        .map((item: any) => fields.push(...parseContextFields(item.context)));
-      toolbar.relate
-        ?.filter((item: any) => item.hasOwnProperty("domain"))
-        .map((item: any) => fields.push(...parseDomainFields(item.domain)));
-      toolbar.print
-        ?.filter((item: any) => item.hasOwnProperty("context"))
-        .map((item: any) => fields.push(...parseContextFields(item.context)));
-      fields = fields.filter(
-        (i) => Object.keys(formView.fields).indexOf(i) > -1,
-      );
+      toolbar.action?.filter((item: any) => item.hasOwnProperty('context')).map((item: any) => fields.push(...parseContextFields(item.context)));
+      toolbar.action?.filter((item: any) => item.hasOwnProperty('domain')).map((item: any) => fields.push(...parseDomainFields(item.domain)));
+      toolbar.relate?.filter((item: any) => item.hasOwnProperty('context')).map((item: any) => fields.push(...parseContextFields(item.context)));
+      toolbar.relate?.filter((item: any) => item.hasOwnProperty('domain')).map((item: any) => fields.push(...parseDomainFields(item.domain)));
+      toolbar.print?.filter((item: any) => item.hasOwnProperty('context')).map((item: any) => fields.push(...parseContextFields(item.context)));
+      fields = fields.filter((i) => Object.keys(formView.fields).indexOf(i) > -1)
 
-      let values = {};
+      let values = {}
 
       if (fields.length > 0) {
         values = (
@@ -101,6 +89,7 @@ export const Many2oneSuffix = (props: Props) => {
     } catch (err) {
       setIsLoading(false);
       showErrorDialog(err);
+      return;
     }
   }