`clark-service-refactor` to `main` #1693

mfranz1 · 2024-02-27T17:18:32Z

This PR updates clark-client to conform to changes in clark-services. All services have been rewritten except for learning-object-service. All LOS routes are still currently being used to the old service and are referred to as legacy routes in the client.

Majority of file changes are files that have been reorganized into subdirectories of src/app/core. The core module now reflects our clark-service/CLARK-Gateway strutcures.

This pull request is linked to Shortcut Story #28112: Update clark-client to reflect changes in clark-service.

.circleci/config.yml

Cwagne17 · 2024-03-06T13:11:51Z

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"

-npm run lint && npm run test:unit
+npm run lint


I would run prettier fix here.

Cwagne17 · 2024-03-06T13:12:16Z

package.json

    "lint": "npx ng lint clark",
+    "lint:fix": "npx ng lint clark --fix",
+    "prettier": "prettier --check .",
    "e2e": "ng e2e",


We should add a script for prettier:fix

Cwagne17 · 2024-03-06T13:15:25Z

src/app/admin/core/authorship.service.ts

Should we have two cores? One under src/app/admin/core and on under src/app/core?

The way we purpose ../core/.. is to support any Angular service or guard, in addition to a few client supporting components. The unique part of and *.service.ts file in a core is not always to interact with our API, it's a client service that controls a particular component, for an example. That is the case here in admin/core where most of these service files are controlling logic for client interactions.

To fully answer your question, we should refactor to having one core within src/app however, I argue that moving every existing core to one core is a refactor out of scope of route updates for clark-service

Cwagne17 · 2024-03-06T13:20:51Z

src/app/core/access-group-module/access-group.service.ts

+      await this.http
+        .request(
+          ACCESS_GROUP_ROUTES.REMOVE_ACCESS_GROUP_FROM_USER(memberId),
+            collection,


This route won't work. The Dto for this route is expecting an accessGroup to remove from the user.

Cwagne17 · 2024-03-06T14:28:57Z

src/app/core/user-module/user.service.ts

@@ -151,17 +118,14 @@ export class UserService {
   * @memberof UserService
   */
  getOrganizationMembers(organization: string): Promise<User[]> {
-    const route = USER_ROUTES.GET_SAME_ORGANIZATION(organization);
+    const route = LEGACY_USER_ROUTES.GET_SAME_ORGANIZATION(organization);


Is this used? Should we be adding this to clark-service?

src/app/core/user-module/user.service.ts

src/app/core/utility-module/utility.routes.ts

src/app/core/utility-module/utility.service.ts

Cwagne17 · 2024-03-06T14:49:01Z

src/app/core/utility-module/utility.service.ts

+  //  *
+  //  * @returns An observable containing an array of blogs
+  //  */
+  // async getRecentBlogs(): Observable<Blog[]> {


How come this is commented out?

Clark-service supports the query recent

Patch on mfranz1 branch
Clark-service needs to be updated to look at query param not body

Cwagne17 · 2024-03-07T16:54:58Z

src/app/core/access-group-module/access-group.service.ts

+   * @returns {Promise<void>}
+   * @memberof UserService
+   */
+    async removeMember(collectionName: string, memberId: string): Promise<void> {


This function isn't being referenced anywhere

pzalep1

Looks good! Just a few comments and questions.

pzalep1 · 2024-03-09T13:56:04Z

.circleci/config.yml

-                - releases
+      - cyber4all/s3:
+          context: [AWS, Slack]
+          bucket: "clark-prod-file-uploads"


Why is this the production upload bucket?

pzalep1 · 2024-03-09T14:03:26Z

src/app/admin/components/user-card/user-card.component.ts

@@ -89,7 +89,7 @@ export class AdminUserCardComponent {
  }

  async canAddEvaluator() {
-    const roles = await this.privilegeService.getCollectionRoles(this.user.id);
+    const roles = await this.accessGroupsService.getUserAccessGroups(this.user.username);


Not using id?

pzalep1 · 2024-03-09T14:04:28Z

src/app/admin/components/user-search-wrapper/user-search-wrapper.component.ts

@@ -73,7 +73,6 @@ export class UserSearchWrapperComponent implements OnInit, OnDestroy {
        this.loading = false;
      }).catch(error => {
        this.toaster.error('Error!', 'There was an error fetching users. Please try again later.');
-        console.error(error);


Thank you for cleaning these up.

pzalep1 · 2024-03-09T14:06:29Z

src/app/admin/pages/users/users.component.ts

+      })
+      .catch(error => {
+        this.toaster.error('Error!', 'Could not remove reviewer. Please try again later');
+        console.log(error);


pzalep1 · 2024-03-09T14:07:54Z

src/app/auth/register/register.component.ts

  private ngUnsubscribe = new Subject<void>();
-  ssoRedirect = environment.apiURL + '/google';
+  ssoRedirect = AUTH_ROUTES.GOOGLE_SIGNUP();


pzalep1 · 2024-03-09T14:16:50Z

src/app/core/collection-module/collections.service.ts

+                c.hasLogo = true;
+              });
+          } catch (error) {
+            console.log(error);


pzalep1 · 2024-03-09T14:18:25Z

src/app/core/feature-module/featured.service.ts

@@ -130,22 +133,22 @@ export class FeaturedObjectsService {
   * @returns {Promise<LearningObject[]>}
   * @memberof LearningObjectService
   */
-  getNotFeaturedLearningObjects(query?: Query): Promise<{learningObjects: LearningObject[], total: number}> {
+  getNotFeaturedLearningObjects(query?: Query): Promise<{ learningObjects: LearningObject[], total: number }> {


It is used on the featured admin page. It gets the learning objects that aren't featured.

pzalep1 · 2024-03-09T14:18:47Z

src/app/core/interceptor/httpconfig.interceptor.ts

@@ -20,9 +22,10 @@ export class HttpConfigInterceptor implements HttpInterceptor {
    request: HttpRequest<any>,
    next: HttpHandler
  ): Observable<HttpEvent<any>> {
+    console.log('intercepted request ... ');


pzalep1 · 2024-03-09T14:23:59Z

src/app/core/library-module/library.service.ts

@@ -113,7 +116,7 @@ export class LibraryService {
    // Show loading spinner
    this._loading$.next(true);
    // Url route for bundling
-    const bundle = USER_ROUTES.OBJECT_BUNDLE(
+    const bundle = BUNDLING_ROUTES.BUNDLE_LEARNING_OBJECT(


History: Library used to have a download button and we used to bundle everything on the fly.

pzalep1 · 2024-03-09T14:24:35Z

src/app/core/metric-module/metric.routes.ts

+   * Request to get all learning object stats
+   * @method GET
+   */
+  GET_LEARNING_OBJECT_STATS() {


This is probably related to the weird 2 stats routes we had in library and learning object service.

not needed. flags can be deleted from database directly Signed-off-by: Andreas <andreas.papacharalampous@secured.team>

Signed-off-by: Andreas <andreas.papacharalampous@secured.team>

…le-route-updates-for-clark-refactor

This reverts commit 237ade8.

…OBJECTS_WITH_LIMIT. Updated function parameter name for GET_COLLECTION_FEATURED_OBJECTS in featured.service.ts. Added types to function parameters

…odule-route-updates-for-clark-refactor

…g-in-curator-dashboard-always fix: [sc-32644] Curator - Filtering in curator dashboard always returns all released learning objects

Signed-off-by: Andreas <andreas.papacharalampous@secured.team>

…-module-route-updates-for-clark update access group functions

…g-objects bug fixes clark-service deployment

…g-objects Bug/sc 35478/browse 0 learning objects

…rk-client into admin-search-users

Admin search users

…api-env-for-api-clark-center Feature/sc 35546/swaping the api env for api clark center

mfranz1 requested review from a team, Greek, Cwagne17, JosueMolinaMorales, bereketsega, katieblomquist, shanioffe and johngonz0 March 4, 2024 21:07

mfranz1 marked this pull request as ready for review March 4, 2024 21:07

Cwagne17 requested changes Mar 6, 2024

View reviewed changes

Cwagne17 reviewed Mar 7, 2024

View reviewed changes

shanioffe approved these changes Mar 8, 2024

View reviewed changes

mfranz1 requested a review from pzalep1 March 8, 2024 17:37

pzalep1 reviewed Mar 9, 2024

View reviewed changes

Greek and others added 16 commits September 4, 2024 12:02

trashing DELETE_FLAG

3c35a10

not needed. flags can be deleted from database directly Signed-off-by: Andreas <andreas.papacharalampous@secured.team>

add function getRatingFlags for getting a flags

01259f8

Signed-off-by: Andreas <andreas.papacharalampous@secured.team>

Merge branch 'clark-service-refactor' into feature/sc-32770/user-modu…

002b765

…le-route-updates-for-clark-refactor

Revert "trashed EditorService"

a860ad1

This reverts commit 237ade8.

update access group functions

002ead7

lint

e867228

Combined GET_COLLECTION_FEATURED_OBJECTS and GET_COLLECTION_FEATURED_…

6696760

…OBJECTS_WITH_LIMIT. Updated function parameter name for GET_COLLECTION_FEATURED_OBJECTS in featured.service.ts. Added types to function parameters

Merge branch 'clark-service-refactor' into feature/sc-32766/feature-m…

597dd61

…odule-route-updates-for-clark-refactor

Update src/app/admin/components/filter-search/filter-search.component.ts

04e9e0b

Merge pull request #1828 from Cyber4All/bug/sc-32644/curator-filterin…

73b1724

…g-in-curator-dashboard-always fix: [sc-32644] Curator - Filtering in curator dashboard always returns all released learning objects

move GET_LEARNING_OBJECT_REVISION from LEGACY_USER_ROUTES

637af80

Signed-off-by: Andreas <andreas.papacharalampous@secured.team>

Merge pull request #1844 from Cyber4All/feature/sc-32763/access-group…

3463d6b

…-module-route-updates-for-clark update access group functions

update report module

7ea6017

lint'

26dee6e

removing library works now and libraryItems matches backend schema

4b03834

lint

ca7f1fb

pzalep1 and others added 28 commits December 16, 2024 11:17

6.0.1

434cd8d

Merge pull request #1888 from Cyber4All/bug/sc-35478/browse-0-learnin…

def98e4

…g-objects bug fixes clark-service deployment

Fixing objects

dcac9d3

Lint fix

086f51a

6.0.2

3a83e1f

Fixing splash

601c117

Fix client version

461484a

Merge pull request #1891 from Cyber4All/bug/sc-35478/browse-0-learnin…

375b5d1

…g-objects Bug/sc 35478/browse 0 learning objects

fixed admin dashboard to display users

99b1d64

6.0.3

e1922e3

Fix version

0e46e88

Merge branch 'admin-search-users' of https://github.com/Cyber4All/cla…

adabeeb

…rk-client into admin-search-users

Merge pull request #1892 from Cyber4All/admin-search-users

3a0dcce

Admin search users

Fixing the homepage

569c2e7

Fix linting

bccb7cb

6.0.4

ac58620

Merge pull request #1893 from Cyber4All/admin-search-users

07b4a54

Admin search users

Update to be learning object not revision

db66480

6.0.5

8fd7418

Merge pull request #1894 from Cyber4All/admin-search-users

12c12e2

Admin search users

Add ability to get to revision builder and the builder

6448cdd

Fix the lint

ec6debd

6.0.6

98e0d73

Merge pull request #1895 from Cyber4All/admin-search-users

7b6e543

Admin search users

update environments files

f7dc762

update circleci config

a05f885

6.0.7

29f4b18

Merge pull request #1897 from Cyber4All/feature/sc-35546/swaping-the-…

9b81787

…api-env-for-api-clark-center Feature/sc 35546/swaping the api env for api clark center

pzalep1 merged commit 7faccc2 into main Dec 18, 2024
1 check passed

pzalep1 deleted the clark-service-refactor branch December 18, 2024 19:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`clark-service-refactor` to `main` #1693

`clark-service-refactor` to `main` #1693

mfranz1 commented Feb 27, 2024 •

edited

Loading

Cwagne17 Mar 6, 2024

mfranz1 Mar 7, 2024

Cwagne17 Mar 6, 2024

shanioffe Mar 8, 2024

Cwagne17 Mar 6, 2024

mfranz1 Mar 7, 2024

Cwagne17 Mar 6, 2024

Cwagne17 Mar 6, 2024

Cwagne17 Mar 6, 2024

mfranz1 Mar 7, 2024

Cwagne17 Mar 7, 2024

pzalep1 left a comment

pzalep1 Mar 9, 2024

pzalep1 Mar 9, 2024

pzalep1 Mar 9, 2024

pzalep1 Mar 9, 2024

pzalep1 Mar 9, 2024

pzalep1 Mar 9, 2024

pzalep1 Mar 9, 2024

pzalep1 Mar 9, 2024

pzalep1 Mar 9, 2024

pzalep1 Mar 9, 2024

clark-service-refactor to main #1693

clark-service-refactor to main #1693

Conversation

mfranz1 commented Feb 27, 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

pzalep1 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

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

`clark-service-refactor` to `main` #1693

`clark-service-refactor` to `main` #1693

mfranz1 commented Feb 27, 2024 •

edited

Loading