remove some cases for codacy cloud to avoid duplication + fix theme style for secondary button + add dependencies message

Author: nedaKaighobadi

package.json

@@ -44,12 +44,6 @@
     },
     "views": {
       "codacy-main": [
-        {
-          "type": "webview",
-          "id": "codacy.setupView",
-          "name": "Setup",
-          "when": "codacy:hasProject"
-        },
         {
           "id": "codacy:status",
           "name": "Status",
@@ -61,7 +55,7 @@
           "id": "codacy:cloud-status",
           "name": "Codacy Cloud",
           "icon": "$(library)",
-          "when": "codacy:hasProject && Codacy:PullRequestStateContext == NoPullRequest",
+          "when": "codacy:hasProject && Codacy:PullRequestStateContext == NoPullRequest && Codacy:CodacyCloudStateContext != NeedsAuthentication && Codacy:CodacyCloudStateContext != NeedsToAddOrganization && Codacy:CodacyCloudStateContext != NeedsToAddRepository",
           "initialSize": 1,
           "collapsed": false
         },
@@ -86,6 +80,14 @@
           "icon": "$(bug)",
           "initialSize": 3
         },
+        {
+          "type": "webview",
+          "id": "codacy.setupView",
+          "name": "Setup",
+          "when": "codacy:hasProject",
+          "collapsed": false,
+          "initialSize": 4
+        },
         {
           "id": "codacy:support",
           "name": "Help and Feedback",
@@ -105,11 +107,6 @@
         "contents": "Codacy Cloud is initializing...",
         "when": "Codacy:CodacyCloudStateContext == Initializing"
       },
-      {
-        "view": "codacy:cloud-status",
-        "contents": "You are not connected to Codacy. Connect to Codacy to customize your rules and scan every PR before it gets merged.\n[Connect to Codacy](command:codacy.codacyAuth)\n\nGet access to all features: coverage, DAST, SCA scanning, and more. [Learn more about Codacy](https://www.codacy.com/)",
-        "when": "Codacy:CodacyCloudStateContext == NeedsAuthentication"
-      },
       {
         "view": "codacy:cloud-status",
         "contents": "This project isn't a Git repository. To connect it to Codacy, initialize a Git repository first.",
@@ -130,11 +127,6 @@
         "contents": "An admin must approve your request to join the organization on Codacy.",
         "when": "Codacy:CodacyCloudStateContext == HasPendingJoinOrganization"
       },
-      {
-        "view": "codacy:cloud-status",
-        "contents": "This organization is not part of Codacy.\n[Add organization](command:codacy.codacyAuth)",
-        "when": "Codacy:CodacyCloudStateContext == NeedsToAddOrganization"
-      },
       {
         "view": "codacy:cloud-status",
         "contents": "Ensure full protection by adding PR-level scans to this repo so that no security vulnerabilities are added.\n[Add repository to Codacy](command:codacy.addRepository)\nAdds this Git repository to Codacy with your organization default scanning rules.",

src/views/SetupView.ts

@@ -418,6 +418,7 @@ export class SetupViewProvider implements vscode.WebviewViewProvider {
           <button id="install-cli-button">Install Codacy CLI</button>
           <p id="add-organization-section" style="display: none;">To customize the analysis, <button class="link-btn" id="add-organization-button">Add this organization to Codacy</button></p>
           <p id="add-repository-section" style="display: none;">To customize the analysis, <button class="link-btn" id="add-repository-button">Add this repository to Codacy</button></p>
+          <p id="dependencies-description">Installs required dependencies: Node, Python, Java</p>
         </div>
       </div>
     </li>
@@ -447,7 +448,7 @@ export class SetupViewProvider implements vscode.WebviewViewProvider {
 
   <div class="setup-item upgrade-box" id="upgrade-box">
     <p>Strengthen security and quality across all your repositories.</p>
-    <a href="https://www.codacy.com/pricing" target="_blank" rel="noopener noreferrer">
+    <a href="https://www.codacy.com/pricing" id="upgrade-button" target="_blank" rel="noopener noreferrer">
       <button class="secondary">Upgrade to PRO</button>
     </a>
   </div>

src/views/scripts/setupScript.js

@@ -67,7 +67,7 @@
           return
         }
         linkNode.textContent = `${params.provider}/${params.organization}`
-        linkNode.href = `https://app.codacy.com/${encodeURIComponent(params.provider)}/${encodeURIComponent(params.organization)}`
+        linkNode.href = `https://app.codacy.com/organizations/${encodeURIComponent(params.provider)}/${encodeURIComponent(params.organization)}`
         break
       case 'repository':
         if (!params.provider || !params.organization || !params.repository) {
@@ -177,6 +177,7 @@
    */
   function handleLoginStateChange(loggedIn, isOrgInCodacy, isRepoInCodacy, userInfo, organizationInfo, repositoryInfo) {
     const upgradeBox = document.getElementById('upgrade-box')
+    const upgradeButton = document.getElementById('upgrade-button')
     /** @type {HTMLImageElement | null} */
     const cloudIcon = /** @type {HTMLImageElement | null} */ (document.getElementById('cloud-icon'))
     const cloudDescription = document.getElementById('cloud-description')
@@ -193,32 +194,50 @@
       const userName = escapeHtml(userInfo?.name)
       const organizationProvider = escapeHtml(organizationInfo?.provider)
 
-      if (upgradeBox) {
-        upgradeBox.style.display = 'none'
-      }
       if (
         cloudIcon &&
         iconUris &&
         cloudDescription &&
         connectToCodacyButton &&
         addOrgButton &&
         addRepoButton &&
-        noOrgDescription
+        noOrgDescription &&
+        upgradeBox &&
+        upgradeButton
       ) {
         connectToCodacyButton.style.display = 'none'
         cloudIcon.src = iconUris.finished
         if (isOrgInCodacy && isRepoInCodacy) {
           addOrgButton.style.display = 'none'
           addRepoButton.style.display = 'none'
           noOrgDescription.style.display = 'none'
+          if (organizationInfo.billing === 'premium') {
+            upgradeBox.style.display = 'none'
+          } else {
+            upgradeBox.style.display = 'block'
+            upgradeButton.setAttribute(
+              'href',
+              `https://app.codacy.com/organizations/${encodeURIComponent(organizationProvider)}/${encodeURIComponent(organizationName)}/settings/billing`
+            )
+          }
           setCloudDescription(cloudDescription, {
             type: 'repository',
             params: { organization: organizationName, provider: organizationProvider, repository: repositoryName },
           })
         } else if (isOrgInCodacy) {
           addRepoButton.style.display = 'inline-block'
+          addOrgButton.style.display = 'none'
           noOrgDescription.style.display = 'none'
           cloudIcon.src = iconUris.warning
+          if (organizationInfo.billing === 'premium') {
+            upgradeBox.style.display = 'none'
+          } else {
+            upgradeBox.style.display = 'block'
+            upgradeButton.setAttribute(
+              'href',
+              `https://app.codacy.com/organizations/${encodeURIComponent(organizationProvider)}/${encodeURIComponent(organizationName)}/settings/billing`
+            )
+          }
           setCloudDescription(cloudDescription, {
             type: 'organization',
             params: { organization: organizationName, provider: organizationProvider },
@@ -228,6 +247,8 @@
           noOrgDescription.style.display = 'inline-block'
           addRepoButton.style.display = 'none'
           cloudIcon.src = iconUris.warning
+          upgradeBox.style.display = 'block'
+          upgradeButton.setAttribute('href', 'https://www.codacy.com/pricing')
           setCloudDescription(cloudDescription, { type: 'user', params: { user: userName } })
         }
       }
@@ -237,11 +258,13 @@
         addRepoButton &&
         noOrgDescription &&
         upgradeBox &&
+        upgradeButton &&
         cloudIcon &&
         cloudDescription &&
         connectToCodacyButton
       ) {
         upgradeBox.style.display = 'block'
+        upgradeButton.setAttribute('href', 'https://www.codacy.com/pricing')
         cloudIcon.src = iconUris.unfinished
         cloudDescription.textContent = 'Customize local analysis and keep your PRs up to standards in the IDE.'
         addOrgButton.style.display = 'none'
@@ -406,6 +429,7 @@
     const addRepositorySection = document.getElementById('add-repository-section')
     const installCliButton = document.getElementById('install-cli-button')
     const cliHeaderActions = document.getElementById('cli-header-actions')
+    const dependenciesDescription = document.getElementById('dependencies-description')
     /** @type {IconUris | undefined} */
     // @ts-expect-error - iconUris is injected by the extension
     const iconUris = window.iconUris
@@ -422,6 +446,9 @@
         if (installCliButton) {
           installCliButton.style.display = 'none'
         }
+        if (dependenciesDescription) {
+          dependenciesDescription.style.display = 'none'
+        }
         cliDescription.textContent = 'Codacy CLI installed'
         cliIcon.src = iconUris.finished
         if (addOrganizationSection && addRepositorySection) {
@@ -445,6 +472,9 @@
         if (installCliButton) {
           installCliButton.style.display = 'inline-block'
         }
+        if (dependenciesDescription) {
+          dependenciesDescription.style.display = 'inline-block'
+        }
         cliDescription.textContent = 'Get instant feedback as you type by analyzing your code locally.'
         cliIcon.src = iconUris.unfinished
       }

src/views/styles/main.css

@@ -56,6 +56,11 @@ body {
   margin-top: 8px;
 }
 
+#dependencies-description {
+  margin-top: 8px;
+  color: var(--vscode-disabledForeground);
+}
+
 .setup-item-header {
   display: flex;
   align-items: center;

src/views/styles/vscode.css

@@ -63,7 +63,7 @@ button:focus {
 }
 
 button.secondary {
-  color: var(--vscode-button-foreground);
+  color: var(--vscode-button-secondaryForeground);
   background: var(--vscode-button-secondaryBackground);
 }