@gisce/react-ooui 1.2.0-rc.77 → 1.2.0-rc.79

package/dist/views/ActionView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActionView.d.ts","sourceRoot":"","sources":["ActionView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAIf,OAAO,EAIL,eAAe,EAGf,QAAQ,EACT,MAAM,eAAe,CAAC;AAkBvB,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,eAAe,CAAC;IAC7B,iBAAiB,CAAC,EAAE,GAAG,CAAC;IACxB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;;AA4bF,wBAAsC"}
+{"version":3,"file":"ActionView.d.ts","sourceRoot":"","sources":["ActionView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAIf,OAAO,EAIL,eAAe,EAGf,QAAQ,EACT,MAAM,eAAe,CAAC;AAkBvB,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,eAAe,CAAC;IAC7B,iBAAiB,CAAC,EAAE,GAAG,CAAC;IACxB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;;AAgcF,wBAAsC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.2.0-rc.77",
+  "version": "1.2.0-rc.79",
   "files": [
     "dist",
     "src",

package/src/actionbar/AttachmentsButtonWrapper.tsx

@@ -8,7 +8,11 @@ import {
   TableOutlined,
 } from "@ant-design/icons";
 import { Popover, Button, Row, Col, Tooltip, Spin } from "antd";
-import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
+import {
+  LocaleContext,
+  LocaleContextType,
+  tForLang,
+} from "@/context/LocaleContext";
 
 export type Attachment = {
   id: number;
@@ -32,7 +36,7 @@ export const AttachmentsButtonWrapper = (
   props: AttachmentsButtonWrapperProps
 ) => {
   const { numberOfAttachments, disabled } = props;
-  const { t } = useContext(LocaleContext) as LocaleContextType;
+  const { t, lang } = useContext(LocaleContext) as LocaleContextType;
   const [popoverVisible, setPopoverVisible] = useState<boolean>(false);
 
   const button = (
@@ -52,7 +56,7 @@ export const AttachmentsButtonWrapper = (
       onVisibleChange={(visible: boolean) => setPopoverVisible(visible)}
       visible={popoverVisible}
       placement="bottom"
-      content={Content(props, setPopoverVisible)}
+      content={Content(props, setPopoverVisible, lang)}
       title={t("attachments")}
       arrowContent={null}
     >
@@ -63,7 +67,8 @@ export const AttachmentsButtonWrapper = (
 
 const Content = (
   props: AttachmentsButtonWrapperProps,
-  setPopoverVisible: (visible: boolean) => void
+  setPopoverVisible: (visible: boolean) => void,
+  locale: string
 ) => {
   const {
     attachments = [],
@@ -73,8 +78,6 @@ const Content = (
     onOpenAttachmentDetail,
     onListAllAttachments,
   } = props;
-  const { t } = useContext(LocaleContext) as LocaleContextType;
-
   if (loading) {
     return <Spin style={{ padding: 20 }} />;
   }
@@ -89,7 +92,7 @@ const Content = (
           onListAllAttachments();
         }}
       >
-        <TableOutlined /> {t("listAllAttachments")}
+        <TableOutlined /> {tForLang("listAllAttachments", locale)}
       </a>
       <a
         style={{ display: "block" }}
@@ -99,11 +102,11 @@ const Content = (
           onAddNewAttachment();
         }}
       >
-        <FileAddOutlined /> {t("addNewAttachment")}
+        <FileAddOutlined /> {tForLang("addNewAttachment", locale)}
       </a>
       {attachments.length > 0 && (
         <>
-          <li className=" ant-dropdown-menu-item-divider"></li>
+          <li className="ant-dropdown-menu-item-divider"></li>
           {attachments.map((attachment: any) => {
             const Icon = attachment.link ? LinkOutlined : DownloadOutlined;
             return (
@@ -119,8 +122,8 @@ const Content = (
                     <Tooltip
                       title={
                         attachment.link
-                          ? t("openAttachmentLink")
-                          : t("download")
+                          ? tForLang("openAttachmentLink", locale)
+                          : tForLang("download", locale)
                       }
                     >
                       <Icon
@@ -134,7 +137,7 @@ const Content = (
                   )}
                 </Col>
                 <Col flex="25px" style={{ textAlign: "center" }}>
-                  <Tooltip title={t("openAttachment")}>
+                  <Tooltip title={tForLang("openAttachment", locale)}>
                     <FormOutlined
                       style={{ cursor: "pointer" }}
                       onClick={() => {

package/src/context/ContentRootContext.tsx

@@ -439,7 +439,7 @@ async function getViewsAndInitialView({
     };
   } else if (!view_id) {
     const type = view_mode.split(",")[0];
-    const [retrievedViewId] = views.find(([_, viewType]) => viewType === type)!;
+    const [retrievedViewId] = retriedViewData.find(([_, viewType]) => viewType === type)!;
     initialView = { id: retrievedViewId, type };
   } else {
     initialView = {

package/src/views/ActionView.tsx

@@ -107,6 +107,7 @@ function ActionView(props: Props, ref: any) {
     tabs,
     activeKey,
     openAction,
+    onRemoveTab,
   } = tabManagerContext || {};
 
   useHotkeys(
@@ -240,8 +241,9 @@ function ActionView(props: Props, ref: any) {
 
     if (!currentViewToAssign) {
       showErrorDialog(
-        "Error determining the first view to show.\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);
     }
 
     setCurrentView(currentViewToAssign);
@@ -279,7 +281,9 @@ function ActionView(props: Props, ref: any) {
   }, [tabs, activeKey]);
 
   async function canWeClose() {
-    if (currentView!.type === "form") {
+    if (!currentView) {
+      return true;
+    } else if (currentView!.type === "form") {
       return await (formRef.current as any).cancelUnsavedChanges();
     } else {
       return true;