Merge branch 'main' into feat/support-nested-style-object

reearth · May 18, 2023 · c0f3bab · c0f3bab
2 parents de71084 + c3ab031
commit c0f3bab
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/web/src/components/molecules/Common/Header/profile.tsx b/web/src/components/molecules/Common/Header/profile.tsx
@@ -92,6 +92,9 @@ const HeaderProfile: React.FC<Props & Partial<LoginProps>> = ({
             <MenuListItem>
               <MenuListItemLabel icon="logout" onClick={onSignOut} text={t("Log out")} />
             </MenuListItem>
+            <MenuListItem>
+              <MenuListItemLabel text={`v${__APP_VERSION__}`} />
+            </MenuListItem>
           </MenuList>
         </ChildrenWrapper>
       </StyledDropdown>

diff --git a/web/src/config/index.ts b/web/src/config/index.ts
@@ -48,6 +48,7 @@ export type Config = {
 };
 
 declare global {
+  let __APP_VERSION__: string;
   interface Window {
     REEARTH_CONFIG?: Config;
     REEARTH_E2E_ACCESS_TOKEN?: string;

diff --git a/web/src/core/engines/Cesium/Feature/index.tsx b/web/src/core/engines/Cesium/Feature/index.tsx
@@ -95,9 +95,11 @@ export default function Feature({
     k: keyof AppearanceTypes,
     f?: ComputedFeature,
   ): JSX.Element | null => {
-    const componentId = `${layer.id}_${f?.id ?? ""}_${k}_${isHidden}_${
-      JSON.stringify(f?.[k]) ?? ""
-    }`;
+    const componentId = generateIDWithMD5(
+      `${layer.id}_${f?.id ?? ""}_${k}_${isHidden}_${data?.url ?? ""}_${
+        JSON.stringify(f?.[k]) ?? ""
+      }`,
+    );
 
     const cachedComponent = CACHED_COMPONENTS.get(componentId);
     if (cachedComponent) {

diff --git a/web/vite.config.ts b/web/vite.config.ts
@@ -12,11 +12,14 @@ import cesium from "vite-plugin-cesium";
 import tsconfigPaths from "vite-tsconfig-paths";
 import { configDefaults } from "vitest/config";
 
+import pkg from "./package.json";
+
 export default defineConfig({
   envPrefix: "REEARTH_WEB_",
   plugins: [react(), yaml(), cesium(), serverHeaders(), config(), tsconfigPaths()],
   define: {
     "process.env.QTS_DEBUG": "false", // quickjs-emscripten
+    __APP_VERSION__: JSON.stringify(pkg.version),
   },
   server: {
     port: 3000,