@dcrackel/hematournamentui 1.0.707 → 1.0.709

package/src/stories/Organisms/Cards/TableauFencerCard/TableauFencerCard.vue

@@ -1,128 +1,80 @@
-<!-- TableauFencerCard.vue -->
-<template>
-  <section
-    class="bg-poolSetup flex rounded-md border"
-    @mouseover="handleHighLight(true)"
-    @mouseout="handleHighLight(false)"
-    :class="[width, highLighted, opacity]"
-  >
-    <!-- Left position -->
-    <div class="text-center px-1 w-5 flex items-center justify-center rounded-l-md z-50" :class="[`bg-${color}`]">
-      <BaseText :text="position" size="xs" color="neutral" />
-    </div>
-
-    <div class="flex w-full items-center">
-      <!-- Portrait and Name/Club -->
-      <div class="flex w-full">
-        <div v-if="large" class="">
-          <div v-if="!portraitURL" class="w-9 h-9 rounded-r-md bg-dropdownSelect flex items-center justify-center">
-            <BaseText text="" size="sm" color="neutral" weight="bold" />
-          </div>
-          <img v-if="portraitURL" :src="portraitURL" alt="Portrait" class="w-9 h-9 rounded-r-md" />
-        </div>
-        <div class="flex flex-col justify-center ml-2">
-          <BaseText
-            :text="name"
-            :size="large ? 'sm' : 'xs'"
-            :weight="large ? 'bold' : 'normal'"
-            color="quaternary"
-            class="truncate text-nowrap overflow-hidden"
-          />
-          <BaseText
-            v-if="club.length > 1 && large"
-            color="quinary"
-            :text="club.substring(0, 28)"
-            size="xs"
-            class="truncate text-nowrap overflow-hidden"
-          />
-        </div>
-      </div>
-    </div>
-
-    <!-- Right position (Score) -->
-    <div class="text-center px-1 w-5 flex items-center justify-center rounded-r-md" :class="scoreColor">
-      <BaseText :text="fencerScore" size="xs" color="neutral" />
-    </div>
-  </section>
-</template>
-
-<script>
-import BaseText from '../../../Atoms/Text/BaseText.vue';
-
-export default {
-  name: 'TableauFencerCard',
-  emits: ['action:highLight'],
-  components: { BaseText },
-  props: {
-    fencer: {
-      type: Object,
-      required: true
-    },
-    score: {
-      type: String,
-      required: true
-    },
-    position: {
-      type: [String, Number],
-      required: true
-    },
-    color: {
-      type: String,
-      required: true
-    },
-    scoreColor: {
-      type: String,
-      required: true
-    },
-    large: {
-      type: Boolean,
-      default: true
-    },
-    highLight: {
-      type: Boolean,
-      default: false
-    },
-    faded: {
-      type: Boolean,
-      default: false
-    },
-    isCountingBackwardsMaxScore: {
-      type: Number,
-      default: 0
-    }
-  },
-  computed: {
-    portraitURL() {
-      const images = this.fencer.Images || [];
-      const portrait = images.find(image => image.URL);
-      return portrait ? portrait.URL : '';
-    },
-    fencerScore() {
-      const rawScore = this.score;
-      return this.isCountingBackwardsMaxScore > 0 ? this.isCountingBackwardsMaxScore - rawScore : rawScore;
-    },
-    name() {
-      //if (this.fencer.DisplayName === "BYE") return "";
-      return this.fencer.DisplayName;
-    },
-    club() {
-      if (this.fencer.DisplayName === 'BYE' || this.fencer.DisplayName === '') return '';
-      return this.fencer.Club.Name;
-    },
-    width() {
-      return this.large ? ' w-72' : ' w-40';
-    },
-    highLighted() {
-      return this.highLight ? 'border-bright' : 'border-poolSetup';
-    },
-    opacity() {
-      return this.faded ? 'opacity-60 shadow-md' : 'shadow-xl';
-    }
-  },
-  methods: {
-    handleHighLight(value) {
-      this.$emit('action:highLight', value);
-    }
-  }
-};
-</script>
+<template>
+  <section class="flex h-7 w-40 overflow-hidden border border-poolSetup bg-poolSetup" :class="cornerClass">
+    <div class="flex w-5 shrink-0 items-center justify-center px-1" :class="positionColorClass">
+      <BaseText :text="position" size="xs" color="neutral" />
+    </div>
+
+    <div class="flex min-w-0 flex-1 items-center px-2">
+      <BaseText :text="name" size="xs" color="quaternary" class="truncate whitespace-nowrap" />
+    </div>
+
+    <div class="flex w-7 shrink-0 items-center justify-center border-l border-poolSetup" :class="scoreColor">
+      <BaseText v-if="showScore" :text="displayedScore" size="xs" color="neutral" />
+    </div>
+  </section>
+</template>
+
+<script>
+import BaseText from '../../../Atoms/Text/BaseText.vue';
+
+const cornerClasses = {
+  none: '',
+  top: 'rounded-t',
+  bottom: 'rounded-b'
+};
+
+export default {
+  name: 'TableauFencerCard',
+  components: { BaseText },
+  props: {
+    fencer: {
+      type: Object,
+      required: true
+    },
+    score: {
+      type: String,
+      required: true
+    },
+    position: {
+      type: [String, Number],
+      required: true
+    },
+    color: {
+      type: String,
+      default: ''
+    },
+    scoreColor: {
+      type: String,
+      required: true
+    },
+    showScore: {
+      type: Boolean,
+      default: true
+    },
+    isCountingBackwardsMaxScore: {
+      type: Number,
+      default: 0
+    },
+    corners: {
+      type: String,
+      default: 'none',
+      validator: value => Object.hasOwn(cornerClasses, value)
+    }
+  },
+  computed: {
+    cornerClass() {
+      return cornerClasses[this.corners];
+    },
+    displayedScore() {
+      const score = Number(this.score || 0);
+      return this.isCountingBackwardsMaxScore > 0 ? this.isCountingBackwardsMaxScore - score : score;
+    },
+    name() {
+      return String(this.fencer?.DisplayName || '');
+    },
+    positionColorClass() {
+      return this.color ? `bg-${this.color}` : 'bg-dropdownSelect';
+    }
+  }
+};
+</script>

