fix(other): copy all constants in backend when branding #6853

ulfgebhardt · 2023-11-22T12:38:41Z

🍰 Pullrequest

copy all constants in backend when branding, but remove links.ts since not working in backend context.

Issues

fixes 🐛 [Bug] Refactor Branding JS/TS Files and Docker File Copying #6902
fixes 🐛 [Bug][Deployment] Configurations in deployment\constants\. are not used in Backend by Dockerfile. #6851
relates 🚀 [Feature] Change Group DESCRIPTION_WITHOUT_HTML_LENGTH_MIN to have Value 3 in General #6923

Todo

webapp, backend default:
- DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 50 → DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 3
  - is moved to separate issue, because it's independent and can be done earlier, see 🚀 [Feature] Change Group DESCRIPTION_WITHOUT_HTML_LENGTH_MIN to have Value 3 in General #6923
  - !!! should also be taken into account here !!!
cleanup: search for Wolle

…cial into copy-all-constants

…g-backend'

…cial into copy-all-constants # Conflicts: # backend/src/constants/groups.ts # webapp/constants/groups.js # Adapt new value of 'DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 3' from master in our new files

ulfgebhardt

I don't understand why I was asked to review this even tho its clearly not finished.

There is folders brading-backend and branding-webapp referenced - i could not find them. I guess those are in the branding repositories.

ulfgebhardt · 2024-01-10T12:06:10Z

backend/src/branding/groupsBranding.ts

@@ -0,0 +1,5 @@
+// this file is duplicated in backend/src/branding/groupsBranding' and 'webapp/branding/groupsBranding'
+// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'
+// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'


Suggested change

// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'

I can remove this comments. 👍🏼

ulfgebhardt · 2024-01-10T12:07:05Z

backend/src/constants/groups.ts

+export const { DESCRIPTION_WITHOUT_HTML_LENGTH_MIN, DESCRIPTION_EXCERPT_HTML_LENGTH } = {
+  ...groupsDefault,
+  ...groupsBranding,
+}


Why export specific variables? Is there a typescript advantage doing this?

Suggested change

export const { DESCRIPTION_WITHOUT_HTML_LENGTH_MIN, DESCRIPTION_EXCERPT_HTML_LENGTH } = {

...groupsDefault,

...groupsBranding,

}

export default {

...groupsDefault,

...groupsBranding,

}

I did it this way because this export is imported as:

import { DESCRIPTION_WITHOUT_HTML_LENGTH_MIN } from '../../constants/groups'

So your suggestion creates an error on this import:

src/middleware/excerptMiddleware.ts:2:10 - error TS2614: Module '"../constants/groups"' has no exported member 'DESCRIPTION_EXCERPT_HTML_LENGTH'. Did you mean to use 'import DESCRIPTION_EXCERPT_HTML_LENGTH from "../constants/groups"' instead?

It's not imported as whole object where a property is selected.

The way I do it has the following good sides:

if I go on refactoring I have not to rewrite all the imports

it's clear which configs can be passed through and all others are filtered out

That's why I tend to leave my code as it is. Is that all right? @ulfgebhardt

ulfgebhardt · 2024-01-10T12:08:11Z

backend/src/constants/groups.ts

+// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'
+// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'


Suggested change

// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'

// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'

I can remove this comments. 👍🏼

ulfgebhardt · 2024-01-10T12:08:39Z

backend/src/constants/groupsDefault.ts

+// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'
+// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'


Suggested change

// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'

// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'

I can remove this comments. 👍🏼

ulfgebhardt · 2024-01-10T12:09:32Z

backend/src/schema/resolvers/groups.ts

+// Wolle console.log('DESCRIPTION_WITHOUT_HTML_LENGTH_MIN: ', DESCRIPTION_WITHOUT_HTML_LENGTH_MIN)
+


Suggested change

// Wolle console.log('DESCRIPTION_WITHOUT_HTML_LENGTH_MIN: ', DESCRIPTION_WITHOUT_HTML_LENGTH_MIN)

I's a work in progress comment. I'll remove it later.

ulfgebhardt · 2024-01-10T12:13:34Z

webapp/branding/groupsBranding.js

@@ -0,0 +1,5 @@
+// this file is duplicated in backend/src/branding/groupsBranding' and 'webapp/branding/groupsBranding'
+// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'


Suggested change

// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'

I can remove this comments. 👍🏼

ulfgebhardt · 2024-01-10T12:13:55Z

webapp/components/Group/GroupForm.vue

+// Wolle console.log('NAME_LENGTH_MIN: ', NAME_LENGTH_MIN)
+// console.log('NAME_LENGTH_MAX: ', NAME_LENGTH_MAX)
+// console.log('DESCRIPTION_WITHOUT_HTML_LENGTH_MIN: ', DESCRIPTION_WITHOUT_HTML_LENGTH_MIN)
+


Suggested change

// Wolle console.log('NAME_LENGTH_MIN: ', NAME_LENGTH_MIN)

// console.log('NAME_LENGTH_MAX: ', NAME_LENGTH_MAX)

// console.log('DESCRIPTION_WITHOUT_HTML_LENGTH_MIN: ', DESCRIPTION_WITHOUT_HTML_LENGTH_MIN)

I's a work in progress comment. I'll remove it later.

ulfgebhardt · 2024-01-10T12:14:58Z

webapp/constants/groups.js

+// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'
+// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'
+


Suggested change

// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'

// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'

I can remove this comments. 👍🏼

ulfgebhardt · 2024-01-10T12:15:23Z

webapp/constants/groups.js

+export const {
+  NAME_LENGTH_MIN,
+  NAME_LENGTH_MAX,
+  DESCRIPTION_WITHOUT_HTML_LENGTH_MIN,
+  SHOW_GROUP_BUTTON_IN_HEADER,
+} = { ...groupsDefault, ...groupsBranding }


Suggested change

export const {

NAME_LENGTH_MIN,

NAME_LENGTH_MAX,

DESCRIPTION_WITHOUT_HTML_LENGTH_MIN,

SHOW_GROUP_BUTTON_IN_HEADER,

} = { ...groupsDefault, ...groupsBranding }

export default { ...groupsDefault, ...groupsBranding }

same as above

ulfgebhardt · 2024-01-10T12:15:45Z

webapp/constants/groupsDefault.js

@@ -0,0 +1,8 @@
+// this file is duplicated in 'backend/src/constants/groupsDefault' and 'webapp/constants/groupsDefault'
+// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'
+// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'


Suggested change

// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'

I can remove this comments. 👍🏼

…cial into copy-all-constants

Tirokk · 2024-01-18T10:52:50Z

Thanks for your code suggestions! @ulfgebhardt
I will try them.

I don't understand why I was asked to review this even tho its clearly not finished.

There is folders brading-backend and branding-webapp referenced - i could not find them. I guess those are in the branding repositories.

As I explained in our personal conversation I like to know if the concept and the exact code suites you before I refactor everything.
I told you this and said that it's not ready yet.

Yes. The folders config-all, config-backend and config-webapp are only in the branding repositories.

copy all constants in backend, but removed links.ts since not working

ce68e25

ulfgebhardt assigned ulfgebhardt and Tirokk Nov 22, 2023

ulfgebhardt changed the title ~~fix(docker): copy all constants in backend when branding~~ fix(other): copy all constants in backend when branding Nov 22, 2023

ulfgebhardt and others added 8 commits November 22, 2023 13:48

duplicate files to two folders, due to "historic reasons"

16a7a1e

Refactor groups configs in webapp and backend to new structure

f100065

Add commented 'console.log'

a06ccce

Fix linting

0d60311

!!! Temp !!!

ec28998

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…

13d8c19

…cial into copy-all-constants

Implement branding with folders 'config-all', 'config-webapp', 'confi…

2ef6f40

…g-backend'

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…

c0da51b

…cial into copy-all-constants # Conflicts: # backend/src/constants/groups.ts # webapp/constants/groups.js # Adapt new value of 'DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 3' from master in our new files

ulfgebhardt commented Jan 10, 2024

View reviewed changes

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…

25d27e7

…cial into copy-all-constants

Tirokk marked this pull request as draft January 18, 2024 11:29

Tirokk added bug Something isn't working devops labels Jan 29, 2024

This was referenced Jul 30, 2024

🚀 [Feature] Refactor Branding JS Files Ocelot-Social-Community/stage.ocelot.social#6

Open

chore(others): Refactor Branding JS Files Ocelot-Social-Community/stage.ocelot.social#7

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(other): copy all constants in backend when branding #6853

fix(other): copy all constants in backend when branding #6853

ulfgebhardt commented Nov 22, 2023 •

edited by Tirokk

Loading

ulfgebhardt left a comment

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024 •

edited

Loading

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024

ulfgebhardt Jan 10, 2024

Tirokk Jan 18, 2024

Tirokk commented Jan 18, 2024 •

edited

Loading

		// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'
		// configurable values see: 'backend/src/constants/groups', 'webapp/constants/groups'

		// Wolle console.log('DESCRIPTION_WITHOUT_HTML_LENGTH_MIN: ', DESCRIPTION_WITHOUT_HTML_LENGTH_MIN)

		@@ -0,0 +1,5 @@
		// this file is duplicated in backend/src/branding/groupsBranding' and 'webapp/branding/groupsBranding'
		// configurable values see: 'backend/src/constants/groupsDefault', 'webapp/constants/groupsDefault'

	// Wolle console.log('NAME_LENGTH_MIN: ', NAME_LENGTH_MIN)
	// console.log('NAME_LENGTH_MAX: ', NAME_LENGTH_MAX)
	// console.log('DESCRIPTION_WITHOUT_HTML_LENGTH_MIN: ', DESCRIPTION_WITHOUT_HTML_LENGTH_MIN)

fix(other): copy all constants in backend when branding #6853

Are you sure you want to change the base?

fix(other): copy all constants in backend when branding #6853

Conversation

ulfgebhardt commented Nov 22, 2023 • edited by Tirokk Loading

🍰 Pullrequest

Issues

Todo

ulfgebhardt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tirokk Jan 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tirokk commented Jan 18, 2024 • edited Loading

ulfgebhardt commented Nov 22, 2023 •

edited by Tirokk

Loading

Tirokk Jan 18, 2024 •

edited

Loading

Tirokk commented Jan 18, 2024 •

edited

Loading