Skip to content

Commit dcdc748

Browse files
committed
Adjust after rebase
- Undo incorrect package update - Update autogen code - Add adjusted preview code done in original module code
1 parent aea27cd commit dcdc748

File tree

4 files changed

+64
-42
lines changed

4 files changed

+64
-42
lines changed

frontend/package-lock.json

Lines changed: 41 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"@vitejs/plugin-react": "^4.3.4",
6767
"@vitest/coverage-istanbul": "^3.0.7",
6868
"dependency-cruiser": "^14.0.0",
69-
"eslint": "^9.23.0",
69+
"eslint": "^9.15.0",
7070
"eslint-config-prettier": "^10.0.2",
7171
"eslint-import-resolver-typescript": "^3.8.3",
7272
"eslint-plugin-import": "2.31",
@@ -83,4 +83,4 @@
8383
"vite-plugin-checker": "^0.9.0",
8484
"vitest": "^3.0.7"
8585
}
86-
}
86+
}

frontend/src/api/autogen/types.gen.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,26 @@ export type StratigraphicColumn_api = {
724724
type: string | null;
725725
};
726726

727+
/**
728+
* Stratigraphic unit from SMDA
729+
*
730+
* Camel case attributes needed for esvIntersection component in front-end
731+
*/
732+
export type StratigraphicUnit_api = {
733+
identifier: string;
734+
top: string;
735+
base: string;
736+
stratUnitLevel: number;
737+
stratUnitType: string;
738+
topAge: number | number;
739+
baseAge: number | number;
740+
stratUnitParent: string | null;
741+
colorR: number;
742+
colorG: number;
743+
colorB: number;
744+
lithologyType?: number | number | string;
745+
};
746+
727747
/**
728748
* A single observation of a summary vector at a specific date.
729749
*/

frontend/src/modules/Intersection/preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import type { DrawPreviewFunc } from "@framework/Preview";
33
import previewImg from "./preview.svg";
44

55
export const preview: DrawPreviewFunc = function (width: number, height: number) {
6-
return <img src={previewImg} style={{ width, height }} className="object-cover object-center" />;
6+
return <image href={previewImg} width={width} height={height} />;
77
};

0 commit comments

Comments
 (0)