Merge branch 'main' into deps-update-cci-3-82-0

src/js/components/orgs/cards/orgInfo.tsx

@@ -87,7 +87,7 @@ const OrgInfo = ({
       // synced status for orgs
       if (baseCommit) {
         // eslint-disable-next-line max-len
-        compareChangesUrl = `${repoUrl}/compare/${org.latest_commit}...${baseCommit}`;
+        compareChangesUrl = `${repoUrl}/compare/${baseCommit}...${org.latest_commit}`;
       }
       outOfDateMsg = (
         <li>

src/js/components/orgs/playgroundCard.tsx

@@ -121,7 +121,6 @@ const PlaygroundOrgCard = ({
     const readyToDeleteOrg =
       isWaitingToDeleteOrg && !org.currently_refreshing_changes;
     const action = isWaitingToDeleteOrg;
-
     if (readyToDeleteOrg) {
       setIsWaitingToDeleteOrg(null);
       if (org.has_unsaved_changes) {
@@ -132,7 +131,16 @@ const PlaygroundOrgCard = ({
         doDeleteOrg();
       }
     }
-  }, [doDeleteOrg, doRefreshOrg, isWaitingToDeleteOrg, org]);
+  }, [doDeleteOrg, doRefreshOrg, isWaitingToDeleteOrg, org, dispatch]);
+  useEffect(() => {
+    if (
+      org &&
+      org?.expires_at !== null &&
+      new Date(org?.expires_at) < new Date()
+    ) {
+      doDeleteOrg();
+    }
+  }, []);
 
   /* istanbul ignore next */
   if (!(project || epic || task)) {

src/js/components/orgs/taskOrgCard.tsx

@@ -1,6 +1,6 @@
 import Card from '@salesforce/design-system-react/components/card';
 import classNames from 'classnames';
-import React, { ReactNode, useCallback, useState } from 'react';
+import React, { ReactNode, useCallback, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
 import AssignTaskRoleModal from '@/js/components/githubUsers/assignTaskRole';
@@ -180,6 +180,7 @@ const TaskOrgCard = ({
       handleRefresh?.(org);
     }
   }, [handleRefresh, org]);
+
   const doCreateOrg = useCallback(() => {
     handleCreate(type);
   }, [handleCreate, type]);
@@ -202,7 +203,15 @@ const TaskOrgCard = ({
   // We consider an org out-of-date if it is not based on the first commit.
   const orgOutOfDate = Boolean(org && orgCommitIdx !== 0);
   const testOrgOutOfDate = type === ORG_TYPES.QA && orgOutOfDate;
-
+  useEffect(() => {
+    if (
+      org &&
+      org?.expires_at !== null &&
+      new Date(org?.expires_at) < new Date()
+    ) {
+      doDeleteOrg();
+    }
+  }, []);
   return (
     <div
       className="slds-size_1-of-1

test/js/components/epics/detail.test.jsx

@@ -56,7 +56,7 @@ const defaultOrg = {
   owner: sampleUser1.id,
   owner_gh_username: sampleGitHubUser1.username,
   owner_gh_id: sampleGitHubUser1.id,
-  expires_at: '2019-09-16T12:58:53.721Z',
+  expires_at: new Date(new Date().getTime() + 86400000).toISOString(),
   latest_commit: '617a51',
   latest_commit_url: '/test/commit/url/',
   latest_commit_at: '2019-08-16T12:58:53.721Z',

test/js/components/orgs/playgroundCard.test.jsx

@@ -57,7 +57,7 @@ const defaultOrg = {
   owner: 'user-id',
   owner_gh_username: 'user-name',
   owner_gh_id: 123456,
-  expires_at: '2019-09-16T12:58:53.721Z',
+  expires_at: new Date(new Date().getTime() + 86400000).toISOString(),
   latest_commit: '617a512',
   latest_commit_url: '/test/commit/url/',
   latest_commit_at: '2019-08-16T12:58:53.721Z',
@@ -236,6 +236,27 @@ describe('<PlaygroundOrgCard/>', () => {
 
       const args = deleteObject.mock.calls[0][0];
 
+      expect(args.objectType).toBe('scratch_org');
+      expect(args.object.id).toEqual(defaultOrg.id);
+    });
+  });
+  describe('delete expired org', () => {
+    test('checks for expiry status and then deletes org', async () => {
+      const org = {
+        ...defaultOrg,
+        expires_at: new Date().toISOString(),
+        unsaved_changes: {},
+        total_unsaved_changes: 0,
+        has_unsaved_changes: false,
+      };
+      const { findByText } = setup({ org });
+      expect.assertions(3);
+      await findByText('Deleting Org…');
+
+      expect(deleteObject).toHaveBeenCalledTimes(1);
+
+      const args = deleteObject.mock.calls[0][0];
+
       expect(args.objectType).toBe('scratch_org');
       expect(args.object.id).toEqual(defaultOrg.id);
     });

test/js/components/orgs/taskOrgCards.test.jsx

@@ -52,7 +52,7 @@ const defaultOrgs = {
     owner: sampleUser1.id,
     owner_gh_username: sampleGitHubUser1.username,
     owner_gh_id: sampleGitHubUser1.id,
-    expires_at: '2019-09-16T12:58:53.721Z',
+    expires_at: new Date(new Date().getTime() + 86400000).toISOString(),
     latest_commit: '617a512-longlong',
     latest_commit_url: '/test/commit/url/',
     latest_commit_at: '2019-08-16T12:58:53.721Z',
@@ -913,7 +913,28 @@ describe('<TaskOrgCards/>', () => {
         expect(args.object.id).toBe('org-id');
       });
     });
+    test('checks  and then deletes  expired org', async () => {
+      const { findByText } = setup({
+        orgs: {
+          ...defaultOrgs,
+          Dev: {
+            ...defaultOrgs.Dev,
+            expires_at: new Date().toISOString(),
+            unsaved_changes: {},
+            total_unsaved_changes: 0,
+            has_unsaved_changes: false,
+          },
+        },
+      });
+      await findByText('Deleting Org…');
+      expect.assertions(3);
+      expect(deleteObject).toHaveBeenCalledTimes(1);
+
+      const deleteArgs = deleteObject.mock.calls[0][0];
 
+      expect(deleteArgs.objectType).toBe('scratch_org');
+      expect(deleteArgs.object.id).toBe('org-id');
+    });
     describe('Dev org', () => {
       test('refreshes and then deletes org', async () => {
         const { findByText, getByText } = setup({

test/js/components/projects/detail.test.jsx

@@ -50,7 +50,7 @@ const defaultOrg = {
   owner: 'my-user',
   owner_gh_username: 'currentUser',
   owner_gh_id: 123456,
-  expires_at: '2019-09-16T12:58:53.721Z',
+  expires_at: new Date(new Date().getTime() + 86400000).toISOString(),
   latest_commit: '617a51',
   latest_commit_url: '/test/commit/url/',
   latest_commit_at: '2019-08-16T12:58:53.721Z',

test/js/components/tasks/detail.test.jsx

@@ -78,7 +78,7 @@ const defaultOrg = {
   owner: sampleUser1.id,
   owner_gh_username: sampleGitHubUser1.username,
   owner_gh_id: sampleGitHubUser1.id,
-  expires_at: '2019-09-16T12:58:53.721Z',
+  expires_at: new Date(new Date().getTime() + 86400000).toISOString(),
   latest_commit: '617a51',
   latest_commit_url: '/test/commit/url/',
   latest_commit_at: '2019-08-16T12:58:53.721Z',