Skip to content

Commit a84f576

Browse files
gaspergromgaspergrom
committed
Merge branch 'main' into improvement/tenant-removal
2 parents 95a8e72 + 6f3fb1c commit a84f576

File tree

132 files changed

+286
-9270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+286
-9270
lines changed

Diff for: ‎frontend/package-lock.json

-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎frontend/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
"pluralize": "^8.0.0",
6464
"qs": "^6.11.1",
6565
"socket.io-client": "^4.6.1",
66-
"unleash-proxy-client": "^2.4.3",
6766
"uuid": "8.3.0",
6867
"vite": "^4.4.7",
6968
"vue": "^3.3.1",

Diff for: ‎frontend/scripts/docker-entrypoint.sh

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ declare -a ENV_VARIABLES=(
2424
"VUE_APP_STRIPE_GROWTH_PLAN_PAYMENT_LINK"
2525
"VUE_APP_STRIPE_EAGLE_EYE_PLAN_PAYMENT_LINK"
2626
"VUE_APP_STRIPE_CUSTOMER_PORTAL_LINK"
27-
"VUE_APP_UNLEASH_URL"
28-
"VUE_APP_UNLEASH_API_KEY"
2927
"VUE_APP_IS_GIT_ENABLED"
3028
"VUE_APP_AUTH0_DOMAIN"
3129
"VUE_APP_AUTH0_CLIENT_ID"

Diff for: ‎frontend/src/app.vue

+1-10
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
</template>
2020

2121
<script>
22-
import { mapActions, mapState } from 'vuex';
22+
import { mapActions } from 'vuex';
2323
import AppResizePage from '@/modules/layout/pages/resize-page.vue';
24-
import { FeatureFlag } from '@/utils/featureFlag';
2524
import { mapActions as piniaMapActions, storeToRefs } from 'pinia';
2625
import { useActivityStore } from '@/modules/activity/store/pinia';
2726
import { useActivityTypeStore } from '@/modules/activity/store/type';
@@ -49,12 +48,6 @@ export default {
4948
};
5049
},
5150
52-
computed: {
53-
...mapState({
54-
featureFlag: (state) => state.tenant.featureFlag,
55-
}),
56-
},
57-
5851
watch: {
5952
tenant: {
6053
handler(tenant, oldTenant) {
@@ -67,8 +60,6 @@ export default {
6760
},
6861
6962
async created() {
70-
FeatureFlag.init(this.tenant);
71-
7263
window.addEventListener('resize', this.handleResize);
7364
this.handleResize();
7465
const queryParameters = new URLSearchParams(window.location.search);

Diff for: ‎frontend/src/config.js

-8
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ const defaultConfig = {
3131
env: import.meta.env.VUE_APP_ENV,
3232
hotjarKey: import.meta.env.VUE_APP_HOTJAR_KEY,
3333
nangoUrl: import.meta.env.VUE_APP_NANGO_URL,
34-
unleash: {
35-
apiKey: import.meta.env.VUE_APP_UNLEASH_API_KEY,
36-
url: import.meta.env.VUE_APP_UNLEASH_URL,
37-
},
3834
formbricks: {
3935
url: import.meta.env.VUE_APP_FORMBRICKS_URL,
4036
environmentId: import.meta.env.VUE_APP_FORMBRICKS_ENVIRONMENT_ID,
@@ -97,10 +93,6 @@ const composedConfig = {
9793
nangoUrl: 'CROWD_VUE_APP_NANGO_URL',
9894
typeformId: 'CROWD_VUE_APP_TYPEFORM_ID',
9995
typeformTitle: 'CROWD_VUE_APP_TYPEFORM_TITLE',
100-
unleash: {
101-
apiKey: 'CROWD_VUE_APP_UNLEASH_API_KEY',
102-
url: 'CROWD_VUE_APP_UNLEASH_URL',
103-
},
10496
formbricks: {
10597
url: 'CROWD_VUE_APP_FORMBRICKS_URL',
10698
environmentId: 'CROWD_VUE_APP_FORMBRICKS_ENVIRONMENT_ID',

Diff for: ‎frontend/src/config/integrations/devto/components/devto-connect-drawer.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
:disabled="loading"
168168
@click="cancel"
169169
>
170-
<app-i18n code="common.cancel" />
170+
Cancel
171171
</el-button>
172172
<el-button
173173
id="devConnect"
@@ -178,7 +178,7 @@
178178
:loading="loading"
179179
@click="save"
180180
>
181-
<app-i18n code="common.connect" />
181+
Connect
182182
</el-button>
183183
</div>
184184
</template>

Diff for: ‎frontend/src/config/integrations/gerrit/components/gerrit-settings-drawer.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
:loading="loading"
8686
@click="connect"
8787
>
88-
<app-i18n code="common.connect" />
88+
Connect
8989
</el-button>
9090
</div>
9191
</template>

Diff for: ‎frontend/src/config/integrations/hackernews/components/hackernews-settings-drawer.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
:disabled="loading"
104104
@click="cancel"
105105
>
106-
<app-i18n code="common.cancel" />
106+
Cancel
107107
</el-button>
108108
<el-button
109109
id="devConnect"
@@ -112,7 +112,7 @@
112112
:loading="loading"
113113
@click="save"
114114
>
115-
<app-i18n code="common.connect" />
115+
Connect
116116
</el-button>
117117
</div>
118118
</template>

Diff for: ‎frontend/src/config/integrations/linkedin/components/linkedin-settings-drawer.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
class="btn btn--md btn--secondary"
8484
@click="isVisible = false"
8585
>
86-
<app-i18n code="common.cancel" />
86+
Cancel
8787
</el-button>
8888
<el-button
8989
class="btn btn--md btn--primary"

Diff for: ‎frontend/src/config/integrations/reddit/components/reddit-settings-drawer.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
class="btn btn--md btn--secondary"
9292
@click="isVisible = false"
9393
>
94-
<app-i18n code="common.cancel" />
94+
Cancel
9595
</el-button>
9696
<el-button
9797
class="btn btn--md btn--primary"

Diff for: ‎frontend/src/config/integrations/stackoverflow/components/stackoverflow-settings-drawer.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
class="btn btn--md btn--secondary"
140140
@click="doCancel"
141141
>
142-
<app-i18n code="common.cancel" />
142+
Cancel
143143
</el-button>
144144
<el-button
145145
:loading="isVolumeUpdating"

Diff for: ‎frontend/src/config/integrations/twitter/components/twitter-settings-drawer.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</el-button>
3939
<div class="flex gap-4">
4040
<el-button class="btn btn--md btn--bordered" @click="isVisible = false">
41-
<app-i18n code="common.cancel" />
41+
Cancel
4242
</el-button>
4343
<a
4444
class="btn btn--md btn--primary"

Diff for: ‎frontend/src/config/permissions/admin.ts

-10
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ const admin: Record<LfPermission, boolean> = {
5555
[LfPermission.eagleEyeCreate]: true,
5656
[LfPermission.eagleEyeEdit]: true,
5757
[LfPermission.eagleEyeActionCreate]: true,
58-
[LfPermission.automationImport]: true,
59-
[LfPermission.automationCreate]: true,
60-
[LfPermission.automationEdit]: true,
61-
[LfPermission.automationDestroy]: true,
62-
[LfPermission.automationRead]: true,
63-
[LfPermission.automationCustomize]: true,
64-
[LfPermission.automationAutocomplete]: true,
65-
[LfPermission.noteCreate]: true,
66-
[LfPermission.noteEdit]: true,
67-
[LfPermission.noteDestroy]: true,
6858
[LfPermission.projectGroupCreate]: true,
6959
[LfPermission.projectGroupEdit]: true,
7060
[LfPermission.projectCreate]: true,

Diff for: ‎frontend/src/config/permissions/projectAdmin.ts

-10
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ const projectAdmin: Record<LfPermission, boolean> = {
5555
[LfPermission.eagleEyeCreate]: true,
5656
[LfPermission.eagleEyeEdit]: true,
5757
[LfPermission.eagleEyeActionCreate]: true,
58-
[LfPermission.automationImport]: true,
59-
[LfPermission.automationCreate]: true,
60-
[LfPermission.automationEdit]: true,
61-
[LfPermission.automationDestroy]: true,
62-
[LfPermission.automationRead]: true,
63-
[LfPermission.automationCustomize]: true,
64-
[LfPermission.automationAutocomplete]: true,
65-
[LfPermission.noteCreate]: true,
66-
[LfPermission.noteEdit]: true,
67-
[LfPermission.noteDestroy]: true,
6858
[LfPermission.projectGroupCreate]: false,
6959
[LfPermission.projectGroupEdit]: true,
7060
[LfPermission.projectCreate]: true,

Diff for: ‎frontend/src/config/permissions/readonly.ts

-10
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ const readonly: Record<LfPermission, boolean> = {
5555
[LfPermission.eagleEyeCreate]: false,
5656
[LfPermission.eagleEyeEdit]: false,
5757
[LfPermission.eagleEyeActionCreate]: false,
58-
[LfPermission.automationImport]: false,
59-
[LfPermission.automationCreate]: false,
60-
[LfPermission.automationEdit]: false,
61-
[LfPermission.automationDestroy]: false,
62-
[LfPermission.automationRead]: true,
63-
[LfPermission.automationCustomize]: false,
64-
[LfPermission.automationAutocomplete]: false,
65-
[LfPermission.noteCreate]: false,
66-
[LfPermission.noteEdit]: false,
67-
[LfPermission.noteDestroy]: false,
6858
[LfPermission.projectGroupCreate]: false,
6959
[LfPermission.projectGroupEdit]: false,
7060
[LfPermission.projectCreate]: false,

0 commit comments

Comments
 (0)