Merge branch 'develop' into test/Dialog

frontend/taipy-gui/src/components/Taipy/Unregistered.spec.tsx

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021-2024 Avaiga Private Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+import { render, screen } from "@testing-library/react";
+import "@testing-library/jest-dom";
+import { renderError, unregisteredRender } from "./Unregistered";
+
+describe("Unregistered component", () => {
+    it('should display "component is not registered" when tagName is provided', () => {
+        render(unregisteredRender("TestComponent"));
+        expect(screen.getByText("Component TestComponent is not registered")).toBeInTheDocument();
+    });
+
+    it("should display error message when tagName is not provided", () => {
+        render(unregisteredRender(undefined, "TestError"));
+        expect(screen.getByText("An Error occurred: TestError")).toBeInTheDocument();
+    });
+
+    it("should display error message when there is an error", () => {
+        render(renderError({ error: "TestError" }));
+        expect(screen.getByText("An Error occurred: TestError")).toBeInTheDocument();
+    });
+});

taipy/gui/server.py

@@ -186,7 +186,7 @@ class _Server:
 
             if path == "taipy.status.json":
                 return self._direct_render_json(self._gui._serve_status(pathlib.Path(template_folder) / path))
-            if str(os.path.normpath(file_path := ((base_path := static_folder + os.path.sep) + path))).startswith(
+            if (file_path := str(os.path.normpath((base_path := static_folder + os.path.sep) + path))).startswith(
                 base_path
             ) and os.path.isfile(file_path):
                 return send_from_directory(base_path, path)
@@ -194,17 +194,17 @@ class _Server:
             for k, v in self.__path_mapping.items():
                 if (
                     path.startswith(f"{k}/")
-                    and str(
-                        os.path.normpath(file_path := ((base_path := v + os.path.sep) + path[len(k) + 1 :]))
+                    and (
+                        file_path := str(os.path.normpath((base_path := v + os.path.sep) + path[len(k) + 1 :]))
                     ).startswith(base_path)
                     and os.path.isfile(file_path)
                 ):
                     return send_from_directory(base_path, path[len(k) + 1 :])
             if (
                 hasattr(__main__, "__file__")
-                and str(
-                    os.path.normpath(
-                        file_path := ((base_path := os.path.dirname(__main__.__file__) + os.path.sep) + path)
+                and (
+                    file_path := str(
+                        os.path.normpath((base_path := os.path.dirname(__main__.__file__) + os.path.sep) + path)
                     )
                 ).startswith(base_path)
                 and os.path.isfile(file_path)
@@ -212,9 +212,9 @@ class _Server:
             ):
                 return send_from_directory(base_path, path)
             if (
-                str(os.path.normpath(file_path := (base_path := self._gui._root_dir + os.path.sep) + path)).startswith(
-                    base_path
-                )
+                (
+                    file_path := str(os.path.normpath((base_path := self._gui._root_dir + os.path.sep) + path))
+                ).startswith(base_path)
                 and os.path.isfile(file_path)
                 and not self.__is_ignored(file_path)
             ):