From 4cb8e34aef9be4a90145d0f8ecd62695de4cd031 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Sun, 26 Apr 2020 14:08:50 -0700
Subject: [PATCH] Rename some old things

---
 .github/workflows/test.yml                        |  6 +++++-
 package.json                                      |  2 +-
 packages/insomnia-app/app/common/constants.js     | 14 ++++----------
 packages/insomnia-app/app/main/window-utils.js    |  4 ++--
 packages/insomnia-app/app/renderer.html           |  2 +-
 packages/insomnia-app/config/config.core.json     |  2 +-
 packages/insomnia-app/config/config.designer.json |  2 +-
 7 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c828b4db3..ce5728359 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,10 @@
 name: Test
 
-on: [push]
+on:
+  push:
+    tags-ignore:
+      - core@*
+      - designer@*
 
 jobs:
   Test:
diff --git a/package.json b/package.json
index 2478a7513..924f4ec5d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "insomnia",
   "private": true,
   "version": "1.0.0",
-  "repository": "https://github.com/kong/studio",
+  "repository": "https://github.com/kong/insomnia",
   "bugs": {
     "url": "https://github.com/kong/insomnia"
   },
diff --git a/packages/insomnia-app/app/common/constants.js b/packages/insomnia-app/app/common/constants.js
index f52534ab8..ea226c886 100644
--- a/packages/insomnia-app/app/common/constants.js
+++ b/packages/insomnia-app/app/common/constants.js
@@ -5,8 +5,8 @@ import * as electron from 'electron';
 import path from 'path';
 import mkdirp from 'mkdirp';
 import { getDataDirectory } from './misc';
-import { ACTIVITY_INSOMNIA } from '../ui/components/activity-bar/activity-bar';
 import type { GlobalActivity } from '../ui/components/activity-bar/activity-bar';
+import { ACTIVITY_INSOMNIA } from '../ui/components/activity-bar/activity-bar';
 
 // App Stuff
 
@@ -95,17 +95,11 @@ export function getClientString() {
   return `${getAppEnvironment()}::${getAppPlatform()}::${getAppVersion()}`;
 }
 
-export function getDocumentationUrl(slug) {
-  // Replace minor version with "x"
-  // 1.2.3        -> 1.2.x
-  // 1.2.3-beta.1 -> 1.2.x
-  const genericVersion = getAppVersion().replace(/(\d+\.\d+.)(\d+)(-.+)?/, '$1x');
-
-  // Return URL
-  return `https://docs.konghq.com/studio/${genericVersion}/${slug}`;
+export function getDocumentationUrl(slug: string): string {
+  return `https://support.insomnia.rest/${slug}`;
 }
 
-export function changelogUrl() {
+export function changelogUrl(): string {
   const { changelogBaseUrl, version } = appConfig();
   return `${changelogBaseUrl}/${version}`;
 }
diff --git a/packages/insomnia-app/app/main/window-utils.js b/packages/insomnia-app/app/main/window-utils.js
index 4c813eac1..25496b400 100644
--- a/packages/insomnia-app/app/main/window-utils.js
+++ b/packages/insomnia-app/app/main/window-utils.js
@@ -7,7 +7,7 @@ import {
   changelogUrl,
   getAppLongName,
   getAppName,
-  getAppVersion,
+  getAppVersion, getDocumentationUrl,
   isDevelopment,
   isMac,
   MNEMONIC_SYM,
@@ -241,7 +241,7 @@ export function createWindow() {
         label: `${MNEMONIC_SYM}Help and Support`,
         accelerator: !isMac() ? 'F1' : null,
         click: () => {
-          shell.openExternal('https://docs.konghq.com/studio/1.0.x/');
+          shell.openExternal(getDocumentationUrl(''));
         },
       },
       {
diff --git a/packages/insomnia-app/app/renderer.html b/packages/insomnia-app/app/renderer.html
index 5b71c31b5..53de80bc9 100644
--- a/packages/insomnia-app/app/renderer.html
+++ b/packages/insomnia-app/app/renderer.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src * kongstudio://*; img-src blob: data: * kongstudio://*; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src blob: data: mediastream: * insomnia://*;"
+      content="default-src * insomnia://*; img-src blob: data: * insomnia://*; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src blob: data: mediastream: * insomnia://*;"
     />
   </head>
   <body>
diff --git a/packages/insomnia-app/config/config.core.json b/packages/insomnia-app/config/config.core.json
index 1d064b9a6..4c1bdf5e2 100644
--- a/packages/insomnia-app/config/config.core.json
+++ b/packages/insomnia-app/config/config.core.json
@@ -12,7 +12,7 @@
   "theme": "default",
   "main": "main.min.js",
   "githubOrg": "Kong",
-  "githubRepo": "studio",
+  "githubRepo": "insomnia",
   "gaId": "<TODO>",
   "gaLocation": "<TODO>",
   "plugins": [
diff --git a/packages/insomnia-app/config/config.designer.json b/packages/insomnia-app/config/config.designer.json
index ec88774a0..c35bf6f7b 100644
--- a/packages/insomnia-app/config/config.designer.json
+++ b/packages/insomnia-app/config/config.designer.json
@@ -12,7 +12,7 @@
   "theme": "studio-light",
   "main": "main.min.js",
   "githubOrg": "Kong",
-  "githubRepo": "studio",
+  "githubRepo": "insomnia",
   "gaId": "G-N5Q23R42TP",
   "gaLocation": "https://desktop.designer.konghq.com",
   "plugins": [