package/src/stories/Organisms/Cards/WaitlistFencerCard/WaitlistFencerCard.vue

@@ -18,9 +18,18 @@
     </div>
 
     <div class="flex flex-col w-3/4 md:w-4/12 justify-start">
-      <button class="flex justify-start overflow-hidden text-left" type="button" @click="handleForwardToProfile">
-        <BaseText :text="displayName" size="md" color="quaternary" weight="bold" class="text-sm md:text-xl truncate" />
-      </button>
+      <div class="flex items-center justify-start gap-2 min-w-0">
+        <button class="min-w-0 text-left" type="button" @click="handleForwardToProfile">
+          <BaseText
+            :text="displayName"
+            size="md"
+            color="quaternary"
+            weight="bold"
+            class="text-sm md:text-xl truncate"
+          />
+        </button>
+        <MissingHemaRatingsId :person="person.Person" />
+      </div>
       <span class="w-full flex justify-start">
         <BaseText :text="clubName" size="md" color="quinary" weight="normal" class="hidden md:block" />
         <BaseText :text="clubShortName" size="xs" color="quinary" weight="normal" class="block md:hidden" />
@@ -86,10 +95,11 @@
 import BaseIcon from '../../../Atoms/Icon/BaseIcon.vue';
 import BaseText from '../../../Atoms/Text/BaseText.vue';
 import BaseButton from '../../../Molecules/Buttons/BaseButton/BaseButton.vue';
