Skip to content

Commit 2466bf0

Browse files
authored
Removed database FF, added changelog entries (baserow#4275)
1 parent 4a41d1a commit 2466bf0

File tree

13 files changed

+48
-80
lines changed

13 files changed

+48
-80
lines changed
Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
from django.urls import path
22

33
from baserow.api.search.views import WorkspaceSearchView
4-
from baserow.core.feature_flags import FF_WORKSPACE_SEARCH, feature_flag_is_enabled
54

65
app_name = "baserow.api.search"
76

8-
urlpatterns = []
9-
10-
if feature_flag_is_enabled(FF_WORKSPACE_SEARCH):
11-
urlpatterns = [
12-
path(
13-
"workspace/<int:workspace_id>/",
14-
WorkspaceSearchView.as_view(),
15-
name="workspace_search",
16-
),
17-
]
7+
urlpatterns = [
8+
path(
9+
"workspace/<int:workspace_id>/",
10+
WorkspaceSearchView.as_view(),
11+
name="workspace_search",
12+
),
13+
]
Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
from django.urls import re_path
22

3-
from baserow.core.feature_flags import FF_DATE_DEPENDENCY, feature_flag_is_enabled
3+
from .views import FieldRulesView, FieldRuleView, InvalidRowsView
44

55
app_name = "baserow.contrib.database.api.field_rules"
66

7-
urlpatterns = []
87

9-
if feature_flag_is_enabled(FF_DATE_DEPENDENCY):
10-
from .views import FieldRulesView, FieldRuleView, InvalidRowsView
11-
12-
urlpatterns += [
13-
re_path(r"^(?P<table_id>[0-9]+)/$", FieldRulesView.as_view(), name="list"),
14-
re_path(
15-
r"^(?P<table_id>[0-9]+)/rule/(?P<rule_id>[0-9]+)/$",
16-
FieldRuleView.as_view(),
17-
name="item",
18-
),
19-
re_path(
20-
r"^(?P<table_id>[0-9]+)/invalid-rows/$",
21-
InvalidRowsView.as_view(),
22-
name="invalid_rows",
23-
),
24-
]
8+
urlpatterns = [
9+
re_path(r"^(?P<table_id>[0-9]+)/$", FieldRulesView.as_view(), name="list"),
10+
re_path(
11+
r"^(?P<table_id>[0-9]+)/rule/(?P<rule_id>[0-9]+)/$",
12+
FieldRuleView.as_view(),
13+
name="item",
14+
),
15+
re_path(
16+
r"^(?P<table_id>[0-9]+)/invalid-rows/$",
17+
InvalidRowsView.as_view(),
18+
name="invalid_rows",
19+
),
20+
]

backend/src/baserow/contrib/database/field_rules/handlers.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from baserow.contrib.database.table.cache import clear_generated_model_cache
1616
from baserow.contrib.database.table.models import GeneratedTableModel, Table
1717
from baserow.core.db import specific_iterator
18-
from baserow.core.feature_flags import FF_DATE_DEPENDENCY, feature_flag_is_enabled
1918

2019
from .collector import FieldRuleCollector
2120
from .exceptions import FieldRuleTableMismatch, NoRuleError
@@ -50,8 +49,6 @@ def has_field_rules(self) -> bool:
5049
Returns `True` if the table contains active field rules.
5150
"""
5251

53-
if not feature_flag_is_enabled(FF_DATE_DEPENDENCY):
54-
return False
5552
if not self.table.field_rules_validity_column_added:
5653
return False
5754
return bool(self.applicable_rules_with_types)

backend/src/baserow/core/feature_flags.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
from baserow.core.exceptions import FeatureDisabledException
44

5-
FF_WORKSPACE_SEARCH = "workspace-search"
6-
FF_DATE_DEPENDENCY = "date_dependency"
75
FF_ENABLE_ALL = "*"
86

97

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "feature",
3+
"message": "Workspace search",
4+
"issue_origin": "github",
5+
"issue_number": 3826,
6+
"domain": "database",
7+
"bullet_points": [],
8+
"created_at": "2025-11-17"
9+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"type": "feature",
3+
"message": "Date dependencies in table",
4+
"issue_origin": "github",
5+
"issue_number": 3829,
6+
"domain": "database",
7+
"bullet_points": [],
8+
"created_at": "2025-11-17"
9+
}

enterprise/web-frontend/modules/baserow_enterprise/components/dateDependency/DateDependencyMenuItem.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div
3-
v-if="showEntry && featureFlagEnabled && (hasPermission || !hasFeature)"
3+
v-if="showEntry && (hasPermission || !hasFeature)"
44
class="context__menu-item"
55
>
66
<div>
@@ -43,7 +43,6 @@
4343
import EnterpriseFeatures from '@baserow_enterprise/features'
4444
import PaidFeaturesModal from '@baserow_premium/components/PaidFeaturesModal'
4545
import DateDependencyModal from '@baserow_enterprise/components/dateDependency/DateDependencyModal'
46-
import { FF_DATE_DEPENDENCY } from '@baserow/modules/core/plugins/featureFlags'
4746
4847
export default {
4948
name: 'DateDependencyMenuItem',
@@ -76,9 +75,6 @@ export default {
7675
this.database.workspace.id
7776
)
7877
},
79-
featureFlagEnabled() {
80-
return this.$featureFlagIsEnabled(FF_DATE_DEPENDENCY)
81-
},
8278
hasPermission() {
8379
return this.$hasPermission(
8480
'database.table.field_rules.set_field_rules',

enterprise/web-frontend/modules/baserow_enterprise/dateDependencyTypes.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import _ from 'lodash'
22
import { Registerable } from '@baserow/modules/core/registry'
33
import DateDependencyMenuItem from '@baserow_enterprise/components/dateDependency/DateDependencyMenuItem'
44
import TimelineFieldRuleType from '@baserow_premium/timelineFieldRuleType'
5-
import { FF_DATE_DEPENDENCY } from '@baserow/modules/core/plugins/featureFlags'
65
import DateDependencyConnection from '@baserow_enterprise/components/dateDependency/DateDependencyConnection'
76

87
// Date dependency on timeline views
@@ -104,7 +103,6 @@ export class DateDependencyTimelineComponent extends TimelineFieldRuleType {
104103

105104
getTimelineFieldRuleComponent(rule, view, database) {
106105
if (
107-
this.app.$featureFlagIsEnabled(FF_DATE_DEPENDENCY) &&
108106
this.app.$hasPermission(
109107
'database.table.field_rules.read_field_rules',
110108
view.table,

enterprise/web-frontend/modules/baserow_enterprise/plugin.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ import {
8888
} from '@baserow_enterprise/dateDependencyTypes'
8989
import { CustomCodeBuilderSettingType } from '@baserow_enterprise/builderSettingTypes'
9090
import { RealtimePushTwoWaySyncStrategyType } from '@baserow_enterprise/twoWaySyncStrategyTypes'
91-
import { FF_DATE_DEPENDENCY } from '@baserow/modules/core/plugins/featureFlags'
9291

9392
export default (context) => {
9493
const { app, isDev, store } = context
@@ -240,16 +239,11 @@ export default (context) => {
240239
new BuilderFileInputElementPaidFeature(context)
241240
)
242241

243-
if (app.$featureFlagIsEnabled(FF_DATE_DEPENDENCY)) {
244-
app.$registry.register(
245-
'paidFeature',
246-
new DateDependencyPaidFeature(context)
247-
)
248-
app.$registry.register(
249-
'timelineFieldRules',
250-
new DateDependencyTimelineComponent(context)
251-
)
252-
}
242+
app.$registry.register('paidFeature', new DateDependencyPaidFeature(context))
243+
app.$registry.register(
244+
'timelineFieldRules',
245+
new DateDependencyTimelineComponent(context)
246+
)
253247
app.$registry.register(
254248
'fieldContextItem',
255249
new DateDependencyContextItemType(context)

web-frontend/modules/core/components/sidebar/SidebarMenu.vue

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<div class="sidebar__section" ph-autocapture="sidebar" data-highlight="menu">
33
<ul class="tree">
44
<SidebarSearch
5-
v-if="$featureFlagIsEnabled(FF_WORKSPACE_SEARCH)"
65
:selected-workspace="selectedWorkspace"
76
@open-workspace-search="openWorkspaceSearch"
87
/>
@@ -151,7 +150,6 @@
151150
<script>
152151
import { mapGetters } from 'vuex'
153152
154-
import { FF_WORKSPACE_SEARCH } from '@baserow/modules/core/plugins/featureFlags'
155153
import TrashModal from '@baserow/modules/core/components/trash/TrashModal'
156154
import NotificationPanel from '@baserow/modules/core/components/NotificationPanel'
157155
import WorkspaceMemberInviteModal from '@baserow/modules/core/components/workspace/WorkspaceMemberInviteModal'
@@ -178,11 +176,6 @@ export default {
178176
default: false,
179177
},
180178
},
181-
data() {
182-
return {
183-
FF_WORKSPACE_SEARCH,
184-
}
185-
},
186179
computed: {
187180
sidebarWorkspaceComponents() {
188181
return Object.values(this.$registry.getAll('plugin'))

0 commit comments

Comments
 (0)