Browse Source

fix(workflow): Use value in resolve in release suggestions (#46400)

Scott Cooper 1 year ago
parent
commit
74f691bb38

+ 3 - 1
static/app/components/actions/resolve.spec.jsx

@@ -5,6 +5,7 @@ import {
   renderGlobalModal,
   screen,
   userEvent,
+  within,
 } from 'sentry-test/reactTestingLibrary';
 
 import ResolveActions from 'sentry/components/actions/resolve';
@@ -167,7 +168,8 @@ describe('ResolveActions', function () {
     expect(await screen.findByText('1.2.0')).toBeInTheDocument();
     await userEvent.click(screen.getByText('1.2.0'));
 
-    await userEvent.click(screen.getByRole('button', {name: 'Save Changes'}));
+    const modal = screen.getByRole('dialog');
+    await userEvent.click(within(modal).getByRole('button', {name: 'Resolve'}));
     expect(onUpdate).toHaveBeenCalledWith({
       status: 'resolved',
       statusDetails: {

+ 1 - 1
static/app/components/customCommitsResolutionModal.spec.jsx

@@ -30,7 +30,7 @@ describe('CustomCommitsResolutionModal', function () {
 
     expect(commitsMock).toHaveBeenCalled();
     await selectEvent.select(screen.getByText('e.g. d86b832'), 'f7f395d14b2f');
-    await userEvent.click(screen.getByRole('button', {name: 'Save Changes'}));
+    await userEvent.click(screen.getByRole('button', {name: 'Resolve'}));
 
     expect(onSelected).toHaveBeenCalledWith({
       inCommit: {

+ 1 - 1
static/app/components/customCommitsResolutionModal.tsx

@@ -78,7 +78,7 @@ function CustomCommitsResolutionModal({
           {t('Cancel')}
         </Button>
         <Button type="submit" priority="primary">
-          {t('Save Changes')}
+          {t('Resolve')}
         </Button>
       </Footer>
     </form>

+ 1 - 1
static/app/components/customResolutionModal.spec.jsx

@@ -38,7 +38,7 @@ describe('CustomResolutionModal', () => {
     expect(await screen.findByText('1.2.0')).toBeInTheDocument();
     await userEvent.click(screen.getByText('1.2.0'));
 
-    await userEvent.click(screen.getByText('Save Changes'));
+    await userEvent.click(screen.getByText('Resolve'));
     expect(onSelected).toHaveBeenCalledWith({
       inRelease: 'sentry-android-shop@1.2.0',
     });

+ 4 - 4
static/app/components/customResolutionModal.tsx

@@ -20,8 +20,8 @@ function CustomResolutionModal(props: CustomResolutionModalProps) {
   const [version, setVersion] = useState('');
   const currentUser = configStore.get('user');
 
-  const onChange = (value: any) => {
-    setVersion(value.item);
+  const onChange = (selection: string | number | boolean) => {
+    setVersion(selection as string);
   };
 
   const onAsyncFieldResults = (results: Release[]) => {
@@ -30,7 +30,7 @@ function CustomResolutionModal(props: CustomResolutionModalProps) {
         author => author.email && author.email === currentUser?.email
       );
       return {
-        item: release.version,
+        value: release.version,
         label: <Version version={release.version} anchor={false} />,
         plainTextLabel: release.versionInfo.description ?? release.version,
         details: (
@@ -78,7 +78,7 @@ function CustomResolutionModal(props: CustomResolutionModalProps) {
           {t('Cancel')}
         </Button>
         <Button type="submit" priority="primary">
-          {t('Save Changes')}
+          {t('Resolve')}
         </Button>
       </Footer>
     </form>