+import MissingHemaRatingsId from '../../../Molecules/Indicators/MissingHemaRatingsId/MissingHemaRatingsId.vue';
 
 export default {
   name: 'WaitlistFencerCard',
-  components: { BaseButton, BaseIcon, BaseText },
+  components: { BaseButton, BaseIcon, BaseText, MissingHemaRatingsId },
   emits: ['forward:toProfile', 'move:active', 'remove:fencer'],
   props: {
     person: {

package/src/stories/Organisms/ComplexInputs/ImageCropper/ImageCropper.stories.js

@@ -1,20 +1,31 @@
-import GenericImageCropper from './ImageCropper.vue';
-
-export default {
-  title: 'Organisms/ComplexInputs/ImageCropper',
-  component: GenericImageCropper,
-  tags: ['autodocs'],
-  args: {},
-  argTypes: {
-    personID: {
-      control: 'number',
-      description: 'The ID of the person for the image cropper'
-    }
-  }
-};
-
-export const Default = {
-  args: {
-    personID: 1
-  }
-};
+import GenericImageCropper from './ImageCropper.vue';
+
+export default {
+  title: 'Organisms/ComplexInputs/ImageCropper',
+  component: GenericImageCropper,
+  tags: ['autodocs'],
+  args: { urlToImage: '', isProfile: true, disabled: false },
+  argTypes: {
+    urlToImage: { control: 'text' },
+    uploadImageName: { control: 'text' },
+    uploadServer: { control: 'text' },
+    imageServer: { control: 'text' },
+    isProfile: { control: 'boolean' },
+    disabled: { control: 'boolean' },
+    'update:url': { action: 'update:url' },
+    'update:uploading': { action: 'update:uploading' },
+    'error:load': { action: 'error:load' },
+    'error:upload': { action: 'error:upload' }
+  }
+};
+
+export const Default = {
+  args: {
+    urlToImage: '',
+    isProfile: true
+  }
+};
+
+export const Disabled = {
+  args: { urlToImage: '', isProfile: true, disabled: true }
+};

package/src/stories/Organisms/ComplexInputs/ImageCropper/ImageCropper.test.js

@@ -0,0 +1,109 @@
+import { afterEach, describe, expect, it } from 'vitest';
+import { enableAutoUnmount, mount } from '@vue/test-utils';
+import ImageCropper from './ImageCropper.vue';
+
+enableAutoUnmount(afterEach);
+
+const mountCropper = props =>
+  mount(ImageCropper, {
+    props: {
+      urlToImage: 'https://images.example/profile.png',
+      imageServer: 'https://images.example/',
+      uploadImageName: 'profile',
+      isProfile: true,
+      ...props
+    },
+    global: { stubs: { AvatarCropper: true } }
+  });
+
+describe('ImageCropper upload draft events', () => {
+  it('emits a successful upload URL and previews it with a fresh cache key', async () => {
+    const wrapper = mountCropper({ uploadImageName: 'new-profile' });
+    wrapper.vm.handleUploading();
+    wrapper.vm.handleUploaded({ response: { status: 201 } });
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.emitted('update:url')).toEqual([['https://images.example/new-profile.png']]);
+    expect(wrapper.emitted('update:uploading')).toEqual([[true], [false]]);
+    const preview = new URL(wrapper.find('img').attributes('src'));
+    expect(preview.pathname).toBe('/new-profile.png');
+    expect(preview.searchParams.has('preview')).toBe(true);
+    await wrapper.setProps({ urlToImage: 'https://images.example/new-profile.png' });
+    expect(wrapper.find('img').attributes('src')).toBe(preview.href);
+  });
+
+  it('refreshes the preview even when an upload overwrites the existing URL', async () => {
+    const wrapper = mountCropper();
+    wrapper.vm.handleUploaded({ response: { status: 200 } });
+    await wrapper.vm.$nextTick();
+    expect(wrapper.find('img').attributes('src')).toContain('/profile.png?preview=');
+    expect(wrapper.emitted('update:url')).toEqual([['https://images.example/profile.png']]);
+  });
+
+  it('keeps the previous image and reports unsuccessful responses separately', () => {
+    const wrapper = mountCropper();
+    wrapper.vm.handleUploading();
+    wrapper.vm.handleUploaded({ response: { status: 500 } });
+    expect(wrapper.vm.uploading).toBe(false);
+    expect(wrapper.vm.localImageUrl).toBe('https://images.example/profile.png');
+    expect(wrapper.emitted('update:url')).toBeUndefined();
+    expect(wrapper.emitted('error:upload')[0][0]).toMatchObject({ message: 'Image upload failed.', status: 500 });
+  });
+
+  it('reports malformed upload responses without crashing or emitting an edit', () => {
+    const wrapper = mountCropper();
+    wrapper.vm.handleUploaded(undefined);
+    expect(wrapper.emitted('update:url')).toBeUndefined();
+    expect(wrapper.emitted('error:upload')).toHaveLength(1);
+  });
+
+  it('rejects unsafe uploaded URLs', () => {
+    const wrapper = mountCropper({ imageServer: 'javascript:' });
+    wrapper.vm.handleUploaded({ response: { status: 200 } });
+    expect(wrapper.emitted('update:url')).toBeUndefined();
+    expect(wrapper.emitted('error:upload')[0][0].message).toContain('valid image URL');
+  });
+
+  it('shows a placeholder on image-load failure and leaves the draft URL intact', async () => {
+    const wrapper = mountCropper();
+    await wrapper.find('img').trigger('error');
+    expect(wrapper.emitted('update:url')).toBeUndefined();
+    expect(wrapper.emitted('error:load')[0][0]).toMatchObject({ url: 'https://images.example/profile.png' });
+    expect(wrapper.find('img').attributes('src')).not.toBe('https://images.example/profile.png');
+    expect(wrapper.vm.localImageUrl).toBe('https://images.example/profile.png');
+    expect(wrapper.vm.showCropper).toBe(false);
+  });
+
+  it('reconciles authoritative URL changes after a failed preview', async () => {
+    const wrapper = mountCropper();
+    await wrapper.find('img').trigger('error');
+    await wrapper.setProps({ urlToImage: 'https://images.example/confirmed.png' });
+    expect(wrapper.find('img').attributes('src')).toBe('https://images.example/confirmed.png');
+  });
+
+  it('reports the cropper upload error and releases the busy state', () => {
+    const wrapper = mountCropper();
+    wrapper.vm.handleUploading();
+    wrapper.vm.handlerError({ type: 'upload', message: 'Upload rejected', context: { response: { status: 413 } } });
+    expect(wrapper.emitted('error:upload')).toEqual([[{ message: 'Upload rejected', status: 413 }]]);
+    expect(wrapper.vm.uploading).toBe(false);
+    expect(wrapper.emitted('update:url')).toBeUndefined();
+  });
+
+  it('reports rejected upload requests and releases the busy state', async () => {
+    const wrapper = mountCropper();
+    const response = Promise.reject(new Error('Network unavailable'));
+    wrapper.vm.handleUploading({ response });
+    await wrapper.vm.$nextTick();
+    expect(wrapper.vm.uploading).toBe(false);
+    expect(wrapper.emitted('error:upload')[0][0].message).toBe('Network unavailable');
+    expect(wrapper.emitted('update:url')).toBeUndefined();
+  });
+
+  it('disables the native image selector and guards programmatic opening', () => {
+    const wrapper = mountCropper({ disabled: true });
+    expect(wrapper.find('button').attributes('disabled')).toBeDefined();
+    wrapper.vm.setShowCropper();
+    expect(wrapper.vm.showCropper).toBe(false);
+  });
+});