Browse Source

ref: Clean up categories to match docs

- electron -> javascript.electron
- cordova -> javascript.cordova
- csharp -> dotnet
- java.android -> android
- cocoa -> apple
- native.*

Some of these are transitional and will need removed when docs gets synchronized.
David Cramer 4 years ago
parent
commit
769b1e1bea

+ 5 - 5
src/sentry/static/sentry/app/components/platformIcon.tsx

@@ -2,15 +2,13 @@ import React from 'react';
 import styled from '@emotion/styled';
 import styled from '@emotion/styled';
 
 
 const PLATFORM_TO_ICON = {
 const PLATFORM_TO_ICON = {
+  android: 'android',
   apple: 'apple',
   apple: 'apple',
   'apple-ios': 'apple',
   'apple-ios': 'apple',
   'apple-macos': 'apple',
   'apple-macos': 'apple',
-  cocoa: 'apple',
-  'cocoa-objc': 'apple',
-  'cocoa-swift': 'swift',
   cordova: 'cordova',
   cordova: 'cordova',
-  csharp: 'csharp',
-  'csharp-aspnetcore': 'dotnet',
+  dotnet: 'dotnet',
+  'dotnet-aspnetcore': 'dotnet',
   elixir: 'elixir',
   elixir: 'elixir',
   electron: 'electron',
   electron: 'electron',
   go: 'go',
   go: 'go',
@@ -26,6 +24,8 @@ const PLATFORM_TO_ICON = {
   'javascript-angularjs': 'angularjs',
   'javascript-angularjs': 'angularjs',
   'javascript-backbone': 'backbone',
   'javascript-backbone': 'backbone',
   'javascript-browser': 'javascript',
   'javascript-browser': 'javascript',
+  'javascript-cordova': 'cordova',
+  'javascript-electron': 'electron',
   'javascript-ember': 'ember',
   'javascript-ember': 'ember',
   'javascript-react': 'react',
   'javascript-react': 'react',
   'javascript-vue': 'vue',
   'javascript-vue': 'vue',

+ 9 - 8
src/sentry/static/sentry/app/data/platformCategories.tsx

@@ -19,6 +19,7 @@ const popular = [
   'node',
   'node',
   'react-native',
   'react-native',
   'javascript-angular',
   'javascript-angular',
+  'javascript-vue',
 ] as const;
 ] as const;
 
 
 const frontend = [
 const frontend = [
@@ -35,23 +36,20 @@ const frontend = [
 const mobile = [
 const mobile = [
   'android',
   'android',
   'apple-ios',
   'apple-ios',
-  'cocoa-objc',
-  'cocoa-swift',
-  'java-android',
   'cordova',
   'cordova',
+  'javascript-cordova',
   'react-native',
   'react-native',
   'flutter',
   'flutter',
 ] as const;
 ] as const;
 
 
 const backend = [
 const backend = [
-  'csharp',
   'dotnet',
   'dotnet',
   'dotnet-aspnetcore',
   'dotnet-aspnetcore',
   'elixir',
   'elixir',
   'go',
   'go',
   'go-http',
   'go-http',
-  'java-appengine',
   'java',
   'java',
+  'java-appengine',
   'java-log4j',
   'java-log4j',
   'java-log4j2',
   'java-log4j2',
   'java-logback',
   'java-logback',
@@ -94,12 +92,15 @@ const serverless = [
 
 
 const desktop = [
 const desktop = [
   'apple-macos',
   'apple-macos',
-  'cocoa',
-  'csharp',
+  'dotnet',
   'java',
   'java',
   'electron',
   'electron',
-  'minidump',
+  'javascript-electron',
   'native',
   'native',
+  'native-crashpad',
+  'native-breakpad',
+  'native-minidump',
+  'minidump',
 ] as const;
 ] as const;
 
 
 const categoryList = [
 const categoryList = [

+ 35 - 35
tests/fixtures/integration-docs/_platforms.json

@@ -3,56 +3,44 @@
     {
     {
       "integrations": [
       "integrations": [
         {
         {
-          "link": "https://docs.getsentry.com/clients/csharp/",
+          "link": "https://docs.getsentry.com/platforms/dotnet/",
           "type": "language",
           "type": "language",
-          "id": "csharp",
-          "name": "C#"
-        }
-      ],
-      "id": "csharp",
-      "name": "C#"
-    },
-    {
-      "integrations": [
-        {
-          "link": "https://docs.getsentry.com/clients/cocoa/",
-          "type": "language",
-          "id": "cocoa-swift",
-          "name": "Swift"
+          "id": "dotnet",
+          "name": ".NET"
         },
         },
         {
         {
-          "link": "https://docs.getsentry.com/clients/cocoa/",
+          "link": "https://docs.getsentry.com/platforms/dotnet/guides/aspnetcore/",
           "type": "language",
           "type": "language",
-          "id": "cocoa-objc",
-          "name": "Objective-C"
+          "id": "dotnet-aspnetcore",
+          "name": "ASP .NET Core"
         }
         }
       ],
       ],
-      "id": "cocoa",
-      "name": "Objective-C"
+      "id": "dotnet",
+      "name": ".NET"
     },
     },
     {
     {
       "integrations": [
       "integrations": [
         {
         {
-          "link": "https://docs.getsentry.com/clients/cordova/",
+          "link": "https://docs.getsentry.com/platforms/apple/",
           "type": "language",
           "type": "language",
-          "id": "cordova",
-          "name": "Cordova"
-        }
-      ],
-      "id": "cordova",
-      "name": "Cordova"
-    },
-    {
-      "integrations": [
+          "id": "apple",
+          "name": "Apple"
+        },
         {
         {
-          "link": "https://docs.getsentry.com/clients/electron/",
+          "link": "https://docs.getsentry.com/platforms/apple/guides/ios/",
           "type": "language",
           "type": "language",
-          "id": "electron",
-          "name": "Electron"
+          "id": "apple-ios",
+          "name": "iOS"
+        },
+        {
+          "link": "https://docs.getsentry.com/platforms/apple/guides/macos/",
+          "type": "language",
+          "id": "apple-macos",
+          "name": "macOS"
         }
         }
       ],
       ],
-      "id": "electron",
-      "name": "Electron"
+      "id": "apple",
+      "name": "Apple"
     },
     },
     {
     {
       "integrations": [
       "integrations": [
@@ -152,6 +140,18 @@
           "id": "javascript-backbone",
           "id": "javascript-backbone",
           "name": "Backbone"
           "name": "Backbone"
         },
         },
+        {
+          "link": "https://docs.getsentry.com/platforms/javascript/guides/cordova/",
+          "type": "language",
+          "id": "cordova",
+          "name": "Cordova"
+        },
+        {
+          "link": "https://docs.getsentry.com/platforms/javascript/guides/electron/",
+          "type": "language",
+          "id": "electron",
+          "name": "Electron"
+        },
         {
         {
           "link": "https://docs.getsentry.com/clients/javascript/integrations/ember/",
           "link": "https://docs.getsentry.com/clients/javascript/integrations/ember/",
           "type": "framework",
           "type": "framework",

File diff suppressed because it is too large
+ 0 - 0
tests/fixtures/integration-docs/android.json


File diff suppressed because it is too large
+ 0 - 0
tests/fixtures/integration-docs/apple-ios.json


File diff suppressed because it is too large
+ 0 - 0
tests/fixtures/integration-docs/apple-macos.json


File diff suppressed because it is too large
+ 0 - 0
tests/fixtures/integration-docs/apple.json


File diff suppressed because it is too large
+ 0 - 0
tests/fixtures/integration-docs/dotnet.json


File diff suppressed because it is too large
+ 0 - 0
tests/fixtures/integration-docs/javascript-electron.json


+ 1 - 4
tests/js/spec/components/platformPicker.spec.jsx

@@ -33,11 +33,8 @@ describe('PlatformPicker', function() {
         .map(node => node.prop('platform').id);
         .map(node => node.prop('platform').id);
 
 
       expect(filteredPlatforms).not.toContain('java');
       expect(filteredPlatforms).not.toContain('java');
-      expect(filteredPlatforms).toContain('cocoa-swift');
+      expect(filteredPlatforms).toContain('apple-ios');
       expect(filteredPlatforms).toContain('react-native');
       expect(filteredPlatforms).toContain('react-native');
-      expect(filteredPlatforms).toContain('cocoa-objc');
-      expect(filteredPlatforms).toContain('java-android');
-      expect(filteredPlatforms).toContain('cordova');
     });
     });
 
 
     it('should render renderPlatformList with Python when filtered with py', function() {
     it('should render renderPlatformList with Python when filtered with py', function() {

Some files were not shown because too many files changed in this diff