fix: hide samples by default when enable_samples_on_show_sample_rows_tags is true

Author: joostboon

macros/edr/materializations/test/test.sql

@@ -77,7 +77,9 @@
 
     {% if disable_test_samples %} {% set sample_limit = 0 %}
     {% elif not elementary.is_show_sample_rows_table(flattened_test) %}
-        {% if elementary.is_pii_table(flattened_test) %} {% set sample_limit = 0 %}
+        {% if elementary.get_config_var("enable_samples_on_show_sample_rows_tags") %}
+            {% set sample_limit = 0 %}
+        {% elif elementary.is_pii_table(flattened_test) %} {% set sample_limit = 0 %}
         {% elif elementary.should_disable_sampling_for_pii(flattened_test) %}
             {% set sample_limit = 0 %}
         {% endif %}

macros/edr/system/system_utils/is_show_sample_rows_table.sql

@@ -17,13 +17,15 @@
         | list
     ) %}
 
-    {# PII takes precedence: if model has a PII tag, show_sample_rows is ignored #}
-    {% set raw_pii_tags = elementary.get_config_var("pii_tags") %}
-    {% if raw_pii_tags is string %} {% set pii_tags = [raw_pii_tags | lower] %}
-    {% else %} {% set pii_tags = (raw_pii_tags or []) | map("lower") | list %}
-    {% endif %}
-    {% if elementary.lists_intersection(model_tags, pii_tags) | length > 0 %}
-        {% do return(false) %}
+    {# PII takes precedence over show_sample_rows, but only when PII hiding is enabled #}
+    {% if elementary.get_config_var("disable_samples_on_pii_tags") %}
+        {% set raw_pii_tags = elementary.get_config_var("pii_tags") %}
+        {% if raw_pii_tags is string %} {% set pii_tags = [raw_pii_tags | lower] %}
+        {% else %} {% set pii_tags = (raw_pii_tags or []) | map("lower") | list %}
+        {% endif %}
+        {% if elementary.lists_intersection(model_tags, pii_tags) | length > 0 %}
+            {% do return(false) %}
+        {% endif %}
     {% endif %}
 
     {% set intersection = elementary.lists_intersection(model_tags, show_tags) %}