Refactor sizes

hashicorp-forge · Nov 9, 2023 · 6ca7b85 · 6ca7b85
1 parent 61cb8a9
commit 6ca7b85
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 30 deletions.
diff --git a/web/app/components/doc/thumbnail.ts b/web/app/components/doc/thumbnail.ts
@@ -1,14 +1,9 @@
 import Component from "@glimmer/component";
 import { dasherize } from "@ember/string";
 import getProductId from "hermes/utils/get-product-id";
-import { inject as service } from "@ember/service";
-import ProductAreasService from "hermes/services/product-areas";
+import { HermesSize } from "hermes/types/sizes";
 
-export enum DocThumbnailSize {
-  Small = "small",
-  Medium = "medium",
-  Large = "large",
-}
+export type DocThumbnailSize = Exclude<HermesSize, HermesSize.XL>;
 
 interface DocThumbnailComponentSignature {
   Element: HTMLDivElement;
@@ -20,8 +15,6 @@ interface DocThumbnailComponentSignature {
 }
 
 export default class DocThumbnailComponent extends Component<DocThumbnailComponentSignature> {
-  @service declare productAreas: ProductAreasService;
-
   protected get status(): string | null {
     if (this.args.status) {
       return dasherize(this.args.status);
@@ -31,7 +24,7 @@ export default class DocThumbnailComponent extends Component<DocThumbnailCompone
   }
 
   protected get size() {
-    return this.args.size ?? DocThumbnailSize.Small;
+    return this.args.size ?? HermesSize.Small;
   }
 
   protected get productShortName(): string | undefined {

diff --git a/web/app/components/person/avatar.ts b/web/app/components/person/avatar.ts
@@ -1,8 +1,6 @@
 import Component from "@glimmer/component";
-import {
-  HermesBasicAvatarSize,
-  HermesPersonAvatarSize,
-} from "hermes/types/avatar-size";
+import { HermesPersonAvatarSize } from "hermes/types/avatar-size";
+import { HermesSize } from "hermes/types/sizes";
 
 interface PersonAvatarComponentSignature {
   Element: HTMLDivElement;
@@ -18,7 +16,7 @@ interface PersonAvatarComponentSignature {
 }
 
 export default class PersonAvatarComponent extends Component<PersonAvatarComponentSignature> {
-  protected size = this.args.size ?? HermesBasicAvatarSize.Small;
+  protected size = this.args.size ?? HermesSize.Small;
 }
 
 declare module "@glint/environment-ember-loose/registry" {

diff --git a/web/app/components/product/avatar.gts b/web/app/components/product/avatar.gts
@@ -4,13 +4,15 @@ import { inject as service } from "@ember/service";
 import FlightIcon from "@hashicorp/ember-flight-icons/components/flight-icon";
 import ProductAreasService from "hermes/services/product-areas";
 import { assert } from "@ember/debug";
-import { HermesBasicAvatarSize } from "hermes/types/avatar-size";
+import { HermesSize } from "hermes/types/sizes";
+
+export type ProductAvatarSize = Exclude<HermesSize, HermesSize.XL>;
 
 interface ProductAvatarComponentSignature {
   Element: HTMLDivElement;
   Args: {
     product?: string;
-    size?: `${HermesBasicAvatarSize}`;
+    size?: `${ProductAvatarSize}`;
   };
   Blocks: {
     default: [];
@@ -27,7 +29,7 @@ export default class ProductAvatarComponent extends Component<ProductAvatarCompo
   }
 
   private get size() {
-    return this.args.size ?? HermesBasicAvatarSize.Small;
+    return this.args.size ?? HermesSize.Small;
   }
 
   <template>

diff --git a/web/app/types/avatar-size.ts b/web/app/types/avatar-size.ts
@@ -1,13 +1,3 @@
-export enum HermesBasicAvatarSize {
-  Small = "small",
-  Medium = "medium",
-  Large = "large",
-}
+import { HermesSize } from "./sizes";
 
-export enum HermesExtendedAvatarSize {
-  XL = "xl",
-}
-
-export type HermesPersonAvatarSize =
-  | HermesBasicAvatarSize
-  | HermesExtendedAvatarSize;
+export type HermesPersonAvatarSize = HermesSize;
diff --git a/web/app/types/sizes.ts b/web/app/types/sizes.ts
@@ -0,0 +1,6 @@
+export enum HermesSize {
+  Small = "small",
+  Medium = "medium",
+  Large = "large",
+  XL = "xl",
+}