Chores/segments, permissions and tags typescript #1930

kyle-ssg · 2023-02-19T11:27:03Z

Thanks for submitting a PR! Please check the boxes below:

I have run pre-commit to check linting
I have filled in the "Changes" section below?
I have filled in the "How did you test this code" section below?

Changes

Please describe.

How did you test this code?

Please describe.

# Conflicts: # frontend/package-lock.json # frontend/package.json

…chores/initial_typescript # Conflicts: # frontend/package-lock.json # frontend/package.json

…ypescript # Conflicts: # frontend/common/dispatcher/action-constants.js # frontend/common/utils/utils.tsx # frontend/web/components/EditPermissions.js # frontend/web/components/modals/CreateSegment.tsx # frontend/web/components/pages/WidgetPage.tsx

…ypescript # Conflicts: # frontend/common/constants.ts # frontend/common/stores/project-store.js # frontend/web/components/pages/SegmentsPage.tsx # frontend/web/components/pages/WidgetPage.tsx

kyle-ssg · 2023-02-24T09:58:22Z

frontend/web/components/pages/WidgetPage.tsx

@@ -1,18 +1,30 @@
-import React, {Component, useEffect, useState} from 'react';


This is a refactor of the Widget page to fix all the types, as part of this I have regression tested the integration. It fixes a few states

matthewelwell

Added a couple of minor comments on some (possible) typos. I will also do some testing in the Uffizzi environment.

frontend/common/utils/utils.tsx

frontend/web/components/pages/AuditLogPage.tsx

matthewelwell · 2023-02-24T12:58:08Z

A couple of issues I've found:

Unable to add new rules / conditions to a segment:

Screen.Recording.2023-02-24.at.12.45.36.mov

Registering as a user from an invite without any permissions gives a blank screen and the following console error:

react-dom.production.min.js:187 ReferenceError: Permission is not defined
    at Object.children (App.js:343:66)
    at r.render (AccountProvider.js:98:24)
    at da (react-dom.production.min.js:173:192)
    at ca (react-dom.production.min.js:172:282)
    at Ns (react-dom.production.min.js:247:361)
    at xs (react-dom.production.min.js:216:164)
    at ks (react-dom.production.min.js:210:471)
    at ys (react-dom.production.min.js:206:372)
    at react-dom.production.min.js:114:115
    at t.unstable_runWithPriority (scheduler.production.min.js:20:134)

More details here: #1801 (comment).

Note that, even when given view project / view environment permission the blank page / console error persists.

kyle-ssg · 2023-02-25T09:16:22Z

Something very weirds going on, since the E2E can obviously do this locally and on GH. Checking this out now after all of the conflicts

# Conflicts: # frontend/common/dispatcher/action-constants.js # frontend/common/dispatcher/app-actions.js # frontend/common/services/useIdentity.ts # frontend/common/types/requests.ts # frontend/common/types/responses.ts # frontend/common/utils/utils.tsx # frontend/web/components/ChipInput.tsx # frontend/web/components/modals/CreateSegment.tsx # frontend/web/components/pages/AuditLogPage.tsx # frontend/web/components/pages/UsersPage.tsx

… chores/segments_typescript

kyle-ssg · 2023-02-25T19:04:50Z

After looking into this, I realised that linting is missing on quite a few files which is how the Permissions import was missed. I'll have to do a follow up PR to resolve that.

kyle-ssg · 2023-02-27T08:29:00Z

frontend/common/providers/FeatureListProvider.js

@@ -46,10 +47,6 @@ const FeatureListProvider = class extends React.Component {
        AppActions.toggleFlag(i, environments, comment, environmentFlags, projectFlags);
    };

-    setFlag = (i, flag, environments) => {


Unused / action no longer exists

kyle-ssg · 2023-02-27T08:33:09Z

frontend/common/stores/base/_store.js

@@ -44,6 +44,7 @@ module.exports = Object.assign({}, EventEmitter.prototype, {

    loaded() {
        this.hasLoaded = true;
+        this.error = null;


This was causing the datadog widget to appear in the error state after loading

kyle-ssg · 2023-02-27T08:44:34Z

I've adjusted the lint slightly to make the next PR less huge and to rule out any possibility of further missing imports. Excluding superficial spacing lints, it got down to 0 errors.

matthewelwell

@kyle-ssg the two issues above seem to be resolved and I've been through the code again - all looks good to me.

kyle-ssg added 30 commits November 28, 2022 21:32

Initial typescript setup

684eff6

move babel preset to dependencies

b930c6d

Use functional components for button

543cdc6

Neaten

e4ef673

Optimise imports

eace502

Add invite button

36b0ddf

Remove logs

ef6dec7

Merge branch 'main' of github.com:Flagsmith/flagsmith

0e3e098

Merge branch 'main' of github.com:Flagsmith/flagsmith

0887f06

Merge branch 'main' of github.com:Flagsmith/flagsmith

a3de1a4

Merge branch 'main' of github.com:Flagsmith/flagsmith

80a9318

Merge branch 'main' into chores/initial_typescript

3e19be9

export ButtonOutline

a1cbffb

Initial RTK

76a2c37

Merge branch 'main' of github.com:Flagsmith/flagsmith

a86d001

Fix package-lock

6c3769f

redux toolkit

931d06e

Merge branch 'main' of github.com:Flagsmith/flagsmith

b35f267

Migrate segment select to rtk

cdd66ee

Remove unused function

e6f2f63

Merge branch 'main' into chores/initial_typescript

b04b8db

# Conflicts: # frontend/package-lock.json # frontend/package.json

package lock fix

f10228f

Move babel-plugin-module-resolver

eb30680

Remove SegmentListProvider

c917002

Neaten prop types

35bda28

Neaten prop types

ec8010d

Separate segments page from old store

95e7511

Downgrade testcafe/chrome

908698b

Merge branch 'main' into chores/initial_typescript

5966fbc

# Conflicts: # frontend/package-lock.json # frontend/package.json

Merge remote-tracking branch 'origin/chores/initial_typescript' into …

791a033

…chores/initial_typescript # Conflicts: # frontend/package-lock.json # frontend/package.json

kyle-ssg changed the base branch from chores/permissions_typescript to chores/identity_list_typescript February 24, 2023 08:15

kyle-ssg added 4 commits February 24, 2023 08:31

Merge branch 'main' into chores/identity_list_typescript

d30f6e5

Merge branch 'chores/identity_list_typescript' into chores/segments_t…

212020d

…ypescript # Conflicts: # frontend/common/constants.ts # frontend/common/stores/project-store.js # frontend/web/components/pages/SegmentsPage.tsx # frontend/web/components/pages/WidgetPage.tsx

Correct WidgetPage types

cecbc9d

kyle-ssg changed the title ~~Chores/segments and tags typescript~~ Chores/segments, permissions and tags typescript Feb 24, 2023

kyle-ssg mentioned this pull request Feb 24, 2023

Permissions TypeScript / Redux update #1801

Closed

3 tasks

Handle no features and toggling between error states

786816b

kyle-ssg commented Feb 24, 2023

View reviewed changes

matthewelwell reviewed Feb 24, 2023

View reviewed changes

frontend/common/utils/utils.tsx Outdated Show resolved Hide resolved

frontend/web/components/pages/AuditLogPage.tsx Outdated Show resolved Hide resolved

Add trailing slash to Tag PUT request

a803e0d

Base automatically changed from chores/identity_list_typescript to main February 24, 2023 13:14

kyle-ssg added 5 commits February 25, 2023 09:26

Unused import

1f410e5

Merge remote-tracking branch 'origin/chores/segments_typescript' into…

18e8a1e

… chores/segments_typescript

MultivariateOption

d26db77

Lint fixes

b104962

disabled styles

5150f25

kyle-ssg commented Feb 27, 2023

View reviewed changes

kyle-ssg added 3 commits February 27, 2023 08:34

Revert lint noise

5fd8f05

Revert lint noise

485ce0a

Re-add focus monitor

ccaac5b

matthewelwell approved these changes Feb 27, 2023

View reviewed changes

kyle-ssg merged commit 7481fda into main Feb 27, 2023

kyle-ssg deleted the chores/segments_typescript branch February 27, 2023 16:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chores/segments, permissions and tags typescript #1930

Chores/segments, permissions and tags typescript #1930

kyle-ssg commented Feb 19, 2023

kyle-ssg Feb 24, 2023

matthewelwell left a comment

matthewelwell commented Feb 24, 2023

kyle-ssg commented Feb 25, 2023 •

edited

Loading

kyle-ssg commented Feb 25, 2023

kyle-ssg Feb 27, 2023

kyle-ssg Feb 27, 2023

kyle-ssg commented Feb 27, 2023

matthewelwell left a comment

		@@ -1,18 +1,30 @@
		import React, {Component, useEffect, useState} from 'react';

Chores/segments, permissions and tags typescript #1930

Chores/segments, permissions and tags typescript #1930

Conversation

kyle-ssg commented Feb 19, 2023

Changes

How did you test this code?

kyle-ssg Feb 24, 2023

Choose a reason for hiding this comment

matthewelwell left a comment

Choose a reason for hiding this comment

matthewelwell commented Feb 24, 2023

kyle-ssg commented Feb 25, 2023 • edited Loading

kyle-ssg commented Feb 25, 2023

kyle-ssg Feb 27, 2023

Choose a reason for hiding this comment

kyle-ssg Feb 27, 2023

Choose a reason for hiding this comment

kyle-ssg commented Feb 27, 2023

matthewelwell left a comment

Choose a reason for hiding this comment

kyle-ssg commented Feb 25, 2023 •

edited

Loading