Prechádzať zdrojové kódy

Use blocked/allowed extension naming in typescript

Eric Charles 4 rokov pred
rodič
commit
85b72d6c5a

+ 4 - 4
packages/extensionmanager-extension/examples/listings/Makefile

@@ -15,8 +15,8 @@ dev: listings-uris
 	@exec python main.py \
 	  --dev \
 	  --no-browser \
-	  --LabServerApp.black_extensions_uris=${BLACK_LIST_URIS} \
-	  --LabServerApp.white_extensions_uris=${WHITE_LIST_URIS} \
+	  --LabServerApp.blocked_extensions_uris=${BLACK_LIST_URIS} \
+	  --LabServerApp.allowed_extensions_uris=${WHITE_LIST_URIS} \
 	  --LabServerApp.listings_refresh_seconds=${LISTINGS_REFRESH_SECONDS} \
 	  --LabServerApp.listings_request_options=${LISTINGS_REQUEST_OPTS}
 
@@ -25,7 +25,7 @@ watch: listings-uris
 	  --dev \
 	  --no-browser \
 	  --watch \
-	  --LabServerApp.black_extensions_uris=${BLACK_LIST_URIS} \
-	  --LabServerApp.white_extensions_uris=${WHITE_LIST_URIS} \
+	  --LabServerApp.blocked_extensions_uris=${BLACK_LIST_URIS} \
+	  --LabServerApp.allowed_extensions_uris=${WHITE_LIST_URIS} \
 	  --LabServerApp.listings_refresh_seconds=${LISTINGS_REFRESH_SECONDS} \
 	  --LabServerApp.listings_request_options=${LISTINGS_REQUEST_OPTS}

+ 11 - 11
packages/extensionmanager/src/listings.ts

@@ -39,8 +39,8 @@ export type ListResult = null | {
 };
 
 export interface IListingApi {
-  black_extensions_uris: string[];
-  white_extensions_uris: string[];
+  blocked_extensions_uris: string[];
+  allowed_extensions_uris: string[];
   blocked_extensions: IListEntry[];
   allowed_extensions: IListEntry[];
 }
@@ -63,8 +63,8 @@ export class Lister {
           entries: []
         };
         if (
-          data.black_extensions_uris.length > 0 &&
-          data.white_extensions_uris.length > 0
+          data.blocked_extensions_uris.length > 0 &&
+          data.allowed_extensions_uris.length > 0
         ) {
           console.warn('Simultaneous black and white list are not allowed.');
           this._listings = {
@@ -73,17 +73,17 @@ export class Lister {
             entries: []
           };
         } else if (
-          data.black_extensions_uris.length > 0 ||
-          data.white_extensions_uris.length > 0
+          data.blocked_extensions_uris.length > 0 ||
+          data.allowed_extensions_uris.length > 0
         ) {
           this._listings = {
-            mode: data.black_extensions_uris.length > 0 ? 'block' : 'allow',
+            mode: data.blocked_extensions_uris.length > 0 ? 'block' : 'allow',
             uris:
-              data.black_extensions_uris.length > 0
-                ? data.black_extensions_uris
-                : data.white_extensions_uris,
+              data.blocked_extensions_uris.length > 0
+                ? data.blocked_extensions_uris
+                : data.allowed_extensions_uris,
             entries:
-              data.black_extensions_uris.length > 0
+              data.blocked_extensions_uris.length > 0
                 ? data.blocked_extensions
                 : data.allowed_extensions
           };

+ 6 - 0
tsconfigdoc.json

@@ -65,6 +65,12 @@
     {
       "path": "./packages/csvviewer-extension"
     },
+    {
+      "path": "./packages/datastore"
+    },
+    {
+      "path": "./packages/datastore-extension"
+    },
     {
       "path": "./packages/debugger"
     },