Ignore empty column changes (#225)

Fieldguide · May 24, 2022 · 67be333 · 67be333
1 parent 2dd1ab5
commit 67be333
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 12 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/...issions/columns/__tests__/columns.test.ts → ...rmissions/columns/__tests__/index.test.ts b/...issions/columns/__tests__/columns.test.ts → ...rmissions/columns/__tests__/index.test.ts
@@ -2,6 +2,30 @@ import {columnPermissionsViewFromTableChanges} from '..'
 import {emptyTablePermissionsChanges} from '../..'
 
 describe('columnPermissionsViewFromTableChanges', () => {
+  test('no permission changes', () => {
+    expect(
+      columnPermissionsViewFromTableChanges(emptyTablePermissionsChanges())
+    ).toStrictEqual(null)
+  })
+
+  test('no column changes', () => {
+    expect(
+      columnPermissionsViewFromTableChanges({
+        ...emptyTablePermissionsChanges(),
+        select_permissions: {
+          added: [],
+          modified: [
+            {
+              role: 'user',
+              columns: []
+            }
+          ],
+          deleted: []
+        }
+      })
+    ).toStrictEqual(null)
+  })
+
   test('add computed column', () => {
     expect(
       columnPermissionsViewFromTableChanges({

diff --git a/src/diff/tables/permissions/columns/functions.ts b/src/diff/tables/permissions/columns/functions.ts
@@ -17,16 +17,21 @@ import {assertNeverChangeType, iconFromChangeType} from '../../utils'
 
 import {isEqual} from 'lodash'
 
+/**
+ * Iterate through `tablePermissions` per role and operation that include column changes.
+ */
 export function* columnChangeIterator(
   tablePermissions: TablePermissionsChanges
 ): Generator<ColumnPermissionChange> {
   for (const permission of TablePermissions) {
     for (const changeType of ChangeTypes) {
       for (const {role, columns} of tablePermissions[permission][changeType]) {
-        yield {
-          permission,
-          role,
-          columns
+        if (true === columns || columns.length) {
+          yield {
+            permission,
+            role,
+            columns
+          }
         }
       }
     }

diff --git a/src/diff/tables/permissions/columns/index.ts b/src/diff/tables/permissions/columns/index.ts
@@ -142,7 +142,7 @@ export function columnPermissionsViewFromTableChanges(
       for (const {type} of columns) {
         columnChangeTypes.add(type)
       }
-    } else if (columns) {
+    } else {
       columnChangeCount.isLowerBound = true
       columnChangeTypes.add('modified')
     }