feat(ui): "blacklist" -> "denylist"

invokeai/frontend/web/src/app/store.ts

@@ -21,15 +21,15 @@ import nodesReducer from 'features/nodes/store/nodesSlice';
 
 import { socketioMiddleware } from './socketio/middleware';
 import { socketMiddleware } from 'services/events/middleware';
-import { canvasBlacklist } from 'features/canvas/store/canvasPersistBlacklist';
+import { canvasDenylist } from 'features/canvas/store/canvasPersistDenylist';
-import { galleryBlacklist } from 'features/gallery/store/galleryPersistBlacklist';
+import { galleryDenylist } from 'features/gallery/store/galleryPersistDenylist';
-import { generationBlacklist } from 'features/parameters/store/generationPersistBlacklist';
+import { generationDenylist } from 'features/parameters/store/generationPersistDenylist';
-import { lightboxBlacklist } from 'features/lightbox/store/lightboxPersistBlacklist';
+import { lightboxDenylist } from 'features/lightbox/store/lightboxPersistDenylist';
-import { modelsBlacklist } from 'features/system/store/modelsPersistBlacklist';
+import { modelsDenylist } from 'features/system/store/modelsPersistDenylist';
-import { nodesBlacklist } from 'features/nodes/store/nodesPersistBlacklist';
+import { nodesDenylist } from 'features/nodes/store/nodesPersistDenylist';
-import { postprocessingBlacklist } from 'features/parameters/store/postprocessingPersistBlacklist';
+import { postprocessingDenylist } from 'features/parameters/store/postprocessingPersistDenylist';
-import { systemBlacklist } from 'features/system/store/systemPersistsBlacklist';
+import { systemDenylist } from 'features/system/store/systemPersistsDenylist';
-import { uiBlacklist } from 'features/ui/store/uiPersistBlacklist';
+import { uiDenylist } from 'features/ui/store/uiPersistDenylist';
 
 /**
  * redux-persist provides an easy and reliable way to persist state across reloads.
@@ -40,9 +40,9 @@ import { uiBlacklist } from 'features/ui/store/uiPersistBlacklist';
  *   - Connection/processing status
  *   - Availability of external libraries like ESRGAN/GFPGAN
  *
- * These can be blacklisted in redux-persist.
+ * These can be denylisted in redux-persist.
  *
- * The necesssary nested persistors with blacklists are configured below.
+ * The necesssary nested persistors with denylists are configured below.
  */
 
 const rootReducer = combineReducers({
@@ -66,18 +66,18 @@ const rootPersistConfig = getPersistConfig({
   storage,
   rootReducer,
   blacklist: [
-    ...canvasBlacklist,
+    ...canvasDenylist,
-    ...galleryBlacklist,
+    ...galleryDenylist,
-    ...generationBlacklist,
+    ...generationDenylist,
-    ...lightboxBlacklist,
+    ...lightboxDenylist,
-    ...modelsBlacklist,
+    ...modelsDenylist,
-    ...nodesBlacklist,
+    ...nodesDenylist,
-    ...postprocessingBlacklist,
+    ...postprocessingDenylist,
-    // ...resultsBlacklist,
+    // ...resultsDenylist,
     'results',
-    ...systemBlacklist,
+    ...systemDenylist,
-    ...uiBlacklist,
+    ...uiDenylist,
-    // ...uploadsBlacklist,
+    // ...uploadsDenylist,
     'uploads',
     'hotkeys',
     'config',

invokeai/frontend/web/src/features/canvas/store/canvasPersistBlacklist.ts

@@ -1,14 +0,0 @@
-import { CanvasState } from './canvasTypes';
-
-/**
- * Canvas slice persist blacklist
- */
-const itemsToBlacklist: (keyof CanvasState)[] = [
-  'cursorPosition',
-  'isCanvasInitialized',
-  'doesCanvasNeedScaling',
-];
-
-export const canvasBlacklist = itemsToBlacklist.map(
-  (blacklistItem) => `canvas.${blacklistItem}`
-);

invokeai/frontend/web/src/features/canvas/store/canvasPersistDenylist.ts

@@ -0,0 +1,14 @@
+import { CanvasState } from './canvasTypes';
+
+/**
+ * Canvas slice persist denylist
+ */
+const itemsToDenylist: (keyof CanvasState)[] = [
+  'cursorPosition',
+  'isCanvasInitialized',
+  'doesCanvasNeedScaling',
+];
+
+export const canvasDenylist = itemsToDenylist.map(
+  (denylistItem) => `canvas.${denylistItem}`
+);

invokeai/frontend/web/src/features/gallery/store/galleryPersistDenylist.ts

@@ -1,9 +1,9 @@
 import { GalleryState } from './gallerySlice';
 
 /**
- * Gallery slice persist blacklist
+ * Gallery slice persist denylist
  */
-const itemsToBlacklist: (keyof GalleryState)[] = [
+const itemsToDenylist: (keyof GalleryState)[] = [
   'categories',
   'currentCategory',
   'currentImage',
@@ -12,6 +12,6 @@ const itemsToBlacklist: (keyof GalleryState)[] = [
   'intermediateImage',
 ];
 
-export const galleryBlacklist = itemsToBlacklist.map(
+export const galleryDenylist = itemsToDenylist.map(
-  (blacklistItem) => `gallery.${blacklistItem}`
+  (denylistItem) => `gallery.${denylistItem}`
 );

invokeai/frontend/web/src/features/gallery/store/resultsPersistBlacklist.ts

@@ -1,12 +0,0 @@
-import { ResultsState } from './resultsSlice';
-
-/**
- * Results slice persist blacklist
- *
- * Currently blacklisting results slice entirely, see persist config in store.ts
- */
-const itemsToBlacklist: (keyof ResultsState)[] = [];
-
-export const resultsBlacklist = itemsToBlacklist.map(
-  (blacklistItem) => `results.${blacklistItem}`
-);

invokeai/frontend/web/src/features/gallery/store/resultsPersistDenylist.ts

@@ -0,0 +1,12 @@
+import { ResultsState } from './resultsSlice';
+
+/**
+ * Results slice persist denylist
+ *
+ * Currently denylisting results slice entirely, see persist config in store.ts
+ */
+const itemsToDenylist: (keyof ResultsState)[] = [];
+
+export const resultsDenylist = itemsToDenylist.map(
+  (denylistItem) => `results.${denylistItem}`
+);

invokeai/frontend/web/src/features/gallery/store/uploadsPersistBlacklist.ts

@@ -1,12 +0,0 @@
-import { UploadsState } from './uploadsSlice';
-
-/**
- * Uploads slice persist blacklist
- *
- * Currently blacklisting uploads slice entirely, see persist config in store.ts
- */
-const itemsToBlacklist: (keyof UploadsState)[] = [];
-
-export const uploadsBlacklist = itemsToBlacklist.map(
-  (blacklistItem) => `uploads.${blacklistItem}`
-);

invokeai/frontend/web/src/features/gallery/store/uploadsPersistDenylist.ts

@@ -0,0 +1,12 @@
+import { UploadsState } from './uploadsSlice';
+
+/**
+ * Uploads slice persist denylist
+ *
+ * Currently denylisting uploads slice entirely, see persist config in store.ts
+ */
+const itemsToDenylist: (keyof UploadsState)[] = [];
+
+export const uploadsDenylist = itemsToDenylist.map(
+  (denylistItem) => `uploads.${denylistItem}`
+);

invokeai/frontend/web/src/features/lightbox/store/lightboxPersistBlacklist.ts

@@ -1,10 +0,0 @@
-import { LightboxState } from './lightboxSlice';
-
-/**
- * Lightbox slice persist blacklist
- */
-const itemsToBlacklist: (keyof LightboxState)[] = ['isLightboxOpen'];
-
-export const lightboxBlacklist = itemsToBlacklist.map(
-  (blacklistItem) => `lightbox.${blacklistItem}`
-);

invokeai/frontend/web/src/features/lightbox/store/lightboxPersistDenylist.ts

@@ -0,0 +1,10 @@
+import { LightboxState } from './lightboxSlice';
+
+/**
+ * Lightbox slice persist denylist
+ */
+const itemsToDenylist: (keyof LightboxState)[] = ['isLightboxOpen'];
+
+export const lightboxDenylist = itemsToDenylist.map(
+  (denylistItem) => `lightbox.${denylistItem}`
+);

invokeai/frontend/web/src/features/nodes/store/nodesPersistBlacklist.ts

@@ -1,13 +0,0 @@
-import { NodesState } from './nodesSlice';
-
-/**
- * Nodes slice persist blacklist
- */
-const itemsToBlacklist: (keyof NodesState)[] = [
-  'schema',
-  'invocationTemplates',
-];
-
-export const nodesBlacklist = itemsToBlacklist.map(
-  (blacklistItem) => `nodes.${blacklistItem}`
-);

invokeai/frontend/web/src/features/nodes/store/nodesPersistDenylist.ts

@@ -0,0 +1,10 @@
+import { NodesState } from './nodesSlice';
+
+/**
+ * Nodes slice persist denylist
+ */
+const itemsToDenylist: (keyof NodesState)[] = ['schema', 'invocationTemplates'];
+
+export const nodesDenylist = itemsToDenylist.map(
+  (denylistItem) => `nodes.${denylistItem}`
+);

invokeai/frontend/web/src/features/nodes/util/parseSchema.ts

@@ -13,7 +13,7 @@ import {
   buildOutputFieldTemplates,
 } from './fieldTemplateBuilders';
 
-const invocationBlacklist = ['Graph', 'Collect', 'LoadImage'];
+const invocationDenylist = ['Graph', 'Collect', 'LoadImage'];
 
 export const parseSchema = (openAPI: OpenAPIV3.Document) => {
   // filter out non-invocation schemas, plus some tricky invocations for now
@@ -22,7 +22,7 @@ export const parseSchema = (openAPI: OpenAPIV3.Document) => {
     (schema, key) =>
       key.includes('Invocation') &&
       !key.includes('InvocationOutput') &&
-      !invocationBlacklist.some((blacklistItem) => key.includes(blacklistItem))
+      !invocationDenylist.some((denylistItem) => key.includes(denylistItem))
   ) as (OpenAPIV3.ReferenceObject | InvocationSchemaObject)[];
 
   const invocations = filteredSchemas.reduce<

invokeai/frontend/web/src/features/parameters/store/generationPersistBlacklist.ts

@@ -1,10 +0,0 @@
-import { GenerationState } from './generationSlice';
-
-/**
- * Generation slice persist blacklist
- */
-const itemsToBlacklist: (keyof GenerationState)[] = [];
-
-export const generationBlacklist = itemsToBlacklist.map(
-  (blacklistItem) => `generation.${blacklistItem}`
-);

invokeai/frontend/web/src/features/parameters/store/generationPersistDenylist.ts

@@ -0,0 +1,10 @@
+import { GenerationState } from './generationSlice';
+
+/**
+ * Generation slice persist denylist
+ */
+const itemsToDenylist: (keyof GenerationState)[] = [];
+
+export const generationDenylist = itemsToDenylist.map(
+  (denylistItem) => `generation.${denylistItem}`
+);

invokeai/frontend/web/src/features/parameters/store/postprocessingPersistBlacklist.ts

@@ -1,10 +0,0 @@
-import { PostprocessingState } from './postprocessingSlice';
-
-/**
- * Postprocessing slice persist blacklist
- */
-const itemsToBlacklist: (keyof PostprocessingState)[] = [];
-
-export const postprocessingBlacklist = itemsToBlacklist.map(
-  (blacklistItem) => `postprocessing.${blacklistItem}`
-);

invokeai/frontend/web/src/features/parameters/store/postprocessingPersistDenylist.ts

@@ -0,0 +1,10 @@
+import { PostprocessingState } from './postprocessingSlice';
+
+/**
+ * Postprocessing slice persist denylist
+ */
+const itemsToDenylist: (keyof PostprocessingState)[] = [];
+
+export const postprocessingDenylist = itemsToDenylist.map(
+  (denylistItem) => `postprocessing.${denylistItem}`
+);

invokeai/frontend/web/src/features/system/store/modelsPersistBlacklist.ts

@@ -1,10 +0,0 @@
-import { ModelsState } from './modelSlice';
-
-/**
- * Models slice persist blacklist
- */
-const itemsToBlacklist: (keyof ModelsState)[] = ['entities', 'ids'];
-
-export const modelsBlacklist = itemsToBlacklist.map(
-  (blacklistItem) => `models.${blacklistItem}`
-);

invokeai/frontend/web/src/features/system/store/modelsPersistDenylist.ts

@@ -0,0 +1,10 @@
+import { ModelsState } from './modelSlice';
+
+/**
+ * Models slice persist denylist
+ */
+const itemsToDenylist: (keyof ModelsState)[] = ['entities', 'ids'];
+
+export const modelsDenylist = itemsToDenylist.map(
+  (denylistItem) => `models.${denylistItem}`
+);

invokeai/frontend/web/src/features/system/store/systemPersistsDenylist.ts

@@ -1,9 +1,9 @@
 import { SystemState } from './systemSlice';
 
 /**
- * System slice persist blacklist
+ * System slice persist denylist
  */
-const itemsToBlacklist: (keyof SystemState)[] = [
+const itemsToDenylist: (keyof SystemState)[] = [
   'currentIteration',
   'currentStatus',
   'currentStep',
@@ -23,6 +23,6 @@ const itemsToBlacklist: (keyof SystemState)[] = [
   'wasSchemaParsed',
 ];
 
-export const systemBlacklist = itemsToBlacklist.map(
+export const systemDenylist = itemsToDenylist.map(
-  (blacklistItem) => `system.${blacklistItem}`
+  (denylistItem) => `system.${denylistItem}`
 );

invokeai/frontend/web/src/features/ui/store/uiPersistBlacklist.ts

@@ -1,10 +0,0 @@
-import { UIState } from './uiTypes';
-
-/**
- * UI slice persist blacklist
- */
-const itemsToBlacklist: (keyof UIState)[] = [];
-
-export const uiBlacklist = itemsToBlacklist.map(
-  (blacklistItem) => `ui.${blacklistItem}`
-);

invokeai/frontend/web/src/features/ui/store/uiPersistDenylist.ts

@@ -0,0 +1,10 @@
+import { UIState } from './uiTypes';
+
+/**
+ * UI slice persist denylist
+ */
+const itemsToDenylist: (keyof UIState)[] = [];
+
+export const uiDenylist = itemsToDenylist.map(
+  (denylistItem) => `ui.${denylistItem}`
+);