Skip to content

Conversation

@gu-stav
Copy link
Contributor

@gu-stav gu-stav commented Jun 21, 2023

What does it do?

  • Extends to useEnterprise hook with a boolean flag enabled
  • Move the review-workflow column in the CM list view to use useEnterprise

Why is it needed?

  • Another ee_else_ce import down
  • Makes the hook more flexible when there are other conditions than window.strapi.isEE involved to avoid over-fetching

How to test it?

Use Strapi in EE mode and navigate to a content-type in the CM list-view that has review-workflows enabled.

@gu-stav gu-stav added source: core:admin Source is core/admin package pr: enhancement This PR adds or updates some part of the codebase or features labels Jun 21, 2023
@gu-stav gu-stav added this to the 4.11.3 milestone Jun 21, 2023
@gu-stav gu-stav changed the title Chore/rw ee else ce Chore: Refactor CM list-view review-workflow columns to use useEnterprise Jun 21, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jun 21, 2023

Size Change: -474 B (0%)

Total Size: 1.52 MB

Filename Size Change
packages/core/admin/build/Admin_homePage.********.chunk.js 9.32 kB +853 B (+10%) ⚠️
packages/core/admin/build/Admin_settingsPage.********.chunk.js 10.1 kB +866 B (+9%) 🔍
packages/core/admin/build/admin-app.********.chunk.js 19.9 kB -1.75 kB (-8%)
packages/core/admin/build/content-manager.********.chunk.js 62.8 kB -461 B (-1%)
packages/core/admin/build/runtime~main.********.js 4.85 kB +26 B (+1%)
ℹ️ View Unchanged
Filename Size Change
packages/core/admin/build/Admin_InternalErrorPage.********.chunk.js 495 B 0 B
packages/core/admin/build/Admin_marketplace.********.chunk.js 8.34 kB 0 B
packages/core/admin/build/Admin_pluginsPage.********.chunk.js 1.18 kB 0 B
packages/core/admin/build/Admin_profilePage.********.chunk.js 3.43 kB 0 B
packages/core/admin/build/Admin-authenticatedApp.********.chunk.js 8.26 kB 0 B
packages/core/admin/build/admin-edit-roles-page.********.chunk.js 15.8 kB 0 B
packages/core/admin/build/admin-edit-users.********.chunk.js 4.14 kB 0 B
packages/core/admin/build/admin-roles-list.********.chunk.js 3.06 kB 0 B
packages/core/admin/build/admin-users.********.chunk.js 6.17 kB 0 B
packages/core/admin/build/api-tokens-create-page.********.chunk.js 258 B 0 B
packages/core/admin/build/api-tokens-edit-page.********.chunk.js 258 B 0 B
packages/core/admin/build/api-tokens-list-page.********.chunk.js 2.86 kB 0 B
packages/core/admin/build/ar-json.********.chunk.js 19.6 kB 0 B
packages/core/admin/build/audit-logs-settings-page.********.chunk.js 4.09 kB 0 B
packages/core/admin/build/bb3108f7fd1e6179bde1.svg 352 B 0 B
packages/core/admin/build/bb4d0d527bdfb161bc5a.svg 2.33 kB 0 B
packages/core/admin/build/ca-json.********.chunk.js 12.9 kB 0 B
packages/core/admin/build/content-type-builder-list-view.********.chunk.js 7.15 kB 0 B
packages/core/admin/build/content-type-builder-translation-ar-json.********.chunk.js 1.35 kB 0 B
packages/core/admin/build/content-type-builder-translation-cs-json.********.chunk.js 2.88 kB 0 B
packages/core/admin/build/content-type-builder-translation-de-json.********.chunk.js 4.19 kB 0 B
packages/core/admin/build/content-type-builder-translation-dk-json.********.chunk.js 3.75 kB 0 B
packages/core/admin/build/content-type-builder-translation-en-json.********.chunk.js 4.2 kB 0 B
packages/core/admin/build/content-type-builder-translation-es-json.********.chunk.js 3.97 kB 0 B
packages/core/admin/build/content-type-builder-translation-fr-json.********.chunk.js 1.66 kB 0 B
packages/core/admin/build/content-type-builder-translation-id-json.********.chunk.js 3.34 kB 0 B
packages/core/admin/build/content-type-builder-translation-it-json.********.chunk.js 3.47 kB 0 B
packages/core/admin/build/content-type-builder-translation-ja-json.********.chunk.js 1.23 kB 0 B
packages/core/admin/build/content-type-builder-translation-ko-json.********.chunk.js 4.37 kB 0 B
packages/core/admin/build/content-type-builder-translation-ms-json.********.chunk.js 3.28 kB 0 B
packages/core/admin/build/content-type-builder-translation-nl-json.********.chunk.js 3.3 kB 0 B
packages/core/admin/build/content-type-builder-translation-pl-json.********.chunk.js 4.16 kB 0 B
packages/core/admin/build/content-type-builder-translation-pt-BR-json.********.chunk.js 4.17 kB 0 B
packages/core/admin/build/content-type-builder-translation-pt-json.********.chunk.js 1.1 kB 0 B
packages/core/admin/build/content-type-builder-translation-ru-json.********.chunk.js 4.69 kB 0 B
packages/core/admin/build/content-type-builder-translation-sk-json.********.chunk.js 3.74 kB 0 B
packages/core/admin/build/content-type-builder-translation-sv-json.********.chunk.js 4.18 kB 0 B
packages/core/admin/build/content-type-builder-translation-th-json.********.chunk.js 4.36 kB 0 B
packages/core/admin/build/content-type-builder-translation-tr-json.********.chunk.js 3.84 kB 0 B
packages/core/admin/build/content-type-builder-translation-uk-json.********.chunk.js 4.37 kB 0 B
packages/core/admin/build/content-type-builder-translation-zh-Hans-json.********.chunk.js 3.5 kB 0 B
packages/core/admin/build/content-type-builder-translation-zh-json.********.chunk.js 4.5 kB 0 B
packages/core/admin/build/content-type-builder.********.chunk.js 31.1 kB 0 B
packages/core/admin/build/cs-json.********.chunk.js 5.88 kB 0 B
packages/core/admin/build/de-json.********.chunk.js 12.8 kB 0 B
packages/core/admin/build/dk-json.********.chunk.js 10.5 kB 0 B
packages/core/admin/build/email-settings-page.********.chunk.js 3.6 kB 0 B
packages/core/admin/build/email-translation-ar-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-cs-json.********.chunk.js 121 B 0 B
packages/core/admin/build/email-translation-de-json.********.chunk.js 120 B 0 B
packages/core/admin/build/email-translation-dk-json.********.chunk.js 616 B 0 B
packages/core/admin/build/email-translation-en-json.********.chunk.js 610 B 0 B
packages/core/admin/build/email-translation-es-json.********.chunk.js 675 B 0 B
packages/core/admin/build/email-translation-fr-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-id-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-it-json.********.chunk.js 118 B 0 B
packages/core/admin/build/email-translation-ja-json.********.chunk.js 787 B 0 B
packages/core/admin/build/email-translation-ko-json.********.chunk.js 758 B 0 B
packages/core/admin/build/email-translation-ms-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-nl-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-pl-json.********.chunk.js 660 B 0 B
packages/core/admin/build/email-translation-pt-BR-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-pt-json.********.chunk.js 668 B 0 B
packages/core/admin/build/email-translation-ru-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-sk-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-th-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-tr-json.********.chunk.js 687 B 0 B
packages/core/admin/build/email-translation-uk-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-vi-json.********.chunk.js 122 B 0 B
packages/core/admin/build/email-translation-zh-Hans-json.********.chunk.js 473 B 0 B
packages/core/admin/build/email-translation-zh-json.********.chunk.js 730 B 0 B
packages/core/admin/build/en-json.********.chunk.js 15.2 kB 0 B
packages/core/admin/build/es-json.********.chunk.js 14.1 kB 0 B
packages/core/admin/build/eu-json.********.chunk.js 14.1 kB 0 B
packages/core/admin/build/fr-json.********.chunk.js 12.6 kB 0 B
packages/core/admin/build/gu-json.********.chunk.js 14.2 kB 0 B
packages/core/admin/build/he-json.********.chunk.js 6.48 kB 0 B
packages/core/admin/build/hi-json.********.chunk.js 16.3 kB 0 B
packages/core/admin/build/highlight.js.********.chunk.js 842 B 0 B
packages/core/admin/build/hu-json.********.chunk.js 15.4 kB 0 B
packages/core/admin/build/i18n-settings-page.********.chunk.js 4.94 kB 0 B
packages/core/admin/build/i18n-translation-de-json.********.chunk.js 1.62 kB 0 B
packages/core/admin/build/i18n-translation-dk-json.********.chunk.js 1.62 kB 0 B
packages/core/admin/build/i18n-translation-en-json.********.chunk.js 1.57 kB 0 B
packages/core/admin/build/i18n-translation-es-json.********.chunk.js 1.68 kB 0 B
packages/core/admin/build/i18n-translation-fr-json.********.chunk.js 1.73 kB 0 B
packages/core/admin/build/i18n-translation-ko-json.********.chunk.js 1.86 kB 0 B
packages/core/admin/build/i18n-translation-pl-json.********.chunk.js 1.8 kB 0 B
packages/core/admin/build/i18n-translation-ru-json.********.chunk.js 2.3 kB 0 B
packages/core/admin/build/i18n-translation-tr-json.********.chunk.js 1.7 kB 0 B
packages/core/admin/build/i18n-translation-zh-Hans-json.********.chunk.js 1.64 kB 0 B
packages/core/admin/build/i18n-translation-zh-json.********.chunk.js 1.73 kB 0 B
packages/core/admin/build/id-json.********.chunk.js 7.46 kB 0 B
packages/core/admin/build/index.html 263 B -1 B (0%)
packages/core/admin/build/it-json.********.chunk.js 7.93 kB 0 B
packages/core/admin/build/ja-json.********.chunk.js 12.2 kB 0 B
packages/core/admin/build/ko-json.********.chunk.js 11.5 kB 0 B
packages/core/admin/build/main.********.js 588 kB +3 B (0%)
packages/core/admin/build/ml-json.********.chunk.js 17.2 kB 0 B
packages/core/admin/build/ms-json.********.chunk.js 6.16 kB 0 B
packages/core/admin/build/nl-json.********.chunk.js 14.3 kB 0 B
packages/core/admin/build/no-json.********.chunk.js 5.48 kB 0 B
packages/core/admin/build/pl-json.********.chunk.js 13.1 kB 0 B
packages/core/admin/build/pt-BR-json.********.chunk.js 13.8 kB 0 B
packages/core/admin/build/pt-json.********.chunk.js 5.71 kB 0 B
packages/core/admin/build/review-workflows-settings.********.chunk.js 7.07 kB 0 B
packages/core/admin/build/ru-json.********.chunk.js 21.6 kB 0 B
packages/core/admin/build/sa-json.********.chunk.js 16.9 kB 0 B
packages/core/admin/build/sk-json.********.chunk.js 11.8 kB 0 B
packages/core/admin/build/sso-settings-page.********.chunk.js 1.73 kB 0 B
packages/core/admin/build/sv-json.********.chunk.js 14.1 kB 0 B
packages/core/admin/build/th-json.********.chunk.js 9.01 kB 0 B
packages/core/admin/build/tr-json.********.chunk.js 13.7 kB 0 B
packages/core/admin/build/transfer-tokens-create-page.********.chunk.js 262 B 0 B
packages/core/admin/build/transfer-tokens-edit-page.********.chunk.js 262 B 0 B
packages/core/admin/build/transfer-tokens-list-page.********.chunk.js 2.98 kB 0 B
packages/core/admin/build/uk-json.********.chunk.js 7.71 kB 0 B
packages/core/admin/build/Upload_ConfigureTheView.********.chunk.js 1.74 kB 0 B
packages/core/admin/build/upload-settings.********.chunk.js 3.08 kB 0 B
packages/core/admin/build/upload-translation-ca-json.********.chunk.js 2.48 kB 0 B
packages/core/admin/build/upload-translation-de-json.********.chunk.js 2.19 kB 0 B
packages/core/admin/build/upload-translation-dk-json.********.chunk.js 1.96 kB 0 B
packages/core/admin/build/upload-translation-en-json.********.chunk.js 2.58 kB 0 B
packages/core/admin/build/upload-translation-es-json.********.chunk.js 2.45 kB 0 B
packages/core/admin/build/upload-translation-fr-json.********.chunk.js 2.86 kB 0 B
packages/core/admin/build/upload-translation-he-json.********.chunk.js 1.84 kB 0 B
packages/core/admin/build/upload-translation-it-json.********.chunk.js 1.56 kB 0 B
packages/core/admin/build/upload-translation-ja-json.********.chunk.js 1.92 kB 0 B
packages/core/admin/build/upload-translation-ko-json.********.chunk.js 2.5 kB 0 B
packages/core/admin/build/upload-translation-ms-json.********.chunk.js 1.41 kB 0 B
packages/core/admin/build/upload-translation-pl-json.********.chunk.js 2.19 kB 0 B
packages/core/admin/build/upload-translation-pt-BR-json.********.chunk.js 1.61 kB 0 B
packages/core/admin/build/upload-translation-pt-json.********.chunk.js 1.61 kB 0 B
packages/core/admin/build/upload-translation-ru-json.********.chunk.js 2.02 kB 0 B
packages/core/admin/build/upload-translation-sk-json.********.chunk.js 2.58 kB 0 B
packages/core/admin/build/upload-translation-th-json.********.chunk.js 1.99 kB 0 B
packages/core/admin/build/upload-translation-tr-json.********.chunk.js 2.35 kB 0 B
packages/core/admin/build/upload-translation-uk-json.********.chunk.js 1.96 kB 0 B
packages/core/admin/build/upload-translation-zh-Hans-json.********.chunk.js 3.12 kB 0 B
packages/core/admin/build/upload-translation-zh-json.********.chunk.js 2.65 kB 0 B
packages/core/admin/build/upload.********.chunk.js 7.63 kB 0 B
packages/core/admin/build/users-advanced-settings-page.********.chunk.js 3.41 kB 0 B
packages/core/admin/build/users-email-settings-page.********.chunk.js 3.51 kB 0 B
packages/core/admin/build/users-permissions-translation-ar-json.********.chunk.js 1.51 kB 0 B
packages/core/admin/build/users-permissions-translation-cs-json.********.chunk.js 1.46 kB 0 B
packages/core/admin/build/users-permissions-translation-de-json.********.chunk.js 1.58 kB 0 B
packages/core/admin/build/users-permissions-translation-dk-json.********.chunk.js 1.92 kB 0 B
packages/core/admin/build/users-permissions-translation-en-json.********.chunk.js 1.81 kB 0 B
packages/core/admin/build/users-permissions-translation-es-json.********.chunk.js 2.05 kB 0 B
packages/core/admin/build/users-permissions-translation-fr-json.********.chunk.js 1.41 kB 0 B
packages/core/admin/build/users-permissions-translation-id-json.********.chunk.js 1.49 kB 0 B
packages/core/admin/build/users-permissions-translation-it-json.********.chunk.js 1.57 kB 0 B
packages/core/admin/build/users-permissions-translation-ja-json.********.chunk.js 1.53 kB 0 B
packages/core/admin/build/users-permissions-translation-ko-json.********.chunk.js 2.23 kB 0 B
packages/core/admin/build/users-permissions-translation-ms-json.********.chunk.js 1.27 kB 0 B
packages/core/admin/build/users-permissions-translation-nl-json.********.chunk.js 1.32 kB 0 B
packages/core/admin/build/users-permissions-translation-pl-json.********.chunk.js 2.11 kB 0 B
packages/core/admin/build/users-permissions-translation-pt-BR-json.********.chunk.js 1.21 kB 0 B
packages/core/admin/build/users-permissions-translation-pt-json.********.chunk.js 1.3 kB 0 B
packages/core/admin/build/users-permissions-translation-ru-json.********.chunk.js 2.75 kB 0 B
packages/core/admin/build/users-permissions-translation-sk-json.********.chunk.js 1.38 kB 0 B
packages/core/admin/build/users-permissions-translation-sv-json.********.chunk.js 2.01 kB 0 B
packages/core/admin/build/users-permissions-translation-th-json.********.chunk.js 2.01 kB 0 B
packages/core/admin/build/users-permissions-translation-tr-json.********.chunk.js 2.07 kB 0 B
packages/core/admin/build/users-permissions-translation-uk-json.********.chunk.js 1.75 kB 0 B
packages/core/admin/build/users-permissions-translation-vi-json.********.chunk.js 1.51 kB 0 B
packages/core/admin/build/users-permissions-translation-zh-Hans-json.********.chunk.js 2.19 kB 0 B
packages/core/admin/build/users-permissions-translation-zh-json.********.chunk.js 2.1 kB 0 B
packages/core/admin/build/users-providers-settings-page.********.chunk.js 5.51 kB 0 B
packages/core/admin/build/users-roles-settings-page.********.chunk.js 7.34 kB 0 B
packages/core/admin/build/vi-json.********.chunk.js 5.98 kB 0 B
packages/core/admin/build/webhook-edit-page.********.chunk.js 5.69 kB 0 B
packages/core/admin/build/webhook-list-page.********.chunk.js 3.14 kB 0 B
packages/core/admin/build/zh-Hans-json.********.chunk.js 17.2 kB 0 B
packages/core/admin/build/zh-json.********.chunk.js 15.1 kB 0 B
packages/core/helper-plugin/build/helper-plugin.esm.js 24.2 kB -4 B (0%)
packages/core/helper-plugin/build/helper-plugin.js 22 kB -4 B (0%)

compressed-size-action

Comment on lines +60 to +61
Similar to react-query this boolean flag allows disabling the EE import, e.g. when more than one condition needs to be applied. If `enabled`
is set to false, the first argument (CE_DATA) will be returned.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would a good example of this be where the EE addition is unique to a feature being enabled as opposed to EE in general?

joshuaellis
joshuaellis previously approved these changes Jun 22, 2023
@gu-stav gu-stav force-pushed the chore/rw-ee_else_ce branch from 8170af1 to 009f770 Compare July 6, 2023 11:38
Copy link
Contributor

@markkaylor markkaylor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one question otherwise looks great!

Comment on lines +104 to +107
if (!ReviewWorkflowsStage) {
return null;
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't block rednering on content-types that don't have review workflows enabled 🤔? Maybe also check hasReviewWorkflows?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CE the component will be defined (so this condition won't match), but in EE ReviewWorkflowsStage can be null until the component has been loaded. We could handle this using a loading state, but in this instance I think it is better not to.

@gu-stav gu-stav merged commit e47c94e into main Jul 6, 2023
@gu-stav gu-stav deleted the chore/rw-ee_else_ce branch July 6, 2023 12:24
@strapi-bot
Copy link

This pull request has been mentioned on Strapi Community Forum. There might be relevant details there:

https://forum.strapi.io/t/why-has-the-cellformatter-been-removed-from-the-content-manager-list-view/30271/2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr: enhancement This PR adds or updates some part of the codebase or features source: core:admin Source is core/admin package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants