diff --git a/marketplace-build/.env b/marketplace-build/.env index d1b4b7edb..606142801 100644 --- a/marketplace-build/.env +++ b/marketplace-build/.env @@ -12,4 +12,5 @@ MARKET_GITHUB_OAUTH_APP_CLIENT_ID= MARKET_GITHUB_OAUTH_APP_CLIENT_SECRET= MARKET_JWT_SECRET_KEY= MARKET_CORS_ALLOWED_ORIGIN=* -MARKET_MONGO_LOG_LEVEL=DEBUG \ No newline at end of file +MARKET_MONGO_LOG_LEVEL=DEBUG +MARKET_LOG_PATH=logs \ No newline at end of file diff --git a/marketplace-build/dev/.env b/marketplace-build/dev/.env index e9d068e53..09f4215ad 100644 --- a/marketplace-build/dev/.env +++ b/marketplace-build/dev/.env @@ -12,4 +12,5 @@ MARKET_GITHUB_OAUTH_APP_CLIENT_ID= MARKET_GITHUB_OAUTH_APP_CLIENT_SECRET= MARKET_JWT_SECRET_KEY= MARKET_CORS_ALLOWED_ORIGIN=* -MARKET_MONGO_LOG_LEVEL=DEBUG \ No newline at end of file +MARKET_MONGO_LOG_LEVEL=DEBUG +MARKET_LOG_PATH=logs \ No newline at end of file diff --git a/marketplace-build/dev/docker-compose.yml b/marketplace-build/dev/docker-compose.yml index 260fd1f6c..fdc6c6b72 100644 --- a/marketplace-build/dev/docker-compose.yml +++ b/marketplace-build/dev/docker-compose.yml @@ -24,6 +24,7 @@ services: volumes: - /home/axonivy/marketplace/data/market-installations.json:/app/data/market-installation.json - marketcache:/app/data/market-cache + - ../logs:/app/logs environment: - MONGODB_HOST=${SERVICE_MONGODB_HOST} - MONGODB_DATABASE=${SERVICE_MONGODB_DATABASE} @@ -36,6 +37,7 @@ services: - MARKET_JWT_SECRET_KEY=${MARKET_JWT_SECRET_KEY} - MARKET_CORS_ALLOWED_ORIGIN=${MARKET_CORS_ALLOWED_ORIGIN} - MARKET_MONGO_LOG_LEVEL=${MARKET_MONGO_LOG_LEVEL} + - MARKET_LOG_PATH=${MARKET_LOG_PATH} build: context: ../../marketplace-service dockerfile: Dockerfile diff --git a/marketplace-build/docker-compose.yml b/marketplace-build/docker-compose.yml index 74011c3a5..49c421c61 100644 --- a/marketplace-build/docker-compose.yml +++ b/marketplace-build/docker-compose.yml @@ -24,6 +24,7 @@ services: volumes: - /home/axonivy/marketplace/data/market-installations.json:/app/data/market-installation.json - marketcache:/app/data/market-cache + - ../logs:/app/logs environment: - MONGODB_HOST=${SERVICE_MONGODB_HOST} - MONGODB_DATABASE=${SERVICE_MONGODB_DATABASE} @@ -36,6 +37,7 @@ services: - MARKET_JWT_SECRET_KEY=${MARKET_JWT_SECRET_KEY} - MARKET_CORS_ALLOWED_ORIGIN=${MARKET_CORS_ALLOWED_ORIGIN} - MARKET_MONGO_LOG_LEVEL=${MARKET_MONGO_LOG_LEVEL} + - MARKET_LOG_PATH=${MARKET_LOG_PATH} build: context: ../marketplace-service dockerfile: Dockerfile diff --git a/marketplace-build/release/.env b/marketplace-build/release/.env index d8dfb5f8a..fd7ac7016 100644 --- a/marketplace-build/release/.env +++ b/marketplace-build/release/.env @@ -13,4 +13,5 @@ MARKET_GITHUB_OAUTH_APP_CLIENT_ID= MARKET_GITHUB_OAUTH_APP_CLIENT_SECRET= MARKET_JWT_SECRET_KEY= MARKET_CORS_ALLOWED_ORIGIN=* -MARKET_MONGO_LOG_LEVEL=DEBUG \ No newline at end of file +MARKET_MONGO_LOG_LEVEL=DEBUG +MARKET_LOG_PATH=logs \ No newline at end of file diff --git a/marketplace-build/release/docker-compose.yml b/marketplace-build/release/docker-compose.yml index f8fc73f25..f483fba17 100644 --- a/marketplace-build/release/docker-compose.yml +++ b/marketplace-build/release/docker-compose.yml @@ -22,6 +22,7 @@ services: volumes: - /home/axonivy/marketplace/data/market-installations.json:/app/data/market-installation.json - marketcache:/app/data/market-cache + - ../logs:/app/logs environment: - MONGODB_HOST=${SERVICE_MONGODB_HOST} - MONGODB_DATABASE=${SERVICE_MONGODB_DATABASE} @@ -34,6 +35,7 @@ services: - MARKET_JWT_SECRET_KEY=${MARKET_JWT_SECRET_KEY} - MARKET_CORS_ALLOWED_ORIGIN=${MARKET_CORS_ALLOWED_ORIGIN} - MARKET_MONGO_LOG_LEVEL=${MARKET_MONGO_LOG_LEVEL} + - MARKET_LOG_PATH=${MARKET_LOG_PATH} networks: - marketplace-network diff --git a/marketplace-service/pom.xml b/marketplace-service/pom.xml index 8bdb6e625..ec7ccc0ed 100644 --- a/marketplace-service/pom.xml +++ b/marketplace-service/pom.xml @@ -73,7 +73,11 @@ jaxb-api 2.3.1 - + + org.springframework.boot + spring-boot-starter-aop + + org.springframework.boot spring-boot-starter-validation diff --git a/marketplace-service/src/main/java/com/axonivy/market/config/RestTemplateConfig.java b/marketplace-service/src/main/java/com/axonivy/market/config/RestTemplateConfig.java new file mode 100644 index 000000000..0dcfd01a7 --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/config/RestTemplateConfig.java @@ -0,0 +1,14 @@ +package com.axonivy.market.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +@Configuration +public class RestTemplateConfig { + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } +} \ No newline at end of file diff --git a/marketplace-service/src/main/java/com/axonivy/market/constants/CommonConstants.java b/marketplace-service/src/main/java/com/axonivy/market/constants/CommonConstants.java index 2966383f4..e80c2b57d 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/constants/CommonConstants.java +++ b/marketplace-service/src/main/java/com/axonivy/market/constants/CommonConstants.java @@ -6,6 +6,7 @@ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class CommonConstants { public static final String REQUESTED_BY = "X-Requested-By"; + public static final String USER_AGENT = "user-agent"; public static final String SLASH = "/"; public static final String DOT_SEPARATOR = "."; public static final String PLUS = "+"; diff --git a/marketplace-service/src/main/java/com/axonivy/market/constants/GitHubConstants.java b/marketplace-service/src/main/java/com/axonivy/market/constants/GitHubConstants.java index 41e42393e..010bc7a3b 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/constants/GitHubConstants.java +++ b/marketplace-service/src/main/java/com/axonivy/market/constants/GitHubConstants.java @@ -19,15 +19,19 @@ public static class Json { public static final String CLIENT_ID = "client_id"; public static final String CLIENT_SECRET = "client_secret"; public static final String CODE = "code"; - public static final String USER_ID = "id"; - public static final String USER_NAME = "name"; - public static final String USER_AVATAR_URL = "avatar_url"; - public static final String USER_LOGIN_NAME = "login"; + public static final String SEVERITY = "severity"; + public static final String SECURITY_SEVERITY_LEVEL = "security_severity_level"; + public static final String SEVERITY_ADVISORY = "security_advisory"; + public static final String RULE = "rule"; } @NoArgsConstructor(access = AccessLevel.PRIVATE) public static class Url { private static final String BASE_URL = "https://api.github.com"; - public static final String USER = BASE_URL + "/user"; + public static final String REPO_DEPENDABOT_ALERTS_OPEN = BASE_URL + "/repos/%s/%s/dependabot/alerts?state=open"; + public static final String REPO_SECRET_SCANNING_ALERTS_OPEN = + BASE_URL + "/repos/%s/%s/secret-scanning/alerts?state=open"; + public static final String REPO_CODE_SCANNING_ALERTS_OPEN = + BASE_URL + "/repos/%s/%s/code-scanning/alerts?state=open"; } } diff --git a/marketplace-service/src/main/java/com/axonivy/market/constants/LoggingConstants.java b/marketplace-service/src/main/java/com/axonivy/market/constants/LoggingConstants.java new file mode 100644 index 000000000..2ce721583 --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/constants/LoggingConstants.java @@ -0,0 +1,22 @@ +package com.axonivy.market.constants; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class LoggingConstants { + + public static final String ENTRY_FORMAT = " <%s>%s%n"; + public static final String ENTRY_START = " \n"; + public static final String ENTRY_END = " \n"; + public static final String DATE_FORMAT = "yyyy-MM-dd"; + public static final String TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss"; + public static final String LOG_START = "\n"; + public static final String LOG_END = ""; + public static final String METHOD = "method"; + public static final String ARGUMENTS = "arguments"; + public static final String TIMESTAMP = "timestamp"; + public static final String NO_ARGUMENTS = "No arguments"; + public static final String MARKET_WEBSITE = "marketplace-website"; + +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/constants/RequestMappingConstants.java b/marketplace-service/src/main/java/com/axonivy/market/constants/RequestMappingConstants.java index 66b14b6d4..3ed09326f 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/constants/RequestMappingConstants.java +++ b/marketplace-service/src/main/java/com/axonivy/market/constants/RequestMappingConstants.java @@ -13,7 +13,7 @@ public class RequestMappingConstants { public static final String FEEDBACK = API + "/feedback"; public static final String IMAGE = API + "/image"; public static final String SYNC = "sync"; - public static final String SYNC_PRODUCT_VERSION = SYNC + "/product-version"; + public static final String SYNC_FIRST_PUBLISHED_DATE_ALL_PRODUCTS = SYNC + "/first-published-date"; public static final String SYNC_ONE_PRODUCT_BY_ID = "sync/{id}"; public static final String SWAGGER_URL = "/swagger-ui/index.html"; public static final String GIT_HUB_LOGIN = "/github/login"; @@ -32,4 +32,5 @@ public class RequestMappingConstants { public static final String LATEST_ARTIFACT_DOWNLOAD_URL_BY_ID = "/{id}/artifact"; public static final String EXTERNAL_DOCUMENT = API + "/externaldocument"; public static final String PRODUCT_MARKETPLACE_DATA = API + "/product-marketplace-data"; + public static final String SECURITY_MONITOR = API + "/security-monitor"; } diff --git a/marketplace-service/src/main/java/com/axonivy/market/controller/ProductController.java b/marketplace-service/src/main/java/com/axonivy/market/controller/ProductController.java index 666488327..44f767ba2 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/controller/ProductController.java +++ b/marketplace-service/src/main/java/com/axonivy/market/controller/ProductController.java @@ -112,34 +112,6 @@ public ResponseEntity syncProducts(@RequestHeader(value = AUTHORIZATION return new ResponseEntity<>(message, HttpStatus.OK); } - /** - * @deprecated - */ - @Deprecated(forRemoval = true , since = "1.6.0") - @PutMapping(SYNC_PRODUCT_VERSION) - @Operation(hidden = true) - public ResponseEntity syncProductVersions(@RequestHeader(value = AUTHORIZATION) String authorizationHeader - ,@RequestParam(value = RESET_SYNC, required = false) Boolean resetSync) { - String token = AuthorizationUtils.getBearerToken(authorizationHeader); - gitHubService.validateUserInOrganizationAndTeam(token, GitHubConstants.AXONIVY_MARKET_ORGANIZATION_NAME, - GitHubConstants.AXONIVY_MARKET_TEAM_NAME); - if (Boolean.TRUE.equals(resetSync)) { - productService.clearAllProductVersion(); - } - int nonSyncResult = metadataService.syncAllProductsMetadata(); - var message = new Message(); - HttpStatus statusCode = HttpStatus.OK; - if(nonSyncResult == 1) { - message.setHelpCode(ErrorCode.SUCCESSFUL.getCode()); - message.setHelpText(ErrorCode.SUCCESSFUL.getHelpText()); - } else { - statusCode = HttpStatus.INTERNAL_SERVER_ERROR; - message.setHelpCode(ErrorCode.MAVEN_VERSION_SYNC_FAILED.getCode()); - message.setMessageDetails(ErrorCode.MAVEN_VERSION_SYNC_FAILED.getHelpText()); - } - return new ResponseEntity<>(message, statusCode); - } - @PutMapping(SYNC_ONE_PRODUCT_BY_ID) @Operation(hidden = true) public ResponseEntity syncOneProduct( @@ -173,6 +145,25 @@ public ResponseEntity syncOneProduct( return new ResponseEntity<>(message, HttpStatus.OK); } + @PutMapping(SYNC_FIRST_PUBLISHED_DATE_ALL_PRODUCTS) + @Operation(hidden = true) + public ResponseEntity syncFirstPublishedDateOfAllProducts( + @RequestHeader(value = AUTHORIZATION) String authorizationHeader) { + String token = AuthorizationUtils.getBearerToken(authorizationHeader); + gitHubService.validateUserInOrganizationAndTeam(token, GitHubConstants.AXONIVY_MARKET_ORGANIZATION_NAME, + GitHubConstants.AXONIVY_MARKET_TEAM_NAME); + + var message = new Message(); + var isSuccess = productService.syncFirstPublishedDateOfAllProducts(); + if (isSuccess) { + message.setHelpCode(ErrorCode.SUCCESSFUL.getCode()); + message.setMessageDetails("Sync successfully!"); + } else { + message.setMessageDetails("Sync unsuccessfully!"); + } + return new ResponseEntity<>(message, HttpStatus.OK); + } + @SuppressWarnings("unchecked") private ResponseEntity> generateEmptyPagedModel() { var emptyPagedModel = (PagedModel) pagedResourcesAssembler.toEmptyModel(Page.empty(), diff --git a/marketplace-service/src/main/java/com/axonivy/market/controller/ProductMarketplaceDataController.java b/marketplace-service/src/main/java/com/axonivy/market/controller/ProductMarketplaceDataController.java index 728251b33..cd4abe584 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/controller/ProductMarketplaceDataController.java +++ b/marketplace-service/src/main/java/com/axonivy/market/controller/ProductMarketplaceDataController.java @@ -3,13 +3,12 @@ import com.axonivy.market.constants.GitHubConstants; import com.axonivy.market.enums.ErrorCode; import com.axonivy.market.github.service.GitHubService; +import com.axonivy.market.logging.Loggable; import com.axonivy.market.model.Message; import com.axonivy.market.model.ProductCustomSortRequest; import com.axonivy.market.service.ProductMarketplaceDataService; import com.axonivy.market.util.AuthorizationUtils; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; @@ -36,7 +35,7 @@ public class ProductMarketplaceDataController { private final GitHubService gitHubService; private final ProductMarketplaceDataService productMarketplaceDataService; - + @PostMapping(CUSTOM_SORT) @Operation(hidden = true) public ResponseEntity createCustomSortProducts( @@ -51,15 +50,14 @@ public ResponseEntity createCustomSortProducts( return new ResponseEntity<>(message, HttpStatus.OK); } + @Loggable + @Operation(hidden = true) @PutMapping(INSTALLATION_COUNT_BY_ID) - @Operation(summary = "Update installation count of product", - description = "By default, increase installation count when click download product files by users") public ResponseEntity syncInstallationCount( - @PathVariable(ID) @Parameter(description = "Product id (from meta.json)", example = "approval-decision-utils", - in = ParameterIn.PATH) String productId, - @RequestParam(name = DESIGNER_VERSION, required = false) @Parameter(in = ParameterIn.QUERY, - example = "v10.0.20") String designerVersion) { + @PathVariable(ID) String productId, + @RequestParam(name = DESIGNER_VERSION, required = false) String designerVersion) { int result = productMarketplaceDataService.updateInstallationCountForProduct(productId, designerVersion); return new ResponseEntity<>(result, HttpStatus.OK); } + } diff --git a/marketplace-service/src/main/java/com/axonivy/market/controller/SecurityMonitorController.java b/marketplace-service/src/main/java/com/axonivy/market/controller/SecurityMonitorController.java new file mode 100644 index 000000000..40fd28b0a --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/controller/SecurityMonitorController.java @@ -0,0 +1,39 @@ +package com.axonivy.market.controller; + +import com.axonivy.market.constants.GitHubConstants; +import com.axonivy.market.github.service.GitHubService; +import com.axonivy.market.github.model.ProductSecurityInfo; +import com.axonivy.market.util.AuthorizationUtils; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import static com.axonivy.market.constants.RequestMappingConstants.SECURITY_MONITOR; +import static org.springframework.http.HttpHeaders.AUTHORIZATION; + +@RestController +@RequestMapping(SECURITY_MONITOR) +@Tag(name = "Security Monitor Controllers", description = "API collection to get Github Marketplace security's detail.") +@AllArgsConstructor +public class SecurityMonitorController { + private final GitHubService gitHubService; + + @GetMapping + @Operation(hidden = true) + public ResponseEntity getGitHubMarketplaceSecurity( + @RequestHeader(value = AUTHORIZATION) String authorizationHeader) { + String token = AuthorizationUtils.getBearerToken(authorizationHeader); + gitHubService.validateUserInOrganizationAndTeam(token, GitHubConstants.AXONIVY_MARKET_ORGANIZATION_NAME, + GitHubConstants.AXONIVY_MARKET_TEAM_NAME); + List securityInfoList = gitHubService.getSecurityDetailsForAllProducts(token, + GitHubConstants.AXONIVY_MARKET_ORGANIZATION_NAME); + return ResponseEntity.ok(securityInfoList); + } +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/entity/Product.java b/marketplace-service/src/main/java/com/axonivy/market/entity/Product.java index 9fe2edbb1..bfe5eeac5 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/entity/Product.java +++ b/marketplace-service/src/main/java/com/axonivy/market/entity/Product.java @@ -64,20 +64,12 @@ public class Product implements Serializable { @Transient private int installationCount; private Date newestPublishedDate; + private Date firstPublishedDate; private String newestReleaseVersion; @Transient private ProductModuleContent productModuleContent; private List artifacts; - /** - * @deprecated - */ - @Deprecated(forRemoval = true, since = "1.6.0") private Boolean synchronizedInstallationCount; - /** - * @deprecated - */ - @Deprecated(forRemoval = true, since = "1.6.0") - private Integer customOrder; private List releasedVersions; @Transient private String metaProductJsonUrl; diff --git a/marketplace-service/src/main/java/com/axonivy/market/entity/ProductJsonContent.java b/marketplace-service/src/main/java/com/axonivy/market/entity/ProductJsonContent.java index ab10d7d99..a6a48fb6f 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/entity/ProductJsonContent.java +++ b/marketplace-service/src/main/java/com/axonivy/market/entity/ProductJsonContent.java @@ -25,11 +25,6 @@ public class ProductJsonContent { @JsonIgnore private String id; private String version; - /** - * @deprecated - */ - @Deprecated(forRemoval = true, since = "1.5.0") - private String relatedTag; private String productId; private String name; private String content; diff --git a/marketplace-service/src/main/java/com/axonivy/market/entity/ProductModuleContent.java b/marketplace-service/src/main/java/com/axonivy/market/entity/ProductModuleContent.java index 52a5f7946..8b5a6e359 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/entity/ProductModuleContent.java +++ b/marketplace-service/src/main/java/com/axonivy/market/entity/ProductModuleContent.java @@ -14,7 +14,6 @@ import java.io.Serializable; import java.util.Date; import java.util.Map; -import java.util.Set; import static com.axonivy.market.constants.EntityConstants.PRODUCT_MODULE_CONTENT; @@ -31,18 +30,6 @@ public class ProductModuleContent implements Serializable { private static final long serialVersionUID = 1L; @Schema(description = "product Id (from meta.json)", example = "portal") private String productId; - /** - * @deprecated - */ - @Deprecated(forRemoval = true, since = "1.5.0") - @Schema(description = "Target release tag", example = "v10.0.25") - private String tag; - /** - * @deprecated - */ - @Deprecated(forRemoval = true, since = "1.5.0") - @Schema(description = "Versions in maven", example = "10.0.25-SNAPSHOT") - private Set mavenVersions; @Schema(description = "Maven version", example = "10.0.25") private String version; @Schema(description = "Product detail description content ", diff --git a/marketplace-service/src/main/java/com/axonivy/market/enums/AccessLevel.java b/marketplace-service/src/main/java/com/axonivy/market/enums/AccessLevel.java new file mode 100644 index 000000000..8a382314d --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/enums/AccessLevel.java @@ -0,0 +1,10 @@ +package com.axonivy.market.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum AccessLevel { + NO_PERMISSION, ENABLED, DISABLED +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/enums/SortOption.java b/marketplace-service/src/main/java/com/axonivy/market/enums/SortOption.java index 104e18b0a..d46ba9711 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/enums/SortOption.java +++ b/marketplace-service/src/main/java/com/axonivy/market/enums/SortOption.java @@ -11,7 +11,7 @@ public enum SortOption { POPULARITY("popularity", "marketplaceData.installationCount", Sort.Direction.DESC), ALPHABETICALLY("alphabetically", "names", Sort.Direction.ASC), - RECENT("recent", "newestPublishedDate", Sort.Direction.DESC), + RECENT("recent", "firstPublishedDate", Sort.Direction.DESC), STANDARD("standard", "marketplaceData.customOrder", Sort.Direction.DESC), ID("id", "_id", Sort.Direction.ASC); diff --git a/marketplace-service/src/main/java/com/axonivy/market/github/model/CodeScanning.java b/marketplace-service/src/main/java/com/axonivy/market/github/model/CodeScanning.java new file mode 100644 index 000000000..3d74354fe --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/github/model/CodeScanning.java @@ -0,0 +1,16 @@ +package com.axonivy.market.github.model; + +import com.axonivy.market.enums.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.Map; + +@Getter +@Setter +@NoArgsConstructor +public class CodeScanning { + private Map alerts; + private AccessLevel status; +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/github/model/Dependabot.java b/marketplace-service/src/main/java/com/axonivy/market/github/model/Dependabot.java new file mode 100644 index 000000000..d73fc8925 --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/github/model/Dependabot.java @@ -0,0 +1,16 @@ +package com.axonivy.market.github.model; + +import com.axonivy.market.enums.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.Map; + +@Getter +@Setter +@NoArgsConstructor +public class Dependabot { + private Map alerts; + private AccessLevel status; +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/github/model/ProductSecurityInfo.java b/marketplace-service/src/main/java/com/axonivy/market/github/model/ProductSecurityInfo.java new file mode 100644 index 000000000..efca212f3 --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/github/model/ProductSecurityInfo.java @@ -0,0 +1,24 @@ +package com.axonivy.market.github.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.Date; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class ProductSecurityInfo { + private String repoName; + private boolean isArchived; + private String visibility; + private boolean branchProtectionEnabled; + private Date lastCommitDate; + private String latestCommitSHA; + private Dependabot dependabot; + private SecretScanning secretScanning; + private CodeScanning codeScanning; +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/github/model/SecretScanning.java b/marketplace-service/src/main/java/com/axonivy/market/github/model/SecretScanning.java new file mode 100644 index 000000000..fbf834a98 --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/github/model/SecretScanning.java @@ -0,0 +1,14 @@ +package com.axonivy.market.github.model; + +import com.axonivy.market.enums.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class SecretScanning { + private Integer numberOfAlerts; + private AccessLevel status; +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/github/service/GitHubService.java b/marketplace-service/src/main/java/com/axonivy/market/github/service/GitHubService.java index dca4173d9..b7357fcf7 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/github/service/GitHubService.java +++ b/marketplace-service/src/main/java/com/axonivy/market/github/service/GitHubService.java @@ -6,6 +6,7 @@ import com.axonivy.market.exceptions.model.UnauthorizedException; import com.axonivy.market.github.model.GitHubAccessTokenResponse; import com.axonivy.market.github.model.GitHubProperty; +import com.axonivy.market.github.model.ProductSecurityInfo; import org.kohsuke.github.GHContent; import org.kohsuke.github.GHOrganization; import org.kohsuke.github.GHRepository; @@ -37,4 +38,6 @@ GitHubAccessTokenResponse getAccessToken(String code, GitHubProperty gitHubPrope User getAndUpdateUser(String accessToken); void validateUserInOrganizationAndTeam(String accessToken, String team, String org) throws UnauthorizedException; + + List getSecurityDetailsForAllProducts(String accessToken, String orgName); } diff --git a/marketplace-service/src/main/java/com/axonivy/market/github/service/impl/GHAxonIvyProductRepoServiceImpl.java b/marketplace-service/src/main/java/com/axonivy/market/github/service/impl/GHAxonIvyProductRepoServiceImpl.java index ae3285ca8..1d369842f 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/github/service/impl/GHAxonIvyProductRepoServiceImpl.java +++ b/marketplace-service/src/main/java/com/axonivy/market/github/service/impl/GHAxonIvyProductRepoServiceImpl.java @@ -4,7 +4,6 @@ import com.axonivy.market.constants.ReadmeConstants; import com.axonivy.market.entity.Product; import com.axonivy.market.entity.ProductModuleContent; -import com.axonivy.market.enums.Language; import com.axonivy.market.github.service.GHAxonIvyProductRepoService; import com.axonivy.market.github.service.GitHubService; import com.axonivy.market.github.util.GitHubUtils; @@ -12,7 +11,6 @@ import com.axonivy.market.service.ImageService; import com.axonivy.market.util.ProductContentUtils; import lombok.extern.log4j.Log4j2; -import org.apache.commons.lang3.StringUtils; import org.kohsuke.github.GHContent; import org.kohsuke.github.GHOrganization; import org.springframework.stereotype.Service; @@ -26,7 +24,6 @@ import java.util.Optional; import static com.axonivy.market.constants.CommonConstants.IMAGE_ID_PREFIX; -import static com.axonivy.market.util.ProductContentUtils.*; @Log4j2 @Service diff --git a/marketplace-service/src/main/java/com/axonivy/market/github/service/impl/GitHubServiceImpl.java b/marketplace-service/src/main/java/com/axonivy/market/github/service/impl/GitHubServiceImpl.java index 293850c62..6030dae03 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/github/service/impl/GitHubServiceImpl.java +++ b/marketplace-service/src/main/java/com/axonivy/market/github/service/impl/GitHubServiceImpl.java @@ -8,37 +8,43 @@ import com.axonivy.market.exceptions.model.NotFoundException; import com.axonivy.market.exceptions.model.Oauth2ExchangeCodeException; import com.axonivy.market.exceptions.model.UnauthorizedException; +import com.axonivy.market.github.model.CodeScanning; +import com.axonivy.market.github.model.Dependabot; import com.axonivy.market.github.model.GitHubAccessTokenResponse; import com.axonivy.market.github.model.GitHubProperty; +import com.axonivy.market.github.model.SecretScanning; import com.axonivy.market.github.service.GitHubService; +import com.axonivy.market.github.model.ProductSecurityInfo; import com.axonivy.market.repository.UserRepository; import lombok.extern.log4j.Log4j2; -import org.kohsuke.github.GHContent; -import org.kohsuke.github.GHOrganization; -import org.kohsuke.github.GHRepository; -import org.kohsuke.github.GHTag; -import org.kohsuke.github.GHTeam; -import org.kohsuke.github.GitHub; -import org.kohsuke.github.GitHubBuilder; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.kohsuke.github.*; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; import java.io.IOException; import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; import static org.apache.commons.lang3.StringUtils.EMPTY; @@ -49,12 +55,14 @@ public class GitHubServiceImpl implements GitHubService { private final RestTemplate restTemplate; private final UserRepository userRepository; private final GitHubProperty gitHubProperty; + private final ThreadPoolTaskScheduler taskScheduler; - public GitHubServiceImpl(RestTemplateBuilder restTemplateBuilder, UserRepository userRepository, - GitHubProperty gitHubProperty) { - this.restTemplate = restTemplateBuilder.build(); + public GitHubServiceImpl(RestTemplate restTemplate, UserRepository userRepository, + GitHubProperty gitHubProperty, ThreadPoolTaskScheduler taskScheduler) { + this.restTemplate = restTemplate; this.userRepository = userRepository; this.gitHubProperty = gitHubProperty; + this.taskScheduler = taskScheduler; } @Override @@ -96,8 +104,8 @@ public GHContent getGHContent(GHRepository ghRepository, String path, String ref } @Override - public GitHubAccessTokenResponse getAccessToken(String code, GitHubProperty gitHubProperty) - throws Oauth2ExchangeCodeException, MissingHeaderException { + public GitHubAccessTokenResponse getAccessToken(String code, + GitHubProperty gitHubProperty) throws Oauth2ExchangeCodeException, MissingHeaderException { if (gitHubProperty == null) { throw new MissingHeaderException(); } @@ -109,7 +117,6 @@ public GitHubAccessTokenResponse getAccessToken(String code, GitHubProperty gitH HttpHeaders headers = new HttpHeaders(); headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON)); HttpEntity> request = new HttpEntity<>(params, headers); - ResponseEntity responseEntity = restTemplate.postForEntity( GitHubConstants.GITHUB_GET_ACCESS_TOKEN_URL, request, GitHubAccessTokenResponse.class); GitHubAccessTokenResponse response = responseEntity.getBody(); @@ -125,38 +132,21 @@ public GitHubAccessTokenResponse getAccessToken(String code, GitHubProperty gitH @Override public User getAndUpdateUser(String accessToken) { - HttpHeaders headers = new HttpHeaders(); - headers.setBearerAuth(accessToken); - HttpEntity entity = new HttpEntity<>(headers); - - ResponseEntity> response = restTemplate.exchange(GitHubConstants.Url.USER, HttpMethod.GET, - entity, new ParameterizedTypeReference<>() { - }); - - Map userDetails = response.getBody(); - - if (userDetails == null) { + try { + GHMyself myself = getGitHub(accessToken).getMyself(); + User user = Optional.ofNullable(userRepository.searchByGitHubId(String.valueOf(myself.getId()))) + .orElse(new User()); + user.setGitHubId(String.valueOf(myself.getId())); + user.setName(myself.getName()); + user.setUsername(myself.getLogin()); + user.setAvatarUrl(myself.getAvatarUrl()); + user.setProvider(GitHubConstants.GITHUB_PROVIDER_NAME); + userRepository.save(user); + return user; + } catch (IOException e) { + log.error("GitHub user fetch failed", e); throw new NotFoundException(ErrorCode.GITHUB_USER_NOT_FOUND, "Failed to fetch user details from GitHub"); } - - String gitHubId = userDetails.get(GitHubConstants.Json.USER_ID).toString(); - String name = (String) userDetails.get(GitHubConstants.Json.USER_NAME); - String avatarUrl = (String) userDetails.get(GitHubConstants.Json.USER_AVATAR_URL); - String username = (String) userDetails.get(GitHubConstants.Json.USER_LOGIN_NAME); - - User user = userRepository.searchByGitHubId(gitHubId); - if (user == null) { - user = new User(); - } - user.setGitHubId(gitHubId); - user.setName(name); - user.setUsername(username); - user.setAvatarUrl(avatarUrl); - user.setProvider(GitHubConstants.GITHUB_PROVIDER_NAME); - - userRepository.save(user); - - return user; } @Override @@ -172,12 +162,30 @@ public void validateUserInOrganizationAndTeam(String accessToken, String organiz } throw new UnauthorizedException(ErrorCode.GITHUB_USER_UNAUTHORIZED.getCode(), - String.format(ErrorMessageConstants.INVALID_USER_ERROR, ErrorCode.GITHUB_USER_UNAUTHORIZED.getHelpText(), - team, organization)); + String.format(ErrorMessageConstants.INVALID_USER_ERROR, ErrorCode.GITHUB_USER_UNAUTHORIZED.getHelpText(), team, + organization)); + } + + @Override + public List getSecurityDetailsForAllProducts(String accessToken, String orgName) { + try { + GitHub gitHub = getGitHub(accessToken); + GHOrganization organization = gitHub.getOrganization(orgName); + + List> futures = organization.listRepositories().toList().stream() + .map(repo -> CompletableFuture.supplyAsync(() -> fetchSecurityInfoSafe(repo, organization, accessToken), + taskScheduler.getScheduledExecutor())).toList(); + + return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])) + .thenApply(v -> futures.stream().map(CompletableFuture::join).sorted( + Comparator.comparing(ProductSecurityInfo::getRepoName)).collect(Collectors.toList())).join(); + } catch (IOException e) { + log.error(e.getStackTrace()); + return Collections.emptyList(); + } } - private boolean isUserInOrganizationAndTeam(GitHub gitHub, String organization, - String teamName) throws IOException { + public boolean isUserInOrganizationAndTeam(GitHub gitHub, String organization, String teamName) throws IOException { if (gitHub == null) { return false; } @@ -188,7 +196,7 @@ private boolean isUserInOrganizationAndTeam(GitHub gitHub, String organization, return false; } - for (GHTeam team: hashSetTeam) { + for (GHTeam team : hashSetTeam) { if (teamName.equals(team.getName())) { return true; } @@ -196,4 +204,136 @@ private boolean isUserInOrganizationAndTeam(GitHub gitHub, String organization, return false; } + + public ProductSecurityInfo fetchSecurityInfoSafe(GHRepository repo, GHOrganization organization, + String accessToken) { + try { + return fetchSecurityInfo(repo, organization, accessToken); + } catch (IOException e) { + log.error("Error fetching security info for repo: " + repo.getName(), e); + return new ProductSecurityInfo(); + } + } + + private ProductSecurityInfo fetchSecurityInfo(GHRepository repo, GHOrganization organization, + String accessToken) throws IOException { + ProductSecurityInfo productSecurityInfo = new ProductSecurityInfo(); + productSecurityInfo.setRepoName(repo.getName()); + productSecurityInfo.setVisibility(repo.getVisibility().toString()); + productSecurityInfo.setArchived(repo.isArchived()); + String defaultBranch = repo.getDefaultBranch(); + productSecurityInfo.setBranchProtectionEnabled(repo.getBranch(defaultBranch).isProtected()); + String latestCommitSHA = repo.getBranch(defaultBranch).getSHA1(); + GHCommit latestCommit = repo.getCommit(latestCommitSHA); + productSecurityInfo.setLatestCommitSHA(latestCommitSHA); + productSecurityInfo.setLastCommitDate(latestCommit.getCommitDate()); + productSecurityInfo.setDependabot(getDependabotAlerts(repo, organization, accessToken)); + productSecurityInfo.setSecretScanning(getNumberOfSecretScanningAlerts(repo, organization, + accessToken)); + productSecurityInfo.setCodeScanning(getCodeScanningAlerts(repo, organization, + accessToken)); + return productSecurityInfo; + } + + public Dependabot getDependabotAlerts(GHRepository repo, GHOrganization organization, + String accessToken) { + return fetchAlerts( + accessToken, + String.format(GitHubConstants.Url.REPO_DEPENDABOT_ALERTS_OPEN, organization.getLogin(), repo.getName()), + alerts -> { + Dependabot dependabot = new Dependabot(); + Map severityMap = new HashMap<>(); + for (Map alert : alerts) { + Object advisoryObj = alert.get(GitHubConstants.Json.SEVERITY_ADVISORY); + if (advisoryObj instanceof Map securityAdvisory) { + String severity = (String) securityAdvisory.get(GitHubConstants.Json.SEVERITY); + if (severity != null) { + severityMap.put(severity, severityMap.getOrDefault(severity, 0) + 1); + } + } + } + dependabot.setAlerts(severityMap); + return dependabot; + }, + Dependabot::new + ); + } + + public SecretScanning getNumberOfSecretScanningAlerts(GHRepository repo, + GHOrganization organization, String accessToken) { + return fetchAlerts( + accessToken, + String.format(GitHubConstants.Url.REPO_SECRET_SCANNING_ALERTS_OPEN, organization.getLogin(), repo.getName()), + alerts -> { + SecretScanning secretScanning = new SecretScanning(); + secretScanning.setNumberOfAlerts(alerts.size()); + return secretScanning; + }, + SecretScanning::new + ); + } + + public CodeScanning getCodeScanningAlerts(GHRepository repo, + GHOrganization organization, String accessToken) { + return fetchAlerts( + accessToken, + String.format(GitHubConstants.Url.REPO_CODE_SCANNING_ALERTS_OPEN, organization.getLogin(), repo.getName()), + alerts -> { + CodeScanning codeScanning = new CodeScanning(); + Map codeScanningMap = new HashMap<>(); + for (Map alert : alerts) { + Object ruleObj = alert.get(GitHubConstants.Json.RULE); + if (ruleObj instanceof Map rule) { + String severity = (String) rule.get(GitHubConstants.Json.SECURITY_SEVERITY_LEVEL); + if (severity != null) { + codeScanningMap.put(severity, codeScanningMap.getOrDefault(severity, 0) + 1); + } + } + } + codeScanning.setAlerts(codeScanningMap); + return codeScanning; + }, + CodeScanning::new + ); + } + + private T fetchAlerts( + String accessToken, + String url, + Function>, T> mapAlerts, + Supplier defaultInstanceSupplier + ) { + T instance = defaultInstanceSupplier.get(); + try { + ResponseEntity>> response = fetchApiResponseAsList(accessToken, url); + instance = mapAlerts.apply(response.getBody() != null ? response.getBody() : List.of()); + setStatus(instance, com.axonivy.market.enums.AccessLevel.ENABLED); + } catch (HttpClientErrorException.Forbidden e) { + setStatus(instance, com.axonivy.market.enums.AccessLevel.DISABLED); + } catch (HttpClientErrorException.NotFound e) { + setStatus(instance, com.axonivy.market.enums.AccessLevel.NO_PERMISSION); + } + return instance; + } + + private void setStatus(Object instance, com.axonivy.market.enums.AccessLevel status) { + if (instance instanceof Dependabot dependabot) { + dependabot.setStatus(status); + } else if (instance instanceof SecretScanning secretScanning) { + secretScanning.setStatus(status); + } else if (instance instanceof CodeScanning codeScanning) { + codeScanning.setStatus(status); + } + } + + public ResponseEntity>> fetchApiResponseAsList( + String accessToken, + String url) throws RestClientException { + HttpHeaders headers = new HttpHeaders(); + headers.setBearerAuth(accessToken); + HttpEntity entity = new HttpEntity<>(headers); + + return restTemplate.exchange(url, HttpMethod.GET, entity, new ParameterizedTypeReference<>() { + }); + } } diff --git a/marketplace-service/src/main/java/com/axonivy/market/github/util/GitHubUtils.java b/marketplace-service/src/main/java/com/axonivy/market/github/util/GitHubUtils.java index 0f0de6232..2f3d36598 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/github/util/GitHubUtils.java +++ b/marketplace-service/src/main/java/com/axonivy/market/github/util/GitHubUtils.java @@ -66,29 +66,6 @@ public static String convertArtifactIdToName(String artifactId) { .collect(Collectors.joining(CommonConstants.SPACE_SEPARATOR)); } - public static String extractMessageFromExceptionMessage(String exceptionMessage) { - String json = extractJson(exceptionMessage); - String key = "\"message\":\""; - int startIndex = json.indexOf(key); - if (startIndex != -1) { - startIndex += key.length(); - int endIndex = json.indexOf("\"", startIndex); - if (endIndex != -1) { - return json.substring(startIndex, endIndex); - } - } - return StringUtils.EMPTY; - } - - public static String extractJson(String text) { - int start = text.indexOf("{"); - int end = text.lastIndexOf("}") + 1; - if (start != -1 && end != -1) { - return text.substring(start, end); - } - return StringUtils.EMPTY; - } - public static int sortMetaJsonFirst(String fileName1, String fileName2) { if (fileName1.endsWith(META_FILE)) return -1; diff --git a/marketplace-service/src/main/java/com/axonivy/market/logging/Loggable.java b/marketplace-service/src/main/java/com/axonivy/market/logging/Loggable.java new file mode 100644 index 000000000..3194ee816 --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/logging/Loggable.java @@ -0,0 +1,11 @@ +package com.axonivy.market.logging; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface Loggable { +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/logging/LoggableAspect.java b/marketplace-service/src/main/java/com/axonivy/market/logging/LoggableAspect.java new file mode 100644 index 000000000..48a7712b5 --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/logging/LoggableAspect.java @@ -0,0 +1,99 @@ +package com.axonivy.market.logging; + +import com.axonivy.market.constants.CommonConstants; +import com.axonivy.market.constants.LoggingConstants; +import com.axonivy.market.exceptions.model.MissingHeaderException; +import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.log4j.Log4j2; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Method; +import java.lang.reflect.Parameter; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Map; + +import static com.axonivy.market.util.FileUtils.createFile; +import static com.axonivy.market.util.FileUtils.writeToFile; +import static com.axonivy.market.util.LoggingUtils.*; + +@Log4j2 +@Aspect +@Component +public class LoggableAspect { + + @Value("${loggable.log-path}") + public String logFilePath; + + @Before("@annotation(com.axonivy.market.logging.Loggable)") + public void logMethodCall(JoinPoint joinPoint) throws MissingHeaderException { + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + ServletRequestAttributes attributes = + (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes != null) { + Method method = signature.getMethod(); + HttpServletRequest request = attributes.getRequest(); + Map headersMap = extractHeaders(request, method, joinPoint); + saveLogToDailyFile(headersMap); + + // block execution if request isn't from Market or Ivy Designer + if (!LoggingConstants.MARKET_WEBSITE.equals(headersMap.get(CommonConstants.REQUESTED_BY))) { + throw new MissingHeaderException(); + } + } + } + + private Map extractHeaders(HttpServletRequest request, Method method, + JoinPoint joinPoint) { + return Map.of( + LoggingConstants.METHOD, escapeXml(String.valueOf(method)), + LoggingConstants.TIMESTAMP, escapeXml(getCurrentTimestamp()), + CommonConstants.USER_AGENT, escapeXml(request.getHeader(CommonConstants.USER_AGENT)), + LoggingConstants.ARGUMENTS, + escapeXml(getArgumentsString( + Arrays.stream(method.getParameters()).map(Parameter::getName).toArray(String[]::new), + joinPoint.getArgs())), + CommonConstants.REQUESTED_BY, escapeXml(request.getHeader(CommonConstants.REQUESTED_BY)) + ); + } + + // Use synchronized to prevent race condition + private synchronized void saveLogToDailyFile(Map headersMap) { + try { + File logFile = createFile(generateFileName()); + + StringBuilder content = new StringBuilder(); + if (logFile.exists()) { + content.append(new String(Files.readAllBytes(logFile.toPath()))); + } + if (content.isEmpty()) { + content.append(LoggingConstants.LOG_START); + } + int lastLogIndex = content.lastIndexOf(LoggingConstants.LOG_END); + if (lastLogIndex != -1) { + content.delete(lastLogIndex, content.length()); + } + content.append(buildLogEntry(headersMap)); + content.append(LoggingConstants.LOG_END); + + writeToFile(logFile, content.toString()); + } catch (IOException e) { + log.error("Error writing log to file: {}", e.getMessage()); + } + } + + private String generateFileName() { + return Path.of(logFilePath, "log-" + getCurrentDate() + ".xml").toString(); + } + +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/service/ProductService.java b/marketplace-service/src/main/java/com/axonivy/market/service/ProductService.java index 3e88d59d9..800b37434 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/service/ProductService.java +++ b/marketplace-service/src/main/java/com/axonivy/market/service/ProductService.java @@ -21,5 +21,5 @@ public interface ProductService { boolean syncOneProduct(String productId, String marketItemPath, Boolean overrideMarketItemPath); - void clearAllProductVersion(); + boolean syncFirstPublishedDateOfAllProducts(); } diff --git a/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java b/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java index 24de86232..c26a41dd2 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java +++ b/marketplace-service/src/main/java/com/axonivy/market/service/impl/ProductServiceImpl.java @@ -41,6 +41,7 @@ import org.kohsuke.github.GHCommit; import org.kohsuke.github.GHContent; import org.kohsuke.github.GHRepository; +import org.kohsuke.github.GHTag; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -57,15 +58,7 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; +import java.util.*; import static com.axonivy.market.constants.CommonConstants.SLASH; import static com.axonivy.market.constants.MavenConstants.*; @@ -370,8 +363,8 @@ private List syncProductsFromGitHubRepo(Boolean resetSync) { } else if (productRepo.findById(product.getId()).isPresent()) { continue; } - updateProductContentForNonStandardProduct(ghContentEntity.getValue(), product); + updateFirstPublishedDate(product); updateProductFromReleasedVersions(product); transferComputedDataFromDB(product); productMarketplaceDataRepo.checkAndInitProductMarketplaceDataIfNotExist(product.getId()); @@ -412,6 +405,53 @@ private String mapVendorImage(String productId, GHContent ghContent, String imag return EMPTY; } + private void updateFirstPublishedDate(Product product) { + try { + if (StringUtils.isNotBlank(product.getRepositoryName())) { + List gitHubTags = gitHubService.getRepositoryTags(product.getRepositoryName()); + Date firstTagPublishedDate = getFirstTagPublishedDate(gitHubTags); + product.setFirstPublishedDate(firstTagPublishedDate); + } + } catch (IOException e) { + log.error("Get GH Tags failed: ", e); + } + } + + private Date getFirstTagPublishedDate(List gitHubTags) { + Date firstTagPublishedDate = null; + try { + if (!CollectionUtils.isEmpty(gitHubTags)) { + List sortedTags = sortByTagCommitDate(gitHubTags); + GHCommit commit = sortedTags.get(0).getCommit(); + if (commit != null) { + firstTagPublishedDate = commit.getCommitDate(); + } + } + } catch (IOException e) { + log.error("Get first tag published date failed: ", e); + } + + return firstTagPublishedDate; + } + + private List sortByTagCommitDate(List gitHubTags) { + List sortedTags = new ArrayList<>(gitHubTags); + sortedTags.sort(Comparator.comparing(this::sortByCommitDate, Comparator.nullsLast(Comparator.naturalOrder()))); + return sortedTags; + } + + private Date sortByCommitDate(GHTag gitHubTag) { + Date commitDate = null; + try { + if (gitHubTag.getCommit() != null) { + commitDate = gitHubTag.getCommit().getCommitDate(); + } + } catch (IOException e) { + log.error("Get commit date of tag commit failed: ", e); + } + return commitDate; + } + private void updateProductFromReleasedVersions(Product product) { if (ObjectUtils.isEmpty(product.getArtifacts())) { return; @@ -536,7 +576,6 @@ private String createProductArtifactId(Artifact mavenArtifact) { : mavenArtifact.getArtifactId().concat(PRODUCT_ARTIFACT_POSTFIX); } - // Cover 3 cases after removing non-numeric characters (8, 11.1 and 10.0.2) @Override public String getCompatibilityFromOldestVersion(String oldestVersion) { @@ -628,6 +667,7 @@ public boolean syncOneProduct(String productId, String marketItemPath, Boolean o log.info("Update data of product {} from meta.json and logo files", productId); mappingMetaDataAndLogoFromGHContent(gitHubContents, product); updateProductContentForNonStandardProduct(gitHubContents, product); + updateFirstPublishedDate(product); updateProductFromReleasedVersions(product); productMarketplaceDataRepo.checkAndInitProductMarketplaceDataIfNotExist(productId); productRepo.save(product); @@ -640,13 +680,6 @@ public boolean syncOneProduct(String productId, String marketItemPath, Boolean o return false; } - @Override - public void clearAllProductVersion() { - metadataRepo.deleteAll(); - metadataSyncRepo.deleteAll(); - mavenArtifactVersionRepo.deleteAll(); - } - private Product renewProductById(String productId, String marketItemPath, Boolean overrideMarketItemPath) { Product product = new Product(); productRepo.findById(productId).ifPresent(foundProduct -> { @@ -692,4 +725,28 @@ private void updateProductContentForNonStandardProduct(List ghContent productModuleContentRepo.save(initialContent); } } + + @Override + public boolean syncFirstPublishedDateOfAllProducts() { + try { + List products = productRepo.findAll(); + if (!CollectionUtils.isEmpty(products)) { + for (Product product : products) { + if (product.getFirstPublishedDate() == null) { + log.info("sync FirstPublishedDate of product {} is starting ...", product.getId()); + updateFirstPublishedDate(product); + productRepo.save(product); + log.info("Sync FirstPublishedDate of product {} is finished!", product.getId()); + } else { + log.info("FirstPublishedDate of product {} is existing!", product.getId()); + } + } + } + log.info("sync FirstPublishedDate of all products is finished!"); + return true; + } catch (Exception e) { + log.error(e.getStackTrace()); + return false; + } + } } \ No newline at end of file diff --git a/marketplace-service/src/main/java/com/axonivy/market/util/FileUtils.java b/marketplace-service/src/main/java/com/axonivy/market/util/FileUtils.java new file mode 100644 index 000000000..6eeb35248 --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/util/FileUtils.java @@ -0,0 +1,31 @@ +package com.axonivy.market.util; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class FileUtils { + + public static File createFile(String fileName) throws IOException { + File file = new File(fileName); + File parentDir = file.getParentFile(); + if (parentDir != null && !parentDir.exists() && !parentDir.mkdirs()) { + throw new IOException("Failed to create directory: " + parentDir.getAbsolutePath()); + } + if (!file.exists() && !file.createNewFile()) { + throw new IOException("Failed to create file: " + file.getAbsolutePath()); + } + return file; + } + + public static void writeToFile(File file, String content) throws IOException { + try (FileWriter writer = new FileWriter(file, false)) { + writer.write(content); + } + } + +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/util/LoggingUtils.java b/marketplace-service/src/main/java/com/axonivy/market/util/LoggingUtils.java new file mode 100644 index 000000000..e69929bc1 --- /dev/null +++ b/marketplace-service/src/main/java/com/axonivy/market/util/LoggingUtils.java @@ -0,0 +1,54 @@ +package com.axonivy.market.util; + +import com.axonivy.market.constants.LoggingConstants; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.TreeMap; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class LoggingUtils { + + public static String getCurrentDate() { + return new SimpleDateFormat(LoggingConstants.DATE_FORMAT).format(System.currentTimeMillis()); + } + + public static String getCurrentTimestamp() { + return new SimpleDateFormat(LoggingConstants.TIMESTAMP_FORMAT).format(System.currentTimeMillis()); + } + + public static String escapeXml(String value) { + if (StringUtils.isEmpty(value)) { + return StringUtils.EMPTY; + } + return value.replace("&", "&") + .replace("<", "<") + .replace(">", ">") + .replace("\"", """) + .replace("'", "'"); + } + + public static String getArgumentsString(String[] paramNames, Object[] args) { + if (paramNames == null || paramNames.length == 0 || args == null || args.length == 0) { + return LoggingConstants.NO_ARGUMENTS; + } + return IntStream.range(0, paramNames.length) + .mapToObj(i -> paramNames[i] + ": " + args[i]) + .collect(Collectors.joining(", ")); + } + + public static String buildLogEntry(Map headersMap) { + StringBuilder logEntry = new StringBuilder(); + Map map = new TreeMap<>(headersMap); + logEntry.append(LoggingConstants.ENTRY_START); + map.forEach((key, value) -> logEntry.append(String.format(LoggingConstants.ENTRY_FORMAT, key, value, key))); + logEntry.append(LoggingConstants.ENTRY_END); + return logEntry.toString(); + } + +} diff --git a/marketplace-service/src/main/java/com/axonivy/market/util/ProductContentUtils.java b/marketplace-service/src/main/java/com/axonivy/market/util/ProductContentUtils.java index 9e3bbb078..a90e3be0b 100644 --- a/marketplace-service/src/main/java/com/axonivy/market/util/ProductContentUtils.java +++ b/marketplace-service/src/main/java/com/axonivy/market/util/ProductContentUtils.java @@ -22,12 +22,16 @@ import static com.axonivy.market.constants.ProductJsonConstants.DEFAULT_PRODUCT_TYPE; public class ProductContentUtils { - public static final String DEMO_SETUP_TITLE = "(?i)## Demo|## Setup"; + /* + * Accept any combination of #, can be ## or ###, and whitespaces before Demo/Setup word + * Match exactly Demo or Setup + */ + public static final String DEMO_SETUP_TITLE = "(?m)^[#\\s]*##?\\s*(Demo|Setup)\\s*$"; private static final String HASH = "#"; public static final String DESCRIPTION = "description"; public static final String DEMO = "demo"; public static final String SETUP = "setup"; - public static final String README_IMAGE_FORMAT = "\\(([^)]*?/)?%s\\)"; + public static final String README_IMAGE_FORMAT = "\\(([^)]*?/)?%s(\\s+\"[^\"]+\")?\\)"; public static final String IMAGE_DOWNLOAD_URL_FORMAT = "(%s)"; private ProductContentUtils() { @@ -59,7 +63,7 @@ public static String getReadmeFileLocale(String readmeFile) { // Cover some cases including when demo and setup parts switch positions or // missing one of them - public static ReadmeContentsModel getExtractedPartsOfReadme( String readmeContents) { + public static ReadmeContentsModel getExtractedPartsOfReadme(String readmeContents) { String[] parts = readmeContents.split(DEMO_SETUP_TITLE); int demoIndex = readmeContents.indexOf(ReadmeConstants.DEMO_PART); int setupIndex = readmeContents.indexOf(ReadmeConstants.SETUP_PART); @@ -71,7 +75,13 @@ public static ReadmeContentsModel getExtractedPartsOfReadme( String readmeConten description = removeFirstLine(parts[0]); } - if (demoIndex != -1 && setupIndex != -1) { + if (parts.length == 2) { + if (demoIndex != -1) { + demo = parts[1]; + } else { + setup = parts[1]; + } + } else if (demoIndex != -1 && setupIndex != -1 && parts.length > 2) { if (demoIndex < setupIndex) { demo = parts[1]; setup = parts[2]; @@ -79,10 +89,6 @@ public static ReadmeContentsModel getExtractedPartsOfReadme( String readmeConten setup = parts[1]; demo = parts[2]; } - } else if (demoIndex != -1) { - demo = parts[1]; - } else if (setupIndex != -1) { - setup = parts[1]; } ReadmeContentsModel readmeContentsModel = new ReadmeContentsModel(); @@ -139,6 +145,11 @@ public static void updateProductModuleTabContents(ProductModuleContent productMo productModuleContent.setSetup(replaceEmptyContentsWithEnContent(moduleContents.get(SETUP))); } + /** + * Cover some inconsistent cases: + * Products contain image names in round brackets (employee-onboarding, demo-projects, etc.) + * Image with name contains in other images' (mattermost) + */ public static String replaceImageDirWithImageCustomId(Map imageUrls, String readmeContents) { for (Map.Entry entry : imageUrls.entrySet()) { String imagePattern = String.format(README_IMAGE_FORMAT, Pattern.quote(entry.getKey())); diff --git a/marketplace-service/src/main/resources/application.properties b/marketplace-service/src/main/resources/application.properties index 3e81b354f..a0ab0a261 100644 --- a/marketplace-service/src/main/resources/application.properties +++ b/marketplace-service/src/main/resources/application.properties @@ -16,4 +16,5 @@ market.github.oauth2-clientSecret=${MARKET_GITHUB_OAUTH_APP_CLIENT_SECRET} jwt.secret=${MARKET_JWT_SECRET_KEY} jwt.expiration=365 logging.level.org.springframework.data.mongodb.core.MongoTemplate=${MARKET_MONGO_LOG_LEVEL} -spring.jackson.serialization.indent_output=true \ No newline at end of file +spring.jackson.serialization.indent_output=true +loggable.log-path=${MARKET_LOG_PATH} \ No newline at end of file diff --git a/marketplace-service/src/test/java/com/axonivy/market/BaseSetup.java b/marketplace-service/src/test/java/com/axonivy/market/BaseSetup.java index 53ad34759..9800ebc76 100644 --- a/marketplace-service/src/test/java/com/axonivy/market/BaseSetup.java +++ b/marketplace-service/src/test/java/com/axonivy/market/BaseSetup.java @@ -38,6 +38,7 @@ public class BaseSetup { protected static final String SAMPLE_PRODUCT_ID = "amazon-comprehend"; protected static final String SAMPLE_PRODUCT_PATH = "/market/connector/amazon-comprehend"; protected static final String SAMPLE_PRODUCT_NAME = "prody Comprehend"; + protected static final String SAMPLE_PRODUCT_REPOSITORY_NAME = "axonivy-market/amazon-comprehend"; protected static final Pageable PAGEABLE = PageRequest.of(0, 20, Sort.by(SortOption.ALPHABETICALLY.getOption()).descending()); protected static final String MOCK_PRODUCT_ID = "bpmn-statistic"; @@ -53,6 +54,7 @@ public class BaseSetup { protected static final String MOCK_PRODUCT_REPOSITORY_NAME = "axonivy-market/bpmn-statistic"; protected static final String MOCK_IMAGE_ID_FORMAT_1 = "imageId-66e2b14868f2f95b2f95549a"; protected static final String MOCK_IMAGE_ID_FORMAT_2 = "imageId-66e2b14868f2f95b2f95550a"; + protected static final String MOCK_IMAGE_ID_FORMAT_3 = "imageId-66e2b14868f2f95b2f95551a"; protected static final String MOCK_PRODUCT_JSON_FILE_PATH = "src/test/resources/product.json"; protected static final String MOCK_PRODUCT_JSON_FILE_PATH_NO_URL = "src/test/resources/productMissingURL.json"; protected static final String MOCK_PRODUCT_JSON_WITH_DROPINS_FILE_PATH = "src/test/resources/product-dropins.json"; @@ -61,6 +63,10 @@ public class BaseSetup { protected static final String MOCK_METADATA_FILE_PATH = "src/test/resources/metadata.xml"; protected static final String MOCK_SNAPSHOT_METADATA_FILE_PATH = "src/test/resources/snapshotMetadata.xml"; protected static final String MOCK_README_FILE = "src/test/resources/README.md"; + protected static final String MOCK_README_DE_FILE = "src/test/resources/README_DE.md"; + protected static final String MOCK_README_FILE_NO_DEMO_PART = "src/test/resources/README_NO_DEMO_PART.md"; + protected static final String MOCK_README_FILE_NO_SETUP_PART = "src/test/resources/README_NO_SETUP_PART.md"; + protected static final String MOCK_README_FILE_SWAP_DEMO_SETUP_PARTS = "src/test/resources/README_SWAP_DEMO_SETUP.md"; protected static final String INVALID_FILE_PATH = "test/file/path"; protected static final String MOCK_MAVEN_URL = "https://maven.axonivy.com/com/axonivy/util/bpmn-statistic/maven" + "-metadata.xml"; @@ -136,6 +142,14 @@ protected static String getMockReadmeContent() { return getContentFromTestResourcePath(MOCK_README_FILE); } + protected static String getMockReadmeContent(String filePath) { + if (StringUtils.isBlank(filePath)) { + return getMockReadmeContent(); + } + + return getContentFromTestResourcePath(filePath); + } + protected Artifact getMockArtifact() { Artifact mockArtifact = new Artifact(); mockArtifact.setIsDependency(true); diff --git a/marketplace-service/src/test/java/com/axonivy/market/controller/ProductControllerTest.java b/marketplace-service/src/test/java/com/axonivy/market/controller/ProductControllerTest.java index 2d7cabd4b..f46896c40 100644 --- a/marketplace-service/src/test/java/com/axonivy/market/controller/ProductControllerTest.java +++ b/marketplace-service/src/test/java/com/axonivy/market/controller/ProductControllerTest.java @@ -146,32 +146,6 @@ void testSyncProductsInvalidToken() { assertEquals(ErrorCode.GITHUB_USER_UNAUTHORIZED.getHelpText(), exception.getMessage()); } - @Test - void testSyncMavenVersionSuccess() { - var response = productController.syncProductVersions(AUTHORIZATION_HEADER, false); - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); - assertTrue(response.hasBody()); - assertEquals(ErrorCode.MAVEN_VERSION_SYNC_FAILED.getCode(), Objects.requireNonNull(response.getBody()).getHelpCode()); - when(metadataService.syncAllProductsMetadata()).thenReturn(1); - response = productController.syncProductVersions(AUTHORIZATION_HEADER, false); - assertEquals(HttpStatus.OK, response.getStatusCode()); - assertTrue(response.hasBody()); - assertEquals(ErrorCode.SUCCESSFUL.getCode(), Objects.requireNonNull(response.getBody()).getHelpCode()); - } - - - @Test - void testSyncMavenVersionWithInvalidToken() { - doThrow(new UnauthorizedException(ErrorCode.GITHUB_USER_UNAUTHORIZED.getCode(), - ErrorCode.GITHUB_USER_UNAUTHORIZED.getHelpText())).when(gitHubService) - .validateUserInOrganizationAndTeam(any(String.class), any(String.class), any(String.class)); - - UnauthorizedException exception = assertThrows(UnauthorizedException.class, - () -> productController.syncProductVersions(INVALID_AUTHORIZATION_HEADER, false)); - - assertEquals(ErrorCode.GITHUB_USER_UNAUTHORIZED.getHelpText(), exception.getMessage()); - } - @Test void testSyncOneProductInvalidProductPath() { Product product = new Product(); @@ -240,4 +214,32 @@ private Product createProductMock() { mockProduct.setTags(List.of("AI")); return mockProduct; } + + @Test + void testSyncFirstPublishedDateOfAllProductsInvalidToken() { + doThrow(new UnauthorizedException(ErrorCode.GITHUB_USER_UNAUTHORIZED.getCode(), + ErrorCode.GITHUB_USER_UNAUTHORIZED.getHelpText())).when(gitHubService) + .validateUserInOrganizationAndTeam(any(String.class), any(String.class), any(String.class)); + + UnauthorizedException exception = assertThrows(UnauthorizedException.class, + () -> productController.syncFirstPublishedDateOfAllProducts(INVALID_AUTHORIZATION_HEADER)); + + assertEquals(ErrorCode.GITHUB_USER_UNAUTHORIZED.getHelpText(), exception.getMessage()); + } + + @Test + void testSyncFirstPublishedDateOfAllProductsFailed() { + when(service.syncFirstPublishedDateOfAllProducts()).thenReturn(false); + var response = productController.syncFirstPublishedDateOfAllProducts(AUTHORIZATION_HEADER); + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertNotEquals(ErrorCode.SUCCESSFUL.getCode(), response.getBody().getHelpCode()); + } + + @Test + void testSyncFirstPublishedDateOfAllProductsSuccess() { + when(service.syncFirstPublishedDateOfAllProducts()).thenReturn(true); + var response = productController.syncFirstPublishedDateOfAllProducts(AUTHORIZATION_HEADER); + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertEquals(ErrorCode.SUCCESSFUL.getCode(), response.getBody().getHelpCode()); + } } diff --git a/marketplace-service/src/test/java/com/axonivy/market/controller/SecurityMonitorControllerTest.java b/marketplace-service/src/test/java/com/axonivy/market/controller/SecurityMonitorControllerTest.java new file mode 100644 index 000000000..c86878cfc --- /dev/null +++ b/marketplace-service/src/test/java/com/axonivy/market/controller/SecurityMonitorControllerTest.java @@ -0,0 +1,69 @@ +package com.axonivy.market.controller; + +import com.axonivy.market.enums.ErrorCode; +import com.axonivy.market.exceptions.model.UnauthorizedException; +import com.axonivy.market.github.model.ProductSecurityInfo; +import com.axonivy.market.github.service.GitHubService; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class SecurityMonitorControllerTest { + + @Mock + private GitHubService gitHubService; + + @InjectMocks + private SecurityMonitorController securityMonitorController; + + @Test + void test_getGitHubMarketplaceSecurity() { + String mockToken = "Bearer sample-token"; + ProductSecurityInfo product1 = new ProductSecurityInfo("product1", false, "public", true, new Date(), "abc123", + null, null, null); + + ProductSecurityInfo product2 = new ProductSecurityInfo("product2", false, "private", false, new Date(), "def456", + null, null, null); + List mockSecurityInfoList = Arrays.asList(product1, product2); + + when(gitHubService.getSecurityDetailsForAllProducts(anyString(), anyString())).thenReturn(mockSecurityInfoList); + + ResponseEntity> expectedResponse = new ResponseEntity<>(mockSecurityInfoList, + HttpStatus.OK); + + ResponseEntity actualResponse = securityMonitorController.getGitHubMarketplaceSecurity(mockToken); + + assertEquals(expectedResponse.getStatusCode(), actualResponse.getStatusCode()); + assertEquals(expectedResponse.getBody(), actualResponse.getBody()); + } + + @Test + void test_getGitHubMarketplaceSecurity_shouldReturnUnauthorized_whenInvalidToken() { + String invalidToken = "Bearer invalid-token"; + + doThrow(new UnauthorizedException(ErrorCode.GITHUB_USER_UNAUTHORIZED.getCode(), + ErrorCode.GITHUB_USER_UNAUTHORIZED.getHelpText())).when(gitHubService) + .validateUserInOrganizationAndTeam(any(String.class), any(String.class), any(String.class)); + + UnauthorizedException exception = assertThrows(UnauthorizedException.class, + () -> securityMonitorController.getGitHubMarketplaceSecurity(invalidToken)); + + assertEquals(ErrorCode.GITHUB_USER_UNAUTHORIZED.getHelpText(), exception.getMessage()); + } +} diff --git a/marketplace-service/src/test/java/com/axonivy/market/logging/LoggableAspectTest.java b/marketplace-service/src/test/java/com/axonivy/market/logging/LoggableAspectTest.java new file mode 100644 index 000000000..0270dfd60 --- /dev/null +++ b/marketplace-service/src/test/java/com/axonivy/market/logging/LoggableAspectTest.java @@ -0,0 +1,89 @@ +package com.axonivy.market.logging; + +import com.axonivy.market.constants.CommonConstants; +import com.axonivy.market.constants.LoggingConstants; +import com.axonivy.market.exceptions.model.MissingHeaderException; +import com.axonivy.market.util.LoggingUtils; +import jakarta.servlet.http.HttpServletRequest; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.reflect.MethodSignature; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +class LoggableAspectTest { + + @Mock + private HttpServletRequest request; + + private LoggableAspect loggableAspect; + + @BeforeEach + void setUp() throws IOException { + MockitoAnnotations.openMocks(this); + loggableAspect = new LoggableAspect(); + loggableAspect.logFilePath = Files.createTempDirectory("logs").toString(); + } + + @AfterEach + void tearDown() { + RequestContextHolder.resetRequestAttributes(); + } + + @Test + void testLogFileCreation() throws Exception { + mockRequestAttributes(LoggingConstants.MARKET_WEBSITE, "test-agent"); + MethodSignature signature = mockMethodSignature(); + + loggableAspect.logMethodCall(mockJoinPoint(signature)); + Path logFilePath = Path.of(loggableAspect.logFilePath, "log-" + LoggingUtils.getCurrentDate() + ".xml"); + assertTrue(Files.exists(logFilePath), "Log file should be created"); + + String content = Files.readString(logFilePath); + assertTrue(content.contains(LoggingConstants.LOG_START), "Log file should contain log"); + assertTrue(content.contains(LoggingConstants.ENTRY_START), "Log file should contain log entry"); + } + + @Test + void testMissingHeaderException() { + mockRequestAttributes("invalid-source", "mock-agent"); + MethodSignature signature = mockMethodSignature(); + + assertThrows(MissingHeaderException.class, () -> + loggableAspect.logMethodCall(mockJoinPoint(signature)) + ); + } + + private JoinPoint mockJoinPoint(MethodSignature signature) { + JoinPoint joinPoint = mock(JoinPoint.class); + when(joinPoint.getSignature()).thenReturn(signature); + when(joinPoint.getArgs()).thenReturn(new Object[]{"arg1", "arg2"}); + return joinPoint; + } + + private void mockRequestAttributes(String requestedBy, String userAgent) { + when(request.getHeader(CommonConstants.REQUESTED_BY)).thenReturn(requestedBy); + when(request.getHeader(CommonConstants.USER_AGENT)).thenReturn(userAgent); + RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); + } + + private MethodSignature mockMethodSignature() { + MethodSignature signature = mock(MethodSignature.class); + when(signature.getMethod()).thenReturn(this.getClass().getMethods()[0]); + return signature; + } + +} diff --git a/marketplace-service/src/test/java/com/axonivy/market/service/impl/GitHubServiceImplTest.java b/marketplace-service/src/test/java/com/axonivy/market/service/impl/GitHubServiceImplTest.java index be7f38edc..3da6c0edc 100644 --- a/marketplace-service/src/test/java/com/axonivy/market/service/impl/GitHubServiceImplTest.java +++ b/marketplace-service/src/test/java/com/axonivy/market/service/impl/GitHubServiceImplTest.java @@ -1,63 +1,527 @@ package com.axonivy.market.service.impl; +import com.axonivy.market.constants.GitHubConstants; +import com.axonivy.market.enums.AccessLevel; +import com.axonivy.market.exceptions.model.MissingHeaderException; +import com.axonivy.market.exceptions.model.Oauth2ExchangeCodeException; +import com.axonivy.market.exceptions.model.UnauthorizedException; +import com.axonivy.market.github.model.CodeScanning; +import com.axonivy.market.github.model.Dependabot; +import com.axonivy.market.github.model.GitHubAccessTokenResponse; +import com.axonivy.market.github.model.GitHubProperty; +import com.axonivy.market.github.model.ProductSecurityInfo; +import com.axonivy.market.github.model.SecretScanning; import com.axonivy.market.github.service.impl.GitHubServiceImpl; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.kohsuke.github.GHContent; -import org.kohsuke.github.GHRepository; +import org.kohsuke.github.*; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; - @ExtendWith(MockitoExtension.class) class GitHubServiceImplTest { - private static final String DUMMY_API_URL = "https://api.github.com"; @Mock - GHRepository ghRepository; + private GitHubProperty gitHubProperty; + + @Mock + RestTemplate restTemplate; + + @Mock + private GitHub gitHub; + + @Mock + private ResponseEntity responseEntity; @Mock - private RestTemplateBuilder restTemplateBuilder; + private GitHubAccessTokenResponse gitHubAccessTokenResponse; @Mock - private RestTemplate restTemplate; + private GHTeam ghTeam; + @Spy @InjectMocks private GitHubServiceImpl gitHubService; @Test - void testGetGithub() throws IOException { - var result = gitHubService.getGitHub(); - assertEquals(DUMMY_API_URL, result.getApiUrl()); + void testGetGitHub_WithValidToken() throws IOException { + when(gitHubProperty.getToken()).thenReturn("validToken"); + assertNotNull(gitHubService.getGitHub()); + verify(gitHubProperty).getToken(); } @Test - void testGetGithubContent() throws IOException { - var mockGHContent = mock(GHContent.class); - final String dummyURL = DUMMY_API_URL.concat("/dummy-content"); - when(mockGHContent.getUrl()).thenReturn(dummyURL); - when(ghRepository.getFileContent(any(), any())).thenReturn(mockGHContent); - var result = gitHubService.getGHContent(ghRepository, "", ""); - assertEquals(dummyURL, result.getUrl()); + void testGetGitHub_WithNullToken() throws IOException { + when(gitHubProperty.getToken()).thenReturn(null); + assertNotNull(gitHubService.getGitHub()); } @Test - void testGetDirectoryContent() throws IOException { - var result = gitHubService.getDirectoryContent(ghRepository, "", ""); - assertEquals(0, result.size()); + void testGetOrganization_WithValidOrgName() throws IOException { + when(gitHubService.getGitHub()).thenReturn(gitHub); + GHOrganization mockOrganization = mock(GHOrganization.class); + when(gitHub.getOrganization("test-org")).thenReturn(mockOrganization); + GHOrganization organization = gitHubService.getOrganization("test-org"); + assertNotNull(organization); + verify(gitHubProperty).getToken(); + verify(gitHubService).getGitHub(); + verify(gitHub).getOrganization("test-org"); + } + + @Test + void testGetDirectoryContent_ValidInputs() throws IOException { + GHRepository mockRepository = mock(GHRepository.class); + String path = "src"; + String ref = "main"; + + List mockContents = List.of(mock(GHContent.class), mock(GHContent.class)); + when(mockRepository.getDirectoryContent(path, ref)).thenReturn(mockContents); + + List contents = gitHubService.getDirectoryContent(mockRepository, path, ref); + + assertNotNull(contents); + assertEquals(2, contents.size()); + verify(mockRepository).getDirectoryContent(path, ref); + } + + @Test + void testGetDirectoryContent_NullRepository() { + String path = "src"; + String ref = "main"; + + assertThrows(IllegalArgumentException.class, + () -> gitHubService.getDirectoryContent(null, path, ref)); + } + + @Test + void testGetRepository_ValidRepositoryPath() throws IOException { + String repositoryPath = "my-org/my-repo"; + GHRepository mockRepository = mock(GHRepository.class); + when(gitHubService.getGitHub()).thenReturn(mock(GitHub.class)); + when(gitHubService.getGitHub().getRepository(repositoryPath)).thenReturn(mockRepository); + + GHRepository repository = gitHubService.getRepository(repositoryPath); + + assertNotNull(repository); + verify(gitHubService.getGitHub()).getRepository(repositoryPath); + } + + @Test + void testGetGHContent_ValidInputs() throws IOException { + GHRepository mockRepository = mock(GHRepository.class); + String path = "README.md"; + String ref = "main"; + GHContent mockContent = mock(GHContent.class); + + when(mockRepository.getFileContent(path, ref)).thenReturn(mockContent); + + GHContent content = gitHubService.getGHContent(mockRepository, path, ref); + + assertNotNull(content); + verify(mockRepository).getFileContent(path, ref); + } + + @Test + void testGetGHContent_NullRepository() { + String path = "README.md"; + String ref = "main"; + + assertThrows(IllegalArgumentException.class, + () -> gitHubService.getGHContent(null, path, ref)); + } + + @Test + void testGetAccessToken_ValidCodeAndGitHubProperty() throws Oauth2ExchangeCodeException, MissingHeaderException { + String code = "validCode"; + String clientId = "clientId"; + String clientSecret = "clientSecret"; + String accessToken = "accessToken"; + + when(gitHubProperty.getOauth2ClientId()).thenReturn(clientId); + when(gitHubProperty.getOauth2ClientSecret()).thenReturn(clientSecret); + + when(responseEntity.getBody()).thenReturn(gitHubAccessTokenResponse); + when(gitHubAccessTokenResponse.getError()).thenReturn(null); + when(gitHubAccessTokenResponse.getAccessToken()).thenReturn(accessToken); + + when(restTemplate.postForEntity( + eq(GitHubConstants.GITHUB_GET_ACCESS_TOKEN_URL), + any(HttpEntity.class), + eq(GitHubAccessTokenResponse.class) + )).thenReturn(responseEntity); + + GitHubAccessTokenResponse result = gitHubService.getAccessToken(code, gitHubProperty); + + assertNotNull(result); + assertEquals(accessToken, result.getAccessToken()); + verify(restTemplate).postForEntity(anyString(), any(HttpEntity.class), eq(GitHubAccessTokenResponse.class)); + } + + @Test + void testGetAccessToken_NullGitHubProperty() { + MissingHeaderException exception = assertThrows(MissingHeaderException.class, () -> + gitHubService.getAccessToken("validCode", null) + ); + assertEquals("Invalid or missing header", exception.getMessage()); + } + + @Test + void testGetAccessToken_GitHubErrorResponse() throws Oauth2ExchangeCodeException { + String code = "validCode"; + String clientId = "clientId"; + String clientSecret = "clientSecret"; + String error = "invalid_grant"; + String errorDescription = "The authorization code is invalid"; + + when(gitHubProperty.getOauth2ClientId()).thenReturn(clientId); + when(gitHubProperty.getOauth2ClientSecret()).thenReturn(clientSecret); + + when(responseEntity.getBody()).thenReturn(gitHubAccessTokenResponse); + when(gitHubAccessTokenResponse.getError()).thenReturn(error); + when(gitHubAccessTokenResponse.getErrorDescription()).thenReturn(errorDescription); + + when(restTemplate.postForEntity( + eq(GitHubConstants.GITHUB_GET_ACCESS_TOKEN_URL), + any(HttpEntity.class), + eq(GitHubAccessTokenResponse.class) + )).thenReturn(responseEntity); + + Oauth2ExchangeCodeException exception = assertThrows(Oauth2ExchangeCodeException.class, () -> + gitHubService.getAccessToken(code, gitHubProperty) + ); + assertEquals(error, exception.getError()); + assertEquals(errorDescription, exception.getErrorDescription()); + } + + @Test + void testGetAccessToken_SuccessfulResponseWithError() throws Oauth2ExchangeCodeException { + String code = "validCode"; + String clientId = "clientId"; + String clientSecret = "clientSecret"; + + when(gitHubProperty.getOauth2ClientId()).thenReturn(clientId); + when(gitHubProperty.getOauth2ClientSecret()).thenReturn(clientSecret); + + when(responseEntity.getBody()).thenReturn(gitHubAccessTokenResponse); + when(gitHubAccessTokenResponse.getError()).thenReturn("error_code"); + when(gitHubAccessTokenResponse.getErrorDescription()).thenReturn("Error description"); + + when(restTemplate.postForEntity( + eq(GitHubConstants.GITHUB_GET_ACCESS_TOKEN_URL), + any(HttpEntity.class), + eq(GitHubAccessTokenResponse.class) + )).thenReturn(responseEntity); + + Oauth2ExchangeCodeException exception = assertThrows(Oauth2ExchangeCodeException.class, () -> + gitHubService.getAccessToken(code, gitHubProperty) + ); + assertEquals("error_code", exception.getError()); + assertEquals("Error description", exception.getErrorDescription()); + } + + @Test + void testValidateUserInOrganizationAndTeam_Valid() throws UnauthorizedException, IOException { + String accessToken = "validToken"; + String organization = "testOrg"; + String team = "devTeam"; + + when(gitHubService.getGitHub(accessToken)).thenReturn(gitHub); + + when(gitHubService.isUserInOrganizationAndTeam(gitHub, organization, team)).thenReturn(true); + + gitHubService.validateUserInOrganizationAndTeam(accessToken, organization, team); } @Test - void testGithubWithToken() throws IOException { - var result = gitHubService.getGitHub("accessToken"); - assertEquals(DUMMY_API_URL, result.getApiUrl()); + void testIsUserInOrganizationAndTeam_NullGitHub() throws IOException { + GitHub gitHubNullAble = null; + String organization = "my-org"; + String teamName = "my-team"; + + boolean result = gitHubService.isUserInOrganizationAndTeam(gitHubNullAble, organization, teamName); + + assertFalse(result); + } + + @Test + void testIsUserInOrganizationAndTeam_EmptyTeams() throws IOException { + String organization = "my-org"; + String teamName = "my-team"; + Map> hashMapTeams = new HashMap<>(); + when(gitHub.getMyTeams()).thenReturn(hashMapTeams); + + boolean result = gitHubService.isUserInOrganizationAndTeam(gitHub, organization, teamName); + + assertFalse(result); + } + + @Test + void testIsUserInOrganizationAndTeam_TeamNotFound() throws IOException { + String organization = "my-org"; + String teamName = "my-team"; + Set teams = new HashSet<>(); + teams.add(ghTeam); + Map> hashMapTeams = new HashMap<>(); + hashMapTeams.put(organization, teams); + when(gitHub.getMyTeams()).thenReturn(hashMapTeams); + + boolean result = gitHubService.isUserInOrganizationAndTeam(gitHub, organization, teamName); + + assertFalse(result); + } + + @Test + void testIsUserInOrganizationAndTeam_TeamFound() throws IOException { + String organization = "my-org"; + String teamName = "my-team"; + Set teams = new HashSet<>(); + when(ghTeam.getName()).thenReturn(teamName); + teams.add(ghTeam); + Map> hashMapTeams = new HashMap<>(); + hashMapTeams.put(organization, teams); + when(gitHub.getMyTeams()).thenReturn(hashMapTeams); + + boolean result = gitHubService.isUserInOrganizationAndTeam(gitHub, organization, teamName); + + assertTrue(result); + } + + @Test + void testIsUserInOrganizationAndTeam_TeamListNull() throws IOException { + String organization = "my-org"; + String teamName = "my-team"; + Map> hashMapTeams = new HashMap<>(); + hashMapTeams.put(organization, null); + when(gitHub.getMyTeams()).thenReturn(hashMapTeams); + + boolean result = gitHubService.isUserInOrganizationAndTeam(gitHub, organization, teamName); + + assertFalse(result); + } + + @Test + void testValidateUserInOrganizationAndTeam_throwsUnauthorizedException() throws IOException { + String accessToken = "invalid-token"; + String organization = "orgName"; + String team = "teamName"; + + GitHub gitHubMock = mock(GitHub.class); + when(gitHubService.getGitHub(accessToken)).thenReturn(gitHubMock); + when(gitHubService.isUserInOrganizationAndTeam(gitHubMock, organization, team)).thenReturn(false); + UnauthorizedException exception = assertThrows(UnauthorizedException.class, () -> { + gitHubService.validateUserInOrganizationAndTeam(accessToken, organization, team); + }); + assertEquals("GITHUB_USER_UNAUTHORIZED - User must be a member of team teamName and organization orgName", exception.getMessage()); + } + + @Test + void testSecurityInfo() throws IOException { + String accessToken = "accessToken"; + String orgName = "orgName"; + String repoName = "repoName"; + String branchSHA1 = "branchSHA1"; + GHRepository ghRepository = mock(GHRepository.class); + GHOrganization ghOrganization = mock(GHOrganization.class); + when(ghOrganization.getLogin()).thenReturn(orgName); + when(ghRepository.getName()).thenReturn(repoName); + when(ghRepository.getVisibility()).thenReturn(GHRepository.Visibility.PUBLIC); + GHBranch branch = mock(GHBranch.class); + when(branch.isProtected()).thenReturn(true); + when(branch.getSHA1()).thenReturn(branchSHA1); + GHCommit commit = mock(GHCommit.class); + when(commit.getCommitDate()).thenReturn(new Date()); + when(ghRepository.getCommit(branchSHA1)).thenReturn(commit); + when(ghRepository.getBranch(any())).thenReturn(branch); + String urlSecretScanning = String.format(GitHubConstants.Url.REPO_SECRET_SCANNING_ALERTS_OPEN, orgName, repoName); + List> responseBodySecretScanning = new ArrayList<>(); + responseBodySecretScanning.add(Map.of( + "number", 1 + )); + when(restTemplate.exchange( + eq(urlSecretScanning), + eq(HttpMethod.GET), + any(HttpEntity.class), + any(ParameterizedTypeReference.class)) + ).thenReturn(new ResponseEntity<>(responseBodySecretScanning, HttpStatus.OK)); + String urlCodeScanning = String.format(GitHubConstants.Url.REPO_CODE_SCANNING_ALERTS_OPEN, orgName, repoName); + List> responseBodyCodeScanning = new ArrayList<>(); + responseBodyCodeScanning.add(Map.of( + "number", 1, + "state", "open", + "rule", Map.of("security_severity_level", "high") + )); + when(restTemplate.exchange( + eq(urlCodeScanning), + eq(HttpMethod.GET), + any(HttpEntity.class), + any(ParameterizedTypeReference.class)) + ).thenReturn(new ResponseEntity<>(responseBodyCodeScanning, HttpStatus.OK)); + + String urlDependabotScanning = String.format(GitHubConstants.Url.REPO_DEPENDABOT_ALERTS_OPEN, orgName, repoName); + List> responseBodyDependabotScanning = new ArrayList<>(); + responseBodyDependabotScanning.add(Map.of( + "number", 1, + "state", "open", + "security_advisory", Map.of("severity", "high") + )); + when(restTemplate.exchange( + eq(urlDependabotScanning), + eq(HttpMethod.GET), + any(HttpEntity.class), + any(ParameterizedTypeReference.class)) + ).thenReturn(new ResponseEntity<>(responseBodyDependabotScanning, HttpStatus.OK)); + + ProductSecurityInfo result = gitHubService.fetchSecurityInfoSafe(ghRepository, ghOrganization, accessToken); + assertNotNull(result); + } + + @Test + void testGetNumberOfSecretScanningAlerts_Success() { + String accessToken = "accessToken"; + String orgName = "orgName"; + String repoName = "repoName"; + String url = String.format(GitHubConstants.Url.REPO_SECRET_SCANNING_ALERTS_OPEN, orgName, repoName); + List> responseBody = new ArrayList<>(); + responseBody.add(Map.of( + "number", 1 + )); + GHRepository ghRepository = mock(GHRepository.class); + GHOrganization ghOrganization = mock(GHOrganization.class); + when(ghOrganization.getLogin()).thenReturn(orgName); + when(ghRepository.getName()).thenReturn(repoName); + when(restTemplate.exchange( + eq(url), + eq(HttpMethod.GET), + any(HttpEntity.class), + any(ParameterizedTypeReference.class)) + ).thenReturn(new ResponseEntity<>(responseBody, HttpStatus.OK)); + SecretScanning result = gitHubService.getNumberOfSecretScanningAlerts(ghRepository, ghOrganization, accessToken); + assertEquals(AccessLevel.ENABLED, result.getStatus()); + } + + @Test + void testGetCodeScanningAlerts_Success() { + String accessToken = "accessToken"; + String orgName = "orgName"; + String repoName = "repoName"; + String url = String.format(GitHubConstants.Url.REPO_CODE_SCANNING_ALERTS_OPEN, orgName, repoName); + List> responseBody = new ArrayList<>(); + responseBody.add(Map.of( + "number", 1, + "state", "open", + "rule", Map.of("security_severity_level", "high") + )); + GHRepository ghRepository = mock(GHRepository.class); + GHOrganization ghOrganization = mock(GHOrganization.class); + when(ghOrganization.getLogin()).thenReturn(orgName); + when(ghRepository.getName()).thenReturn(repoName); + when(restTemplate.exchange( + eq(url), + eq(HttpMethod.GET), + any(HttpEntity.class), + any(ParameterizedTypeReference.class)) + ).thenReturn(new ResponseEntity<>(responseBody, HttpStatus.OK)); + CodeScanning result = gitHubService.getCodeScanningAlerts(ghRepository, ghOrganization, accessToken); + assertEquals(AccessLevel.ENABLED, result.getStatus()); + } + + @Test + void testGetDependabotAlerts_Success() { + String accessToken = "accessToken"; + String orgName = "orgName"; + String repoName = "repoName"; + String url = String.format(GitHubConstants.Url.REPO_DEPENDABOT_ALERTS_OPEN, orgName, repoName); + List> responseBody = new ArrayList<>(); + responseBody.add(Map.of( + "number", 1, + "state", "open", + "security_advisory", Map.of("severity", "high") + )); + GHRepository ghRepository = mock(GHRepository.class); + GHOrganization ghOrganization = mock(GHOrganization.class); + when(ghOrganization.getLogin()).thenReturn(orgName); + when(ghRepository.getName()).thenReturn(repoName); + when(restTemplate.exchange( + eq(url), + eq(HttpMethod.GET), + any(HttpEntity.class), + any(ParameterizedTypeReference.class)) + ).thenReturn(new ResponseEntity<>(responseBody, HttpStatus.OK)); + Dependabot result = gitHubService.getDependabotAlerts(ghRepository, ghOrganization, accessToken); + assertEquals(AccessLevel.ENABLED, result.getStatus()); + } + + @Test + void testGetDependabotAlerts_NotFound() { + String accessToken = "accessToken"; + String orgName = "orgName"; + String repoName = "repoName"; + String url = String.format(GitHubConstants.Url.REPO_DEPENDABOT_ALERTS_OPEN, orgName, repoName); + GHRepository ghRepository = mock(GHRepository.class); + GHOrganization ghOrganization = mock(GHOrganization.class); + when(ghOrganization.getLogin()).thenReturn(orgName); + when(ghRepository.getName()).thenReturn(repoName); + when(restTemplate.exchange( + eq(url), + eq(HttpMethod.GET), + any(HttpEntity.class), + any(ParameterizedTypeReference.class)) + ).thenThrow(HttpClientErrorException.NotFound.class); + Dependabot result = gitHubService.getDependabotAlerts(ghRepository, ghOrganization, accessToken); + assertEquals(AccessLevel.NO_PERMISSION, result.getStatus()); + } + + @Test + void testGetDependabotAlerts_Disabled() { + String accessToken = "accessToken"; + String orgName = "orgName"; + String repoName = "repoName"; + String url = String.format(GitHubConstants.Url.REPO_DEPENDABOT_ALERTS_OPEN, orgName, repoName); + GHRepository ghRepository = mock(GHRepository.class); + GHOrganization ghOrganization = mock(GHOrganization.class); + when(ghOrganization.getLogin()).thenReturn(orgName); + when(ghRepository.getName()).thenReturn(repoName); + when(restTemplate.exchange( + eq(url), + eq(HttpMethod.GET), + any(HttpEntity.class), + any(ParameterizedTypeReference.class)) + ).thenThrow(HttpClientErrorException.Forbidden.class); + Dependabot result = gitHubService.getDependabotAlerts(ghRepository, ghOrganization, accessToken); + assertEquals(AccessLevel.DISABLED, result.getStatus()); + } + + @Test + void testGetSecurityDetailsForAllProducts() throws Exception { + String accessToken = "mockAccessToken"; + String orgName = "mockOrganization"; + GHOrganization ghOrganization = mock(GHOrganization.class); + when(gitHubService.getGitHub(accessToken)).thenReturn(gitHub); + when(gitHub.getOrganization(orgName)).thenReturn(ghOrganization); + PagedIterable mockPagedIterable = mock(PagedIterable.class); + when(ghOrganization.listRepositories()).thenReturn(mockPagedIterable); + List result = gitHubService.getSecurityDetailsForAllProducts(accessToken, orgName); + assertEquals(0, result.size()); } } diff --git a/marketplace-service/src/test/java/com/axonivy/market/service/impl/ProductServiceImplTest.java b/marketplace-service/src/test/java/com/axonivy/market/service/impl/ProductServiceImplTest.java index eb87febb1..7896e3893 100644 --- a/marketplace-service/src/test/java/com/axonivy/market/service/impl/ProductServiceImplTest.java +++ b/marketplace-service/src/test/java/com/axonivy/market/service/impl/ProductServiceImplTest.java @@ -40,12 +40,14 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.kohsuke.github.GHCommit; import org.kohsuke.github.GHContent; +import org.kohsuke.github.GHTag; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.Mockito; +import org.mockito.exceptions.base.MockitoException; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -56,6 +58,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -576,9 +579,8 @@ void testSyncOneProduct() throws IOException { var mockContents = mockMetaJsonAndLogoList(); when(marketRepoService.getMarketItemByPath(anyString())).thenReturn(mockContents); when(productRepo.save(any(Product.class))).thenReturn(mockProduct); - // Executes - var result = productService.syncOneProduct(SAMPLE_PRODUCT_ID, SAMPLE_PRODUCT_PATH, false); - assertTrue(result); + assertTrue(productService.syncOneProduct(SAMPLE_PRODUCT_ID, SAMPLE_PRODUCT_PATH, false)); + assertTrue(productService.syncOneProduct(SAMPLE_PRODUCT_ID, SAMPLE_PRODUCT_PATH, true)); } private List mockMetaJsonAndLogoList() throws IOException { @@ -590,6 +592,12 @@ private List mockMetaJsonAndLogoList() throws IOException { return new ArrayList<>(List.of(mockContent, mockContentLogo)); } + @Test + void testSyncOneProductFailed() { + when(marketRepoService.getMarketItemByPath(anyString())).thenThrow(new MockitoException("Sync a product failed!")); + assertFalse(productService.syncOneProduct(StringUtils.EMPTY, StringUtils.EMPTY, true)); + } + @Test void testSyncProductsAsUpdateMetaJSONFromGitHub_AddVendorLogo() throws IOException { // Start testing by adding new meta @@ -613,4 +621,103 @@ void testSyncProductsAsUpdateMetaJSONFromGitHub_AddVendorLogo() throws IOExcepti assertNotNull(result); assertTrue(result.isEmpty()); } + + @Test + void testSyncFirstPublishedDateOfAllProducts() throws IOException { + Product mockProduct = new Product(); + mockProduct.setId(SAMPLE_PRODUCT_ID); + mockProduct.setMarketDirectory(SAMPLE_PRODUCT_PATH); + mockProduct.setRepositoryName(SAMPLE_PRODUCT_REPOSITORY_NAME); + List products = Arrays.asList(mockProduct); + when(productRepo.findAll()).thenReturn(products); + when(productRepo.save(any(Product.class))).thenReturn(mockProduct); + GHTag ghTagVersionOne = new GHTag(); + GHTag ghTagVersionTwo = new GHTag(); + List tags = Arrays.asList(ghTagVersionOne, ghTagVersionTwo); + when(gitHubService.getRepositoryTags(SAMPLE_PRODUCT_REPOSITORY_NAME)).thenReturn(tags); + assertTrue(productService.syncFirstPublishedDateOfAllProducts()); + } + + @Test + void testNoSyncFirstPublishedDateForSyncedProducts() { + Product mockProduct = new Product(); + mockProduct.setId(SAMPLE_PRODUCT_ID); + mockProduct.setRepositoryName(SAMPLE_PRODUCT_REPOSITORY_NAME); + mockProduct.setFirstPublishedDate(new Date()); + when(productRepo.findAll()).thenReturn(Arrays.asList(mockProduct)); + assertTrue(productService.syncFirstPublishedDateOfAllProducts()); + } + + @Test + void testSyncFirstPublishedDateWithFindingAllProductsFailed() { + when(productRepo.findAll()).thenThrow(new MockitoException("Sync FirstPublishedDate of all products failed!")); + assertFalse(productService.syncFirstPublishedDateOfAllProducts()); + } + + @Test + void testSyncFirstPublishedDateForNoProduct() { + when(productRepo.findAll()).thenReturn(new ArrayList<>()); + assertTrue(productService.syncFirstPublishedDateOfAllProducts()); + } + + @Test + void testSyncFirstPublishedDateOfAllProductsFailed() throws IOException { + Product mockProduct = new Product(); + mockProduct.setRepositoryName(SAMPLE_PRODUCT_REPOSITORY_NAME); + List products = Arrays.asList(mockProduct); + when(productRepo.findAll()).thenReturn(products); + when(gitHubService.getRepositoryTags(SAMPLE_PRODUCT_REPOSITORY_NAME)).thenThrow( + new IOException("Mocked IOException")); + when(productRepo.save(mockProduct)).thenThrow( + new MockitoException("Mocked IOException")); + assertFalse(productService.syncFirstPublishedDateOfAllProducts()); + } + + @Test + void testSyncFirstPublishedDateOfAllProductsSuccess() throws IOException { + Product mockProduct = new Product(); + mockProduct.setId(SAMPLE_PRODUCT_ID); + mockProduct.setMarketDirectory(SAMPLE_PRODUCT_PATH); + mockProduct.setRepositoryName(SAMPLE_PRODUCT_REPOSITORY_NAME); + List products = Arrays.asList(mockProduct); + when(productRepo.findAll()).thenReturn(products); + when(productRepo.save(any(Product.class))).thenReturn(mockProduct); + GHTag ghTagVersionOne = mock(GHTag.class); + GHCommit commitOfTagVersionOne = mock(GHCommit.class); + GHTag ghTagVersionTwo = mock(GHTag.class); + GHCommit commitOfTagVersionTwo = mock(GHCommit.class); + List tags = Arrays.asList(ghTagVersionOne, ghTagVersionTwo); + when(ghTagVersionOne.getCommit()).thenReturn(commitOfTagVersionOne); + when(commitOfTagVersionOne.getCommitDate()).thenReturn(new Date()); + when(ghTagVersionTwo.getCommit()).thenReturn(commitOfTagVersionTwo); + when(commitOfTagVersionTwo.getCommitDate()).thenReturn(new Date()); + when(gitHubService.getRepositoryTags(SAMPLE_PRODUCT_REPOSITORY_NAME)).thenReturn(tags); + assertTrue(productService.syncFirstPublishedDateOfAllProducts()); + } + + @Test + void testSyncFirstPublishedDateWithGettingTagCommitFailed() throws IOException { + Product mockProduct = new Product(); + mockProduct.setId(SAMPLE_PRODUCT_ID); + mockProduct.setMarketDirectory(SAMPLE_PRODUCT_PATH); + mockProduct.setRepositoryName(SAMPLE_PRODUCT_REPOSITORY_NAME); + List products = Arrays.asList(mockProduct); + when(productRepo.findAll()).thenReturn(products); + GHTag ghTag = mock(GHTag.class); + List tags = Arrays.asList(ghTag); + GHCommit ghCommit = mock(GHCommit.class); + when(ghTag.getCommit()).thenReturn(ghCommit); + when(ghCommit.getCommitDate()).thenThrow( + new IOException("get commit date of tag commit failed!")); + when(gitHubService.getRepositoryTags(SAMPLE_PRODUCT_REPOSITORY_NAME)).thenReturn(tags); + assertTrue(productService.syncFirstPublishedDateOfAllProducts()); + + GHTag ghTag2 = mock(GHTag.class); + List secondTags = Arrays.asList(ghTag, ghTag2); + GHCommit ghCommit2 = mock(GHCommit.class); + when(ghTag2.getCommit()).thenReturn(ghCommit2); + when(ghCommit2.getCommitDate()).thenReturn(new Date()); + when(gitHubService.getRepositoryTags(SAMPLE_PRODUCT_REPOSITORY_NAME)).thenReturn(secondTags); + assertTrue(productService.syncFirstPublishedDateOfAllProducts()); + } } diff --git a/marketplace-service/src/test/java/com/axonivy/market/service/impl/SchedulingTasksTest.java b/marketplace-service/src/test/java/com/axonivy/market/service/impl/SchedulingTasksTest.java index 23daae4b9..be16eada3 100644 --- a/marketplace-service/src/test/java/com/axonivy/market/service/impl/SchedulingTasksTest.java +++ b/marketplace-service/src/test/java/com/axonivy/market/service/impl/SchedulingTasksTest.java @@ -13,7 +13,8 @@ @SpringBootTest(properties = {"MONGODB_USERNAME=user", "MONGODB_PASSWORD=password", "MONGODB_HOST=mongoHost", "MONGODB_DATABASE=product", "MARKET_GITHUB_OAUTH_APP_CLIENT_ID=clientId", "MARKET_GITHUB_OAUTH_APP_CLIENT_SECRET=clientSecret", "MARKET_JWT_SECRET_KEY=jwtSecret", - "MARKET_CORS_ALLOWED_ORIGIN=*", "MARKET_GITHUB_MARKET_BRANCH=master", "MARKET_MONGO_LOG_LEVEL=DEBUG"}) + "MARKET_CORS_ALLOWED_ORIGIN=*", "MARKET_GITHUB_MARKET_BRANCH=master", "MARKET_MONGO_LOG_LEVEL=DEBUG", + "MARKET_LOG_PATH=logs"}) class SchedulingTasksTest { @SpyBean diff --git a/marketplace-service/src/test/java/com/axonivy/market/util/FileUtilsTest.java b/marketplace-service/src/test/java/com/axonivy/market/util/FileUtilsTest.java new file mode 100644 index 000000000..196152d82 --- /dev/null +++ b/marketplace-service/src/test/java/com/axonivy/market/util/FileUtilsTest.java @@ -0,0 +1,57 @@ +package com.axonivy.market.util; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; + +import static org.junit.jupiter.api.Assertions.*; + +@ExtendWith(MockitoExtension.class) +class FileUtilsTest { + + private static final String FILE_PATH = "src/test/resources/test-file.xml"; + + @Test + void testCreateFile() throws IOException { + File createdFile = FileUtils.createFile(FILE_PATH); + assertTrue(createdFile.exists(), "File should exist"); + assertTrue(createdFile.isFile(), "Should be a file"); + createdFile.delete(); + } + + @Test + void testFailedToCreateDirectory() { + File createdFile = new File("testDirAsFile"); + try { + if (!createdFile.exists()) { + assertTrue(createdFile.createNewFile(), "Setup failed: could not create file"); + } + + IOException exception = assertThrows(IOException.class, () -> + FileUtils.createFile("testDirAsFile/subDir/testFile.txt") + ); + assertTrue(exception.getMessage().contains("Failed to create directory"), + "Exception message does not contain expected text"); + } catch (IOException e) { + fail("Setup failed: " + e.getMessage()); + } finally { + createdFile.delete(); + } + } + + @Test + void testWriteFile() throws IOException { + File createdFile = FileUtils.createFile(FILE_PATH); + String content = "Hello, world!"; + FileUtils.writeToFile(createdFile, content); + String fileContent = Files.readString(createdFile.toPath()); + assertEquals(content, fileContent, "File content should match the written content"); + createdFile.delete(); + + } + +} diff --git a/marketplace-service/src/test/java/com/axonivy/market/util/GitHubUtilsTest.java b/marketplace-service/src/test/java/com/axonivy/market/util/GitHubUtilsTest.java index d6276d841..522dc85e6 100644 --- a/marketplace-service/src/test/java/com/axonivy/market/util/GitHubUtilsTest.java +++ b/marketplace-service/src/test/java/com/axonivy/market/util/GitHubUtilsTest.java @@ -40,40 +40,4 @@ void testSortMetaJsonFirst() { result = GitHubUtils.sortMetaJsonFirst(LOGO_FILE, LOGO_FILE); Assertions.assertEquals(0, result); } - - @Test - void testExtractJson() { - // Test case: valid JSON inside a string - String exceptionMessage = "Error occurred: {\"message\":\"An error occurred\"}"; - String json = GitHubUtils.extractJson(exceptionMessage); - Assertions.assertEquals("{\"message\":\"An error occurred\"}", json); - - // Test case: no JSON in string - exceptionMessage = "Error occurred: no json here"; - json = GitHubUtils.extractJson(exceptionMessage); - Assertions.assertEquals(StringUtils.EMPTY, json); - - // Test case: empty string - exceptionMessage = StringUtils.EMPTY; - json = GitHubUtils.extractJson(exceptionMessage); - Assertions.assertEquals(StringUtils.EMPTY, json); - } - - @Test - void testExtractMessageFromExceptionMessage() { - // Test case: valid message extraction - String exceptionMessage = "Some error occurred: {\"message\":\"Invalid input data\"}"; - String extractedMessage = GitHubUtils.extractMessageFromExceptionMessage(exceptionMessage); - Assertions.assertEquals("Invalid input data", extractedMessage); - - // Test case: no message key - exceptionMessage = "Some error occurred: {\"error\":\"Something went wrong\"}"; - extractedMessage = GitHubUtils.extractMessageFromExceptionMessage(exceptionMessage); - Assertions.assertEquals(StringUtils.EMPTY, extractedMessage); - - // Test case: empty exception message - exceptionMessage = ""; - extractedMessage = GitHubUtils.extractMessageFromExceptionMessage(exceptionMessage); - Assertions.assertEquals(StringUtils.EMPTY, extractedMessage); - } } diff --git a/marketplace-service/src/test/java/com/axonivy/market/util/LoggingUtilsTest.java b/marketplace-service/src/test/java/com/axonivy/market/util/LoggingUtilsTest.java new file mode 100644 index 000000000..b2ba2f6f2 --- /dev/null +++ b/marketplace-service/src/test/java/com/axonivy/market/util/LoggingUtilsTest.java @@ -0,0 +1,78 @@ +package com.axonivy.market.util; + +import com.axonivy.market.constants.LoggingConstants; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.Map; + +@ExtendWith(MockitoExtension.class) +class LoggingUtilsTest { + + @Test + void testEscapeXmlSuccess() { + String input = ""; + String expectedValue = "<Test'& "Method>"; + String result = LoggingUtils.escapeXml(input); + Assertions.assertEquals(expectedValue, result); + } + + @Test + void testEscapeXmlOnNullValue() { + String expectedValue = ""; + String result = LoggingUtils.escapeXml(null); + Assertions.assertEquals(expectedValue, result); + } + + @Test + void testGetArgumentsString() { + String expectedValue = "a: random, b: sample"; + String result = LoggingUtils.getArgumentsString(new String[]{"a", "b"}, new String[]{"random", "sample"}); + Assertions.assertEquals(expectedValue, result); + } + + @Test + void testGetArgumentsStringOnNullValue() { + String result = LoggingUtils.getArgumentsString(null, null); + Assertions.assertEquals(LoggingConstants.NO_ARGUMENTS, result); + } + + @Test + void testBuildLogEntry() { + Map given = Map.of( + "method", "test", + "timestamp", "15:02:00" + ); + String expected = """ + + test + 15:02:00 + + """.indent(2); + + var result = LoggingUtils.buildLogEntry(given); + Assertions.assertEquals(expected, result); + } + + @Test + void testGetCurrentDate() { + String expectedDate = LocalDate.now().toString(); + String actualDate = LoggingUtils.getCurrentDate(); + Assertions.assertEquals(expectedDate, actualDate, "The returned date does not match the current date"); + } + + @Test + void testGetCurrentTimestamp() { + String timestamp = LoggingUtils.getCurrentTimestamp(); + Assertions.assertNotNull(timestamp, "Timestamp should not be null"); + SimpleDateFormat dateFormat = new SimpleDateFormat(LoggingConstants.TIMESTAMP_FORMAT); + Assertions.assertDoesNotThrow(() -> { + dateFormat.parse(timestamp); + }, "Timestamp does not match the expected format"); + } + +} diff --git a/marketplace-service/src/test/java/com/axonivy/market/util/ProductContentUtilsTest.java b/marketplace-service/src/test/java/com/axonivy/market/util/ProductContentUtilsTest.java index 949da49da..b1199ede1 100644 --- a/marketplace-service/src/test/java/com/axonivy/market/util/ProductContentUtilsTest.java +++ b/marketplace-service/src/test/java/com/axonivy/market/util/ProductContentUtilsTest.java @@ -2,7 +2,10 @@ import com.axonivy.market.BaseSetup; import com.axonivy.market.bo.Artifact; +import com.axonivy.market.constants.CommonConstants; import com.axonivy.market.entity.ProductModuleContent; +import com.axonivy.market.enums.Language; +import com.axonivy.market.model.ReadmeContentsModel; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -12,7 +15,7 @@ import java.util.List; import java.util.Map; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.*; @ExtendWith(MockitoExtension.class) class ProductContentUtilsTest extends BaseSetup { @@ -47,12 +50,154 @@ void testReplaceImageDirWithImageCustomId() { Map imageUrls = new HashMap<>(); imageUrls.put("slash-command.png", MOCK_IMAGE_ID_FORMAT_1); imageUrls.put("create-slash-command.png", MOCK_IMAGE_ID_FORMAT_2); + imageUrls.put("screen2.png", MOCK_IMAGE_ID_FORMAT_3); String expectedResult = readmeContents.replace("images/slash-command.png", MOCK_IMAGE_ID_FORMAT_1).replace("images/create-slash-command.png", - MOCK_IMAGE_ID_FORMAT_2); + MOCK_IMAGE_ID_FORMAT_2).replace("screen2.png \"Restful Person Manager\"", MOCK_IMAGE_ID_FORMAT_3); String updatedContents = ProductContentUtils.replaceImageDirWithImageCustomId(imageUrls, readmeContents); assertEquals(expectedResult, updatedContents); } + + @Test + void testGetExtractedPartsOfReadme() { + String readmeContents = getMockReadmeContent(); + ReadmeContentsModel readmeContentsModel = ProductContentUtils.getExtractedPartsOfReadme(readmeContents); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getDescription())); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getDemo())); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getSetup())); + } + + @Test + void testGetExtractedPartsOfReadmeSwapDemoAndSetupParts() { + String readmeContents = getMockReadmeContent(MOCK_README_FILE_SWAP_DEMO_SETUP_PARTS); + ReadmeContentsModel readmeContentsModel = ProductContentUtils.getExtractedPartsOfReadme(readmeContents); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getDescription())); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getDemo())); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getSetup())); + if (StringUtils.isNotBlank(readmeContentsModel.getSetup())) { + assertTrue(readmeContentsModel.getSetup().startsWith("Mattermost Instance")); + } + } + + @Test + void testGetExtractedPartsOfReadmeNoDemoPart() { + String readmeContents = getMockReadmeContent(MOCK_README_FILE_NO_DEMO_PART); + ReadmeContentsModel readmeContentsModel = ProductContentUtils.getExtractedPartsOfReadme(readmeContents); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getDescription())); + assertTrue(StringUtils.isBlank(readmeContentsModel.getDemo())); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getSetup())); + } + + @Test + void testGetExtractedPartsOfReadmeNoSetupPart() { + String readmeContents = getMockReadmeContent(MOCK_README_FILE_NO_SETUP_PART); + ReadmeContentsModel readmeContentsModel = ProductContentUtils.getExtractedPartsOfReadme(readmeContents); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getDescription())); + assertTrue(StringUtils.isNotBlank(readmeContentsModel.getDemo())); + assertTrue(StringUtils.isBlank(readmeContentsModel.getSetup())); + } + + @Test + void testGetExtractedPartsOfReadmeWithOnlyOneDescription() { + ReadmeContentsModel readmeContentsModel = ProductContentUtils.getExtractedPartsOfReadme(SAMPLE_PRODUCT_NAME); + assertEquals(SAMPLE_PRODUCT_NAME, readmeContentsModel.getDescription()); + assertTrue(StringUtils.isBlank(readmeContentsModel.getDemo())); + assertTrue(StringUtils.isBlank(readmeContentsModel.getSetup())); + } + + @Test + void testGetExtractedPartsOfEmptyReadme() { + ReadmeContentsModel readmeContentsModel = ProductContentUtils.getExtractedPartsOfReadme(StringUtils.EMPTY); + assertTrue(StringUtils.isBlank(readmeContentsModel.getDescription())); + assertTrue(StringUtils.isBlank(readmeContentsModel.getDemo())); + assertTrue(StringUtils.isBlank(readmeContentsModel.getSetup())); + } + + @Test + void testGetExtractedPartsOfReadmeAtCorrectHeadings() { + String readmeContents = getMockReadmeContent(); + ReadmeContentsModel readmeContentsModel = ProductContentUtils.getExtractedPartsOfReadme(readmeContents); + assertTrue(readmeContentsModel.getDescription().startsWith("Axon Ivy’s mattermost connector")); + assertTrue(readmeContentsModel.getDemo().startsWith("### Demo sample")); + assertTrue(readmeContentsModel.getSetup().startsWith("### Setup guideline")); + } + + @Test + void testGetExtractedPartsOfReadmeWithInconsistentFormats() { + String readmeContentsWithHeading3 = """ + #Product-name + Test README + ### Setup + Setup content (./image.png)"""; + ReadmeContentsModel readmeContentsModel = ProductContentUtils.getExtractedPartsOfReadme(readmeContentsWithHeading3); + assertTrue(readmeContentsModel.getDescription().startsWith("Test README")); + assertTrue(readmeContentsModel.getSetup().startsWith("Setup content (./image.png)")); + + String readmeContentsWithSpaceHeading = """ + #Product-name + Test README + ##Demo + ### Demo project + Demo content + ## Setup + Setup content (./image.png)"""; + ReadmeContentsModel readmeContentsModel1 = + ProductContentUtils.getExtractedPartsOfReadme(readmeContentsWithSpaceHeading); + assertTrue(readmeContentsModel1.getDemo().startsWith("### Demo project")); + assertTrue(readmeContentsModel1.getSetup().startsWith("Setup content (./image.png)")); + } + + @Test + void testHasImageDirectives() { + String readmeContents = getMockReadmeContent(); + assertTrue(ProductContentUtils.hasImageDirectives(readmeContents)); + assertFalse(ProductContentUtils.hasImageDirectives(StringUtils.EMPTY)); + } + + @Test + void testInitProductModuleContent() { + ProductModuleContent productModuleContent = ProductContentUtils.initProductModuleContent(SAMPLE_PRODUCT_ID, + MOCK_RELEASED_VERSION); + assertEquals(SAMPLE_PRODUCT_ID, productModuleContent.getProductId()); + assertEquals(MOCK_RELEASED_VERSION, productModuleContent.getVersion()); + assertEquals(String.format(CommonConstants.ID_WITH_NUMBER_PATTERN, SAMPLE_PRODUCT_ID, MOCK_RELEASED_VERSION), + productModuleContent.getId()); + } + + @Test + void testInitProductModuleContentWithoutVersion() { + ProductModuleContent productModuleContent = ProductContentUtils.initProductModuleContent(SAMPLE_PRODUCT_ID, + StringUtils.EMPTY); + assertEquals(SAMPLE_PRODUCT_ID, productModuleContent.getProductId()); + assertTrue(StringUtils.isBlank(productModuleContent.getVersion())); + assertTrue(StringUtils.isBlank(productModuleContent.getId())); + } + + @Test + void testMappingDescriptionSetupDemoAndUpdateProductModuleTabContents() { + String readmeContents = getMockReadmeContent(); + ReadmeContentsModel readmeContentsModel = ProductContentUtils.getExtractedPartsOfReadme(readmeContents); + Map> moduleContents = new HashMap<>(); + ProductContentUtils.mappingDescriptionSetupAndDemo(moduleContents, MOCK_README_FILE, readmeContentsModel); + String readmeDEContents = getMockReadmeContent(MOCK_README_DE_FILE); + ReadmeContentsModel readmeDEContentsModel = ProductContentUtils.getExtractedPartsOfReadme(readmeDEContents); + ProductContentUtils.mappingDescriptionSetupAndDemo(moduleContents, MOCK_README_DE_FILE, readmeDEContentsModel); + ProductModuleContent productModuleContent = new ProductModuleContent(); + ProductContentUtils.updateProductModuleTabContents(productModuleContent, moduleContents); + assertEquals(3, moduleContents.size()); + assertTrue(productModuleContent.getDescription().get(Language.EN.getValue()).startsWith("Axon Ivy")); + assertTrue(productModuleContent.getDescription().get(Language.DE.getValue()).startsWith("Der")); + assertTrue(StringUtils.isNotBlank(productModuleContent.getSetup().get(Language.DE.getValue()))); + assertTrue(StringUtils.equals(productModuleContent.getSetup().get(Language.DE.getValue()), + productModuleContent.getSetup().get(Language.EN.getValue()))); + assertTrue(StringUtils.equals(productModuleContent.getSetup().get(Language.DE.getValue()), + productModuleContent.getSetup().get(Language.EN.getValue()))); + assertTrue(StringUtils.isNotBlank(productModuleContent.getDemo().get(Language.DE.getValue()))); + assertTrue(StringUtils.equals(productModuleContent.getDemo().get(Language.DE.getValue()), + productModuleContent.getDemo().get(Language.EN.getValue()))); + assertTrue(StringUtils.equals(productModuleContent.getDemo().get(Language.DE.getValue()), + productModuleContent.getDemo().get(Language.EN.getValue()))); + } } \ No newline at end of file diff --git a/marketplace-service/src/test/resources/README.md b/marketplace-service/src/test/resources/README.md index 90a2001d8..d7ef143e9 100644 --- a/marketplace-service/src/test/resources/README.md +++ b/marketplace-service/src/test/resources/README.md @@ -9,17 +9,20 @@ This connector: - allow you to start the Axon Ivy process by hitting the slash command key from the mattermost's channel. - allow you to send a message to the mattermost's channel from the Axon Ivy workplace. - notifies users on the channel for new Axon Ivy workflow Tasks. + ![Restful Person Manager](screen2.png "Restful Person Manager") ## Demo +### Demo sample 1. Hit the slash command key on the channel's chat. The Axon Ivy process will be triggered and create a new task. The task's information will be sent to the channel by a message. ![call-slash-command](images/slash-command.png) -### Setup +## Setup +### Setup guideline Mattermost Instance 1. Ref to [Deploy Mattermost](https://docs.mattermost.com/guides/deployment.html). @@ -60,4 +63,4 @@ Variables: # This variable is used for getting incoming webhook list per page incomingWebhookPerPage: 200 -``` +``` \ No newline at end of file diff --git a/marketplace-service/src/test/resources/README_DE.md b/marketplace-service/src/test/resources/README_DE.md new file mode 100644 index 000000000..048ccc917 --- /dev/null +++ b/marketplace-service/src/test/resources/README_DE.md @@ -0,0 +1,11 @@ +# Mattermost Konnektor + +Der Mattermost-Konnektor von Axon Ivy integriert Mattermost-Funktionen in deine Axon Ivy Prozessanwendung. + +Dieser Konnektor: + +- unterstützt dich mit einer Demo-Implementierung, um den Integrationsaufwand zu reduzieren. +- gewährleistet vollen Zugriff auf die APIs von [Mattermost](https://api.mattermost.com/). +- ermöglicht es dir, den Axon Ivy-Prozess durch Eingabe des Slash-Kommandos im Mattermost-Kanal zu starten. +- ermöglicht das Senden von Nachrichten an den Mattermost-Kanal aus der Axon Ivy-Oberfläche. +- benachrichtigt Benutzer im Kanal über neue Axon Ivy-Workflow-Aufgaben. \ No newline at end of file diff --git a/marketplace-service/src/test/resources/README_NO_DEMO_PART.md b/marketplace-service/src/test/resources/README_NO_DEMO_PART.md new file mode 100644 index 000000000..6d195af94 --- /dev/null +++ b/marketplace-service/src/test/resources/README_NO_DEMO_PART.md @@ -0,0 +1,55 @@ +# Mattermost Connector + +Axon Ivy’s mattermost connector helps you to accelerate process automation initiatives by integrating Mattermost features into your process application within no time. + +This connector: + +- supports you with a demo implementation to reduce your integration effort. +- gives you full power to the [Mattermost's APIs](https://api.mattermost.com/). +- allow you to start the Axon Ivy process by hitting the slash command key from the mattermost's channel. +- allow you to send a message to the mattermost's channel from the Axon Ivy workplace. +- notifies users on the channel for new Axon Ivy workflow Tasks. + +## Setup + +Mattermost Instance + +1. Ref to [Deploy Mattermost](https://docs.mattermost.com/guides/deployment.html). +2. Create Team, User, ... +3.Enable Bot Account Creation and create a bot account for sending notification to the channel Axon Ivy. E.g. + axonivy-bot +4.Create a slash command in the Integrations menu. + ![create-slash-command](images/create-slash-command.png) + +Add the following `Variables` to your `variables.yaml`: + +- `Variables.mattermost.baseUrl` +- `Variables.mattermost.accessToken` +- `Variables.mattermost.teamName` +- `Variables.mattermost.botName` + +and replace the values with your given setup. + +``` +# == Variables == +# +# You can define here your project Variables. +# If you want to define/override a Variable for a specific Environment, +# add an additional ‘variables.yaml’ file in a subdirectory in the ‘Config’ folder: +# '/Config/_/variables.yaml +# +Variables: +# myVariable: value + mattermost: + # The base URL of matter most + baseUrl: "" + # Personal access tokens function similarly to session tokens and can be used by integrations to authenticate against the REST API. + accessToken: "" + # The team name + teamName: "" + # The name of bot that will inform the task on the channel + botName: "" + # This variable is used for getting incoming webhook list per page + incomingWebhookPerPage: 200 + +``` diff --git a/marketplace-service/src/test/resources/README_NO_SETUP_PART.md b/marketplace-service/src/test/resources/README_NO_SETUP_PART.md new file mode 100644 index 000000000..188af7e1c --- /dev/null +++ b/marketplace-service/src/test/resources/README_NO_SETUP_PART.md @@ -0,0 +1,19 @@ +# Mattermost Connector + +Axon Ivy’s mattermost connector helps you to accelerate process automation initiatives by integrating Mattermost features into your process application within no time. + +This connector: + +- supports you with a demo implementation to reduce your integration effort. +- gives you full power to the [Mattermost's APIs](https://api.mattermost.com/). +- allow you to start the Axon Ivy process by hitting the slash command key from the mattermost's channel. +- allow you to send a message to the mattermost's channel from the Axon Ivy workplace. +- notifies users on the channel for new Axon Ivy workflow Tasks. + +## Demo + +1. Hit the slash command key on the channel's chat. + The Axon Ivy process will be triggered and create a new task. + The task's information will be sent to the channel by a message. + +![call-slash-command](images/slash-command.png) diff --git a/marketplace-service/src/test/resources/README_SWAP_DEMO_SETUP.md b/marketplace-service/src/test/resources/README_SWAP_DEMO_SETUP.md new file mode 100644 index 000000000..8ca4254b5 --- /dev/null +++ b/marketplace-service/src/test/resources/README_SWAP_DEMO_SETUP.md @@ -0,0 +1,63 @@ +# Mattermost Connector + +Axon Ivy’s mattermost connector helps you to accelerate process automation initiatives by integrating Mattermost features into your process application within no time. + +This connector: + +- supports you with a demo implementation to reduce your integration effort. +- gives you full power to the [Mattermost's APIs](https://api.mattermost.com/). +- allow you to start the Axon Ivy process by hitting the slash command key from the mattermost's channel. +- allow you to send a message to the mattermost's channel from the Axon Ivy workplace. +- notifies users on the channel for new Axon Ivy workflow Tasks. + +## Setup + +Mattermost Instance + +1. Ref to [Deploy Mattermost](https://docs.mattermost.com/guides/deployment.html). +2. Create Team, User, ... +3.Enable Bot Account Creation and create a bot account for sending notification to the channel Axon Ivy. E.g. + axonivy-bot +4.Create a slash command in the Integrations menu. + ![create-slash-command](images/create-slash-command.png) + +Add the following `Variables` to your `variables.yaml`: + +- `Variables.mattermost.baseUrl` +- `Variables.mattermost.accessToken` +- `Variables.mattermost.teamName` +- `Variables.mattermost.botName` + +and replace the values with your given setup. + +``` +# == Variables == +# +# You can define here your project Variables. +# If you want to define/override a Variable for a specific Environment, +# add an additional ‘variables.yaml’ file in a subdirectory in the ‘Config’ folder: +# '/Config/_/variables.yaml +# +Variables: +# myVariable: value + mattermost: + # The base URL of matter most + baseUrl: "" + # Personal access tokens function similarly to session tokens and can be used by integrations to authenticate against the REST API. + accessToken: "" + # The team name + teamName: "" + # The name of bot that will inform the task on the channel + botName: "" + # This variable is used for getting incoming webhook list per page + incomingWebhookPerPage: 200 + +``` + +## Demo + +1. Hit the slash command key on the channel's chat. + The Axon Ivy process will be triggered and create a new task. + The task's information will be sent to the channel by a message. + +![call-slash-command](images/slash-command.png) \ No newline at end of file diff --git a/marketplace-ui/src/app/app.component.html b/marketplace-ui/src/app/app.component.html index ce18d841b..308f1e2ce 100644 --- a/marketplace-ui/src/app/app.component.html +++ b/marketplace-ui/src/app/app.component.html @@ -22,8 +22,4 @@ } - - @if (loadingService.isLoading()) { - - } diff --git a/marketplace-ui/src/app/app.component.spec.ts b/marketplace-ui/src/app/app.component.spec.ts index 776d58bf3..0a55ca2b6 100644 --- a/marketplace-ui/src/app/app.component.spec.ts +++ b/marketplace-ui/src/app/app.component.spec.ts @@ -31,8 +31,8 @@ describe('AppComponent', () => { [ 'getNavigationStartEvent', 'isDesignerEnv', - 'checkCookieForDesignerEnv', - 'checkCookieForDesignerVersion' + 'checkSessionStorageForDesignerEnv', + 'checkSessionStorageForDesignerVersion' ] ); @@ -89,7 +89,7 @@ describe('AppComponent', () => { expect(component).toBeTruthy(); }); - it('should subscribe to query params and check cookies if not in designer environment', () => { + it('should subscribe to query params and check session strorage if not in designer environment', () => { routingQueryParamService.isDesignerEnv.and.returnValue(false); const params = { someParam: 'someValue' }; @@ -103,10 +103,10 @@ describe('AppComponent', () => { navigationStartSubject.next(new NavigationStart(1, 'testUrl')); expect( - routingQueryParamService.checkCookieForDesignerEnv + routingQueryParamService.checkSessionStorageForDesignerEnv ).toHaveBeenCalledWith(params); expect( - routingQueryParamService.checkCookieForDesignerVersion + routingQueryParamService.checkSessionStorageForDesignerVersion ).toHaveBeenCalledWith(params); }); @@ -117,10 +117,10 @@ describe('AppComponent', () => { navigationStartSubject.next(new NavigationStart(1, 'testUrl')); expect( - routingQueryParamService.checkCookieForDesignerEnv + routingQueryParamService.checkSessionStorageForDesignerEnv ).not.toHaveBeenCalled(); expect( - routingQueryParamService.checkCookieForDesignerVersion + routingQueryParamService.checkSessionStorageForDesignerVersion ).not.toHaveBeenCalled(); }); diff --git a/marketplace-ui/src/app/app.component.ts b/marketplace-ui/src/app/app.component.ts index 67b0d9dff..fb05ea94c 100644 --- a/marketplace-ui/src/app/app.component.ts +++ b/marketplace-ui/src/app/app.component.ts @@ -1,6 +1,5 @@ import { FooterComponent } from './shared/components/footer/footer.component'; import { HeaderComponent } from './shared/components/header/header.component'; -import { LoadingService } from './core/services/loading/loading.service'; import { RoutingQueryParamService } from './shared/services/routing.query.param.service'; import { CommonModule } from '@angular/common'; import { ERROR_PAGE_PATH } from './shared/constants/common.constant'; @@ -12,18 +11,16 @@ import { RouterOutlet, Event } from '@angular/router'; -import { LoadingSpinnerComponent } from "./shared/components/loading-spinner/loading-spinner.component"; import { BackToTopComponent } from "./shared/components/back-to-top/back-to-top.component"; @Component({ selector: 'app-root', standalone: true, - imports: [RouterOutlet, HeaderComponent, FooterComponent, CommonModule, LoadingSpinnerComponent, BackToTopComponent], + imports: [RouterOutlet, HeaderComponent, FooterComponent, CommonModule, BackToTopComponent], templateUrl: './app.component.html', styleUrl: './app.component.scss' }) export class AppComponent { - loadingService = inject(LoadingService); routingQueryParamService = inject(RoutingQueryParamService); route = inject(ActivatedRoute); isMobileMenuCollapsed = true; @@ -40,8 +37,8 @@ export class AppComponent { this.routingQueryParamService.getNavigationStartEvent().subscribe(() => { if (!this.routingQueryParamService.isDesignerEnv()) { this.route.queryParams.subscribe(params => { - this.routingQueryParamService.checkCookieForDesignerEnv(params); - this.routingQueryParamService.checkCookieForDesignerVersion(params); + this.routingQueryParamService.checkSessionStorageForDesignerEnv(params); + this.routingQueryParamService.checkSessionStorageForDesignerVersion(params); }); } }); diff --git a/marketplace-ui/src/app/app.routes.ts b/marketplace-ui/src/app/app.routes.ts index 93f3b9b41..1106a8f60 100644 --- a/marketplace-ui/src/app/app.routes.ts +++ b/marketplace-ui/src/app/app.routes.ts @@ -3,6 +3,7 @@ import { GithubCallbackComponent } from './auth/github-callback/github-callback. import { ErrorPageComponent } from './shared/components/error-page/error-page.component'; import { RedirectPageComponent } from './shared/components/redirect-page/redirect-page.component'; import { ERROR_PAGE } from './shared/constants/common.constant'; +import { SecurityMonitorComponent } from './modules/security-monitor/security-monitor.component'; export const routes: Routes = [ { @@ -15,6 +16,10 @@ export const routes: Routes = [ component: ErrorPageComponent, title: ERROR_PAGE }, + { + path: 'security-monitor', + component: SecurityMonitorComponent + }, { path: '', loadChildren: () => import('./modules/home/home.routes').then(m => m.routes) diff --git a/marketplace-ui/src/app/auth/auth.service.spec.ts b/marketplace-ui/src/app/auth/auth.service.spec.ts index 8d7b07fe9..af558eb4b 100644 --- a/marketplace-ui/src/app/auth/auth.service.spec.ts +++ b/marketplace-ui/src/app/auth/auth.service.spec.ts @@ -4,7 +4,6 @@ import { Router } from '@angular/router'; import { CookieService } from 'ngx-cookie-service'; import { AuthService } from './auth.service'; import { environment } from '../../environments/environment'; -import { of } from 'rxjs'; import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import { TOKEN_KEY } from '../shared/constants/common.constant'; diff --git a/marketplace-ui/src/app/core/interceptors/api.interceptor.spec.ts b/marketplace-ui/src/app/core/interceptors/api.interceptor.spec.ts index d09151d5a..5ef65a1ee 100644 --- a/marketplace-ui/src/app/core/interceptors/api.interceptor.spec.ts +++ b/marketplace-ui/src/app/core/interceptors/api.interceptor.spec.ts @@ -5,7 +5,7 @@ import { ActivatedRoute } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; import { ProductComponent } from '../../modules/product/product.component'; -import { DESIGNER_COOKIE_VARIABLE } from '../../shared/constants/common.constant'; +import { DESIGNER_SESSION_STORAGE_VARIABLE } from '../../shared/constants/common.constant'; import { apiInterceptor } from './api.interceptor'; import { MatomoTestingModule } from 'ngx-matomo-client/testing'; @@ -29,7 +29,7 @@ describe('AuthInterceptor', () => { provide: ActivatedRoute, useValue: { queryParams: of({ - [DESIGNER_COOKIE_VARIABLE.restClientParamName]: true + [DESIGNER_SESSION_STORAGE_VARIABLE.restClientParamName]: true }) } } diff --git a/marketplace-ui/src/app/core/interceptors/api.interceptor.ts b/marketplace-ui/src/app/core/interceptors/api.interceptor.ts index a9447f370..32c30e316 100644 --- a/marketplace-ui/src/app/core/interceptors/api.interceptor.ts +++ b/marketplace-ui/src/app/core/interceptors/api.interceptor.ts @@ -13,18 +13,19 @@ import { ERROR_CODES, ERROR_PAGE_PATH } from '../../shared/constants/common.cons export const REQUEST_BY = 'X-Requested-By'; export const IVY = 'marketplace-website'; -/** SkipLoading: This option for exclude loading api - * @Example return httpClient.get('apiEndPoint', { context: new HttpContext().set(SkipLoading, true) }) - */ -export const SkipLoading = new HttpContextToken(() => false); - /** ForwardingError: This option for forwarding responce error to the caller * @Example return httpClient.get('apiEndPoint', { context: new HttpContext().set(ForwardingError, true) }) */ export const ForwardingError = new HttpContextToken(() => false); +/** LoadingComponentId: This option for show loading for component which match with id + * @Example return httpClient.get('apiEndPoint', { context: new HttpContext().set(LoadingComponentId, "detail-page") }) + */ +export const LoadingComponent = new HttpContextToken(() => ''); + export const apiInterceptor: HttpInterceptorFn = (req, next) => { const router = inject(Router); + const loadingService = inject(LoadingService); if (req.url.includes('i18n')) { @@ -41,9 +42,6 @@ export const apiInterceptor: HttpInterceptorFn = (req, next) => { headers: addIvyHeaders(req.headers) }); - if (!req.context.get(SkipLoading)) { - loadingService.show(); - } if (req.context.get(ForwardingError)) { return next(cloneReq); @@ -59,8 +57,8 @@ export const apiInterceptor: HttpInterceptorFn = (req, next) => { return EMPTY; }), finalize(() => { - if (!req.context.get(SkipLoading)) { - loadingService.hide(); + if (req.context.get(LoadingComponent)) { + loadingService.hideLoading(req.context.get(LoadingComponent)); } }) ); diff --git a/marketplace-ui/src/app/core/services/loading/loading.service.spec.ts b/marketplace-ui/src/app/core/services/loading/loading.service.spec.ts index d6640c9e5..d10ebcdc4 100644 --- a/marketplace-ui/src/app/core/services/loading/loading.service.spec.ts +++ b/marketplace-ui/src/app/core/services/loading/loading.service.spec.ts @@ -1,6 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { LoadingService } from './loading.service'; +import { LoadingComponentId } from '../../../shared/enums/loading-component-id'; describe('LoadingService', () => { let service: LoadingService; @@ -15,12 +16,12 @@ describe('LoadingService', () => { }); it('show should update isLoading to true', () => { - service.show(); - expect(service.isLoading()).toBeTrue(); + service.showLoading(LoadingComponentId.DETAIL_PAGE); + expect(service.loadingStates()[LoadingComponentId.DETAIL_PAGE]).toBeTrue(); }) it('hide should update isLoading to false', () => { - service.hide(); - expect(service.isLoading()).toBeFalse(); + service.hideLoading(LoadingComponentId.DETAIL_PAGE); + expect(service.loadingStates()[LoadingComponentId.DETAIL_PAGE]).toBeFalse(); }) }); diff --git a/marketplace-ui/src/app/core/services/loading/loading.service.ts b/marketplace-ui/src/app/core/services/loading/loading.service.ts index f3981781c..4d5829825 100644 --- a/marketplace-ui/src/app/core/services/loading/loading.service.ts +++ b/marketplace-ui/src/app/core/services/loading/loading.service.ts @@ -1,17 +1,24 @@ -import { computed, Injectable, signal } from '@angular/core'; +import { Injectable, signal } from '@angular/core'; @Injectable({ providedIn: 'root' }) export class LoadingService { - private readonly isShow = signal(false); - isLoading = computed(() => this.isShow()); + loadingStates = signal<{ [key: string]: boolean }>({}); - show() { - this.isShow.set(true); + private setLoading(componentId: string, isLoading: boolean): void { + this.loadingStates.update(states => { + const updatedStates = { ...states }; + updatedStates[componentId] = isLoading; + return updatedStates; + }); } - hide() { - this.isShow.set(false); + showLoading(componentId: string): void { + this.setLoading(componentId, true); + } + + hideLoading(componentId: string) { + this.setLoading(componentId, false); } } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.spec.ts index 628d0ad0a..131db4f11 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.spec.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-detail-feedback.component.spec.ts @@ -39,13 +39,13 @@ describe('ProductDetailFeedbackComponent', () => { mockProductFeedbackService = jasmine.createSpyObj( 'ProductFeedbackService', [ - 'initFeedbacks', + 'fetchFeedbacks', 'findProductFeedbackOfUser', 'loadMoreFeedbacks', 'areAllFeedbacksLoaded', 'totalElements' ], - {feedbacks: signal([] as Feedback[]), sort: signal('updatedAt,desc')} + { feedbacks: signal([] as Feedback[]), sort: signal('updatedAt,desc') } ); mockProductStarRatingService = jasmine.createSpyObj( 'ProductStarRatingService', diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.spec.ts index df7abd888..817f6cfbb 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.spec.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.spec.ts @@ -68,8 +68,8 @@ describe('ProductFeedbackService', () => { productDetailService.productId.and.returnValue('123'); - service.initFeedbacks(); - const req = httpMock.expectOne('api/feedback/product/123?page=0&size=8&sort=newest'); + service.fetchFeedbacks(); + const req = httpMock.expectOne( 'api/feedback/product/123?page=0&size=8&sort=newest' ); expect(req.request.method).toBe('GET'); req.flush(mockResponse); @@ -85,14 +85,14 @@ describe('ProductFeedbackService', () => { const additionalFeedback: Feedback[] = [ { content: 'Another review', rating: 4, productId: '123' } ]; - + productDetailService.productId.and.returnValue('123'); - service.initFeedbacks(); - const initReq = httpMock.expectOne('api/feedback/product/123?page=0&size=8&sort=newest'); + service.fetchFeedbacks(); + const initReq = httpMock.expectOne( 'api/feedback/product/123?page=0&size=8&sort=newest' ); initReq.flush({ _embedded: { feedbacks: initialFeedback }, page: { totalPages: 2, totalElements: 5 } }); - + service.loadMoreFeedbacks(); - const loadMoreReq = httpMock.expectOne('api/feedback/product/123?page=1&size=8&sort=newest'); + const loadMoreReq = httpMock.expectOne( 'api/feedback/product/123?page=1&size=8&sort=newest' ); loadMoreReq.flush({ _embedded: { feedbacks: additionalFeedback } }); expect(service.feedbacks()).toEqual([...initialFeedback, ...additionalFeedback]); diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts index d6fe89da0..6859da78f 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-feedbacks-panel/product-feedback.service.ts @@ -14,10 +14,7 @@ import { import { catchError, Observable, of, tap, throwError } from 'rxjs'; import { CookieService } from 'ngx-cookie-service'; import { AuthService } from '../../../../../auth/auth.service'; -import { - ForwardingError, - SkipLoading -} from '../../../../../core/interceptors/api.interceptor'; +import { ForwardingError } from '../../../../../core/interceptors/api.interceptor'; import { FeedbackApiResponse } from '../../../../../shared/models/apis/feedback-response.model'; import { Feedback } from '../../../../../shared/models/feedback.model'; import { ProductDetailService } from '../../product-detail.service'; @@ -64,13 +61,11 @@ export class ProductFeedbackService { return this.http .post(FEEDBACK_API_URL, feedback, { headers, - context: new HttpContext() - .set(SkipLoading, true) - .set(ForwardingError, true) + context: new HttpContext().set(ForwardingError, true) }) .pipe( tap(() => { - this.initFeedbacks(); + this.fetchFeedbacks(); this.findProductFeedbackOfUser().subscribe(); this.productStarRatingService.fetchData(); }), @@ -86,7 +81,7 @@ export class ProductFeedbackService { ); } - private findProductFeedbacksByCriteria( + findProductFeedbacksByCriteria( productId: string = this.productDetailService.productId(), page: number = this.page(), sort: string = this.sort(), @@ -100,7 +95,7 @@ export class ProductFeedbackService { return this.http .get(requestURL, { params: requestParams, - context: new HttpContext().set(SkipLoading, true).set(ForwardingError, true) + context: new HttpContext().set(ForwardingError, true) }) .pipe( tap(response => { @@ -126,9 +121,7 @@ export class ProductFeedbackService { return this.http .get(requestURL, { params, - context: new HttpContext() - .set(SkipLoading, true) - .set(ForwardingError, true) + context: new HttpContext().set(ForwardingError, true) }) .pipe( tap(feedback => { @@ -152,11 +145,9 @@ export class ProductFeedbackService { ); } - initFeedbacks(): void { - this.page.set(0); - this.findProductFeedbacksByCriteria().subscribe(response => { - this.totalPages.set(response.page.totalPages); - this.totalElements.set(response.page.totalElements); + fetchFeedbacks(): void { + this.getInitFeedbacksObservable().subscribe(response => { + this.handleFeedbackApiResponse(response); }); } @@ -174,4 +165,14 @@ export class ProductFeedbackService { private clearTokenCookie(): void { this.cookieService.delete(TOKEN_KEY); } + + handleFeedbackApiResponse(response: FeedbackApiResponse): void { + this.totalPages.set(response.page.totalPages); + this.totalElements.set(response.page.totalElements); + } + + getInitFeedbacksObservable(): Observable { + this.page.set(0); + return this.findProductFeedbacksByCriteria(); + } } \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating.service.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating.service.ts index c8af47d13..e19805ce8 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating.service.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-feedback/product-star-rating-panel/product-star-rating.service.ts @@ -7,10 +7,9 @@ import { signal, WritableSignal } from '@angular/core'; -import { tap } from 'rxjs'; +import { Observable, tap } from 'rxjs'; import { StarRatingCounting } from '../../../../../shared/models/star-rating-counting.model'; import { ProductDetailService } from '../../product-detail.service'; -import { SkipLoading } from '../../../../../core/interceptors/api.interceptor'; @Injectable({ providedIn: 'root' @@ -28,16 +27,7 @@ export class ProductStarRatingService { ); fetchData(productId: string = this.productDetailService.productId()): void { - const requestURL = `api/feedback/product/${productId}/rating`; - this.http - .get(requestURL, {context: new HttpContext().set(SkipLoading, true)}) - .pipe( - tap(data => { - this.sortByStar(data); - this.starRatings.set(data); - }) - ) - .subscribe(); + this.getRatingObservable(productId).subscribe(); } private sortByStar(starRatings: StarRatingCounting[]): void { @@ -64,4 +54,16 @@ export class ProductStarRatingService { return Math.round(reviewNumber * 10) / 10; } + + getRatingObservable(id: string): Observable { + const requestURL = `api/feedback/product/${id}/rating`; + return this.http + .get(requestURL, { context: new HttpContext() }) + .pipe( + tap(data => { + this.sortByStar(data); + this.starRatings.set(data); + }) + ); + } } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.html index 57a78e8d1..9aca7f03d 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.html @@ -1,118 +1,150 @@ -

- {{ 'common.product.detail.information.label' | translate }} -

-
-
- - {{ 'common.product.detail.information.value.implementedBy' | translate }} - - - Logo Vendor - -
-
-
- - {{ 'common.product.detail.information.value.version' | translate }} - - - {{ displayVersion }} - -
- @if(productDetail.compatibility) { +@if (!(productDetail | emptyProductDetailPipe)) { +

+ {{ 'common.product.detail.information.label' | translate }} +

+ +
+
+ + {{ + 'common.product.detail.information.value.implementedBy' | translate + }} + + + Logo Vendor + +
- {{ 'common.product.detail.information.value.compatibility' | translate }} + {{ 'common.product.detail.information.value.version' | translate }} - {{ productDetail.compatibility }} + {{ displayVersion }}
- } -
-
- - {{ 'common.product.detail.information.value.cost' | translate }} - - {{ productDetail.cost }} -
-
-
- - {{ 'common.product.detail.information.value.language' | translate }} - - {{ productDetail.language }} -
- @if (externalDocumentLink !== '') { -
-
- - {{ 'common.product.detail.information.value.documentation' | translate }} - - - {{ displayExternalDocName ?? 'common.product.detail.information.value.defaultDocName' | translate }} - -
- } -
-
- - {{ 'common.product.detail.type' | translate }} - - {{ productDetail.type }} -
-
-
- - {{ 'common.product.detail.information.value.tag' | translate }} - - - {{ productDetail.tags ? productDetail.tags!.join(', ') : '' }} - -
- @if(productDetail.sourceUrl) { + @if (productDetail.compatibility) { +
+
+ + {{ + 'common.product.detail.information.value.compatibility' | translate + }} + + + {{ productDetail.compatibility }} + +
+ }
- {{ 'common.product.detail.information.value.source' | translate }} + {{ 'common.product.detail.information.value.cost' | translate }} - - - github.com + {{ productDetail.cost }} +
+
+
+ + {{ 'common.product.detail.information.value.language' | translate }} + + {{ productDetail.language }} +
+ @if (externalDocumentLink !== '') { +
+
+ + {{ + 'common.product.detail.information.value.documentation' | translate + }} + + + {{ + displayExternalDocName ?? + 'common.product.detail.information.value.defaultDocName' + | translate + }} +
+ } +
+
+ + {{ 'common.product.detail.type' | translate }} + {{ productDetail.type }}
- } - @if(productDetail.statusBadgeUrl) {
- {{ 'common.product.detail.information.value.status' | translate }} + {{ 'common.product.detail.information.value.tag' | translate }} + + + {{ productDetail.tags ? productDetail.tags!.join(', ') : '' }} + +
+ @if (productDetail.sourceUrl) { +
+
+ + {{ 'common.product.detail.information.value.source' | translate }} + + + + github.com + + +
+ } + @if (productDetail.statusBadgeUrl) { +
+
+ + {{ 'common.product.detail.information.value.status' | translate }} + + +
+ } +
+
+ + {{ + 'common.product.detail.information.value.moreInformation' | translate + }} + + + + {{ 'common.product.detail.information.value.contactUs' | translate }} + -
- } -
-
- - {{ - 'common.product.detail.information.value.moreInformation' | translate - }} - - - - {{ 'common.product.detail.information.value.contactUs' | translate }} - -
-
+} diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.ts index 9c102cfae..4862f8b39 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-information-tab/product-detail-information-tab.component.ts @@ -1,5 +1,12 @@ import { CommonModule } from '@angular/common'; -import { Component, inject, Input, OnChanges, SimpleChange, SimpleChanges } from '@angular/core'; +import { + Component, + inject, + Input, + OnChanges, + SimpleChange, + SimpleChanges +} from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { ProductDetail } from '../../../../shared/models/product-detail.model'; import { LanguageService } from '../../../../core/services/language/language.service'; @@ -7,13 +14,19 @@ import { ProductDetailService } from '../product-detail.service'; import { VERSION } from '../../../../shared/constants/common.constant'; import { LoadingService } from '../../../../core/services/loading/loading.service'; import { ThemeService } from '../../../../core/services/theme/theme.service'; +import { EmptyProductDetailPipe } from '../../../../shared/pipes/empty-product-detail.pipe'; +import { LoadingComponentId } from '../../../../shared/enums/loading-component-id'; const SELECTED_VERSION = 'selectedVersion'; const PRODUCT_DETAIL = 'productDetail'; @Component({ selector: 'app-product-detail-information-tab', standalone: true, - imports: [CommonModule, TranslateModule], + imports: [ + CommonModule, + TranslateModule, + EmptyProductDetailPipe +], templateUrl: './product-detail-information-tab.component.html', styleUrl: './product-detail-information-tab.component.scss' }) @@ -22,6 +35,7 @@ export class ProductDetailInformationTabComponent implements OnChanges { productDetail!: ProductDetail; @Input() selectedVersion!: string; + protected LoadingComponentId = LoadingComponentId; externalDocumentLink = ''; displayVersion = ''; displayExternalDocName: string | null = ''; @@ -33,7 +47,10 @@ export class ProductDetailInformationTabComponent implements OnChanges { ngOnChanges(changes: SimpleChanges): void { let version = ''; const changedSelectedVersion = changes[SELECTED_VERSION]; - if (changedSelectedVersion && changedSelectedVersion.currentValue === changedSelectedVersion.previousValue) { + if ( changedSelectedVersion && + changedSelectedVersion.currentValue === + changedSelectedVersion.previousValue + ) { return; } const changedProduct = changes[PRODUCT_DETAIL]; @@ -47,7 +64,11 @@ export class ProductDetailInformationTabComponent implements OnChanges { return; } - this.productDetailService.getExternalDocumentForProductByVersion(this.productDetail.id, this.extractVersionValue(version)) + this.productDetailService + .getExternalDocumentForProductByVersion( + this.productDetail.id, + this.extractVersionValue(version) + ) .subscribe({ next: response => { if (response) { @@ -56,11 +77,9 @@ export class ProductDetailInformationTabComponent implements OnChanges { } else { this.resetValues(); } - this.loadingService.hide(); }, error: () => { this.resetValues(); - this.loadingService.hide(); } }); this.displayVersion = this.extractVersionValue(this.selectedVersion); @@ -80,7 +99,7 @@ export class ProductDetailInformationTabComponent implements OnChanges { isProductChanged(changedProduct: SimpleChange) { return !!(changedProduct?.previousValue && Object.keys(changedProduct.previousValue).length > 0 && - changedProduct.currentValue !== changedProduct.previousValue); + changedProduct.currentValue !== changedProduct.previousValue + ); } - } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html index 4fb9bca6c..3369b6960 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.html @@ -47,7 +47,6 @@ @if (isDropDownDisplayed()) {
-
- @if (isArtifactLoading()) { - - } +
}
@@ -127,14 +126,18 @@ [matomoClickName]="installButton.name + ' - ' + getTrackingEnvironmentBasedOnActionType()" [lang]="languageService.selectedLanguage()" class="btn btn__install flex-grow-1 install-designer-button m-0 col-4" id="install-button" - (click)="onUpdateInstallationCountForDesigner()" onClick="function installInDesigner() { + (click)="onUpdateInstallationCountForDesigner()" onClick="function installInDesigner(event) { const selectedItemElement = document.querySelector('.install-designer-dropdown'); if (selectedItemElement) { const metaDataJsonUrl = selectedItemElement.getAttribute('metaDataJsonUrl'); - install(metaDataJsonUrl); + try { + install(metaDataJsonUrl); + } catch (error) { + event.stopImmediatePropagation(); + } } } - installInDesigner();" [ngClass]="themeService.isDarkMode() ? 'btn-light' : 'btn-primary'"> + installInDesigner(event);" [ngClass]="themeService.isDarkMode() ? 'btn-light' : 'btn-primary'"> {{ 'common.product.detail.install.buttonLabelInDesigner' | translate }} @@ -154,4 +157,6 @@ {{ 'common.product.detail.contactUs.label' | translate }} } + @default { + } } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.scss b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.scss index 57941337e..c12556917 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.scss +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.scss @@ -11,22 +11,23 @@ justify-content: space-between; box-shadow: 0px 4px 30px 0px #0000001a; border: 0.5px solid var(--ivy-secondary-border-color); - top: 0.8rem !important; + top: 1rem !important; .tooltip-arrow { - top: -0.8rem !important; + top: -1rem !important; width: 0; height: 0; border-left: 13px solid transparent; border-right: 13px solid transparent; - border-bottom: 13px solid var(--ivy-secondary-border-color); &::before { + box-sizing: border-box !important; width: 0; height: 0; - border-left: 12px solid transparent !important; - border-right: 12px solid transparent !important; - border-bottom: 12px solid var(--bs-body-bg) !important; - top: 0.15rem !important; + transform: rotate(45deg); + border-top-left-radius: 5px !important; + border: 1rem solid var(--bs-body-bg) !important; + box-shadow: -0.05em -0.05em 0em var(--ivy-secondary-border-color-up-arrow); + top: 0.05rem !important; left: -0.75rem; } } @@ -89,6 +90,7 @@ .btn__install { border: 0px; } + .primary-color { color: var(--ivy-primary-bg); } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.spec.ts index d5d74968e..f1c431ff1 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.spec.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.spec.ts @@ -10,7 +10,6 @@ import { CookieService } from 'ngx-cookie-service'; import { ActivatedRoute, provideRouter, Router } from '@angular/router'; import { CommonUtils } from '../../../../shared/utils/common.utils'; import { ROUTER } from '../../../../shared/constants/router.constant'; -import { MatomoConfiguration, MatomoModule, MatomoRouterModule } from 'ngx-matomo-client'; import { MatomoTestingModule } from 'ngx-matomo-client/testing'; import { ProductDetailActionType } from '../../../../shared/enums/product-detail-action-type'; import { MATOMO_TRACKING_ENVIRONMENT } from '../../../../shared/constants/matomo.constant'; @@ -31,10 +30,11 @@ describe('ProductDetailVersionActionComponent', () => { beforeEach(() => { productServiceMock = jasmine.createSpyObj('ProductService', [ - 'sendRequestToProductDetailVersionAPI', 'sendRequestToUpdateInstallationCount', 'sendRequestToGetProductVersionsForDesigner' + 'sendRequestToProductDetailVersionAPI', + 'sendRequestToUpdateInstallationCount', + 'sendRequestToGetProductVersionsForDesigner' ]); - const commonUtilsSpy = jasmine.createSpyObj('CommonUtils', ['getCookieValue']); - // const cookieServiceSpy = jasmine.createSpyObj('CookieService', ['get', 'set']); + const commonUtilsSpy = jasmine.createSpyObj('CommonUtils', [ 'getCookieValue' ]); const activatedRouteSpy = jasmine.createSpyObj('ActivatedRoute', [], { snapshot: { queryParams: {} @@ -43,7 +43,7 @@ describe('ProductDetailVersionActionComponent', () => { TestBed.configureTestingModule({ imports: [ - ProductDetailVersionActionComponent, + ProductDetailVersionActionComponent, TranslateModule.forRoot(), MatomoTestingModule.forRoot() ], @@ -67,9 +67,7 @@ describe('ProductDetailVersionActionComponent', () => { fixture.detectChanges(); }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { expect(component).toBeTruthy(); }); it('first artifact should be chosen when select corresponding version', () => { const selectedVersion = 'Version 10.0.2'; @@ -91,11 +89,13 @@ describe('ProductDetailVersionActionComponent', () => { it('should update selectedVersion, artifacts, selectedArtifactName, and selectedArtifact, and call addVersionParamToRoute', () => { const version = '1.0'; - const artifacts = [{ - name: 'Example Artifact', - downloadUrl: 'https://example.com/download', - isProductArtifact: true - } as ItemDropdown]; + const artifacts = [ + { + name: 'Example Artifact', + downloadUrl: 'https://example.com/download', + isProductArtifact: true + } as ItemDropdown + ]; const versionMap = new Map(); versionMap.set(version, artifacts); @@ -172,7 +172,6 @@ describe('ProductDetailVersionActionComponent', () => { }); }); - it('all of state should be reset before call rest api', () => { const selectedVersion = 'Version 10.0.2'; const artifact = { @@ -218,9 +217,7 @@ describe('ProductDetailVersionActionComponent', () => { spyOn(window, 'open'); component.selectedArtifact = 'https://example.com/download'; spyOn(component, 'onUpdateInstallationCount'); - component.downloadArtifact(); - expect(window.open).toHaveBeenCalledWith( 'https://example.com/download', '_blank' @@ -237,6 +234,7 @@ describe('ProductDetailVersionActionComponent', () => { }); it('should send Api to get DevVersion', () => { + component.isDevVersionsDisplayed.set(false); spyOn(component.isDevVersionsDisplayed, 'set'); expect(component.isDevVersionsDisplayed()).toBeFalse(); mockApiWithExpectedResponse(); @@ -251,7 +249,8 @@ describe('ProductDetailVersionActionComponent', () => { const mockArtifact1 = { name: 'Example Artifact1', downloadUrl: 'https://example.com/download', - isProductArtifact: true, label: 'Example Artifact1' + isProductArtifact: true, + label: 'Example Artifact1' } as ItemDropdown; const mockArtifact2 = { name: 'Example Artifact2', @@ -277,63 +276,22 @@ describe('ProductDetailVersionActionComponent', () => { } it('should open a new tab with the selected artifact URL', () => { - const mockWindowOpen = jasmine.createSpy('windowOpen').and.returnValue({ - blur: jasmine.createSpy('blur') - }); - const mockWindowFocus = spyOn(window, 'focus'); + const mockWindowOpen = jasmine.createSpy('windowOpen').and.returnValue({}); spyOn(window, 'open').and.callFake(mockWindowOpen); spyOn(component, 'onUpdateInstallationCount'); component.selectedArtifact = 'http://example.com/artifact'; - component.downloadArtifact(); - expect(window.open).toHaveBeenCalledWith( 'http://example.com/artifact', '_blank' ); - expect(mockWindowOpen().blur).toHaveBeenCalled(); expect(component.onUpdateInstallationCount).toHaveBeenCalledOnceWith(); - expect(mockWindowFocus).toHaveBeenCalled(); - }); - - it('should open a new tab with the correct URL and blur it', () => { - const productId = 'octopus'; - component.productId = productId; - const newTabMock: Partial = { - blur: jasmine.createSpy('blur') - }; - spyOn(window, 'open').and.returnValue(newTabMock as Window); - spyOn(window, 'focus'); - component.onNavigateToContactPage(); - - expect(window.open).toHaveBeenCalledWith( - `https://www.axonivy.com/marketplace/contact/?market_solutions=${productId}`, - '_blank' - ); - expect(newTabMock.blur).toHaveBeenCalled(); - expect(window.focus).toHaveBeenCalled(); - }); - - it('should not call blur if newTab is null', () => { - const productId = 'octopus'; - component.productId = productId; - spyOn(window, 'open').and.returnValue(null); - spyOn(window, 'focus'); - - component.onNavigateToContactPage(); - - expect(window.open).toHaveBeenCalledWith( - `https://www.axonivy.com/marketplace/contact/?market_solutions=${productId}`, - '_blank' - ); - expect(window.focus).toHaveBeenCalled(); }); it('should not call productService if versions are already populated', () => { component.versions.set(['1.0', '1.1']); fixture.detectChanges(); component.getVersionInDesigner(); - expect(productServiceMock.sendRequestToGetProductVersionsForDesigner).not.toHaveBeenCalled(); }); @@ -367,20 +325,18 @@ describe('ProductDetailVersionActionComponent', () => { const testCases = [ { actionType: ProductDetailActionType.STANDARD, expected: MATOMO_TRACKING_ENVIRONMENT.standard }, { actionType: ProductDetailActionType.DESIGNER_ENV, expected: MATOMO_TRACKING_ENVIRONMENT.designerEnv }, - { actionType: ProductDetailActionType.CUSTOM_SOLUTION, expected: MATOMO_TRACKING_ENVIRONMENT.customSolution }, + { actionType: ProductDetailActionType.CUSTOM_SOLUTION, expected: MATOMO_TRACKING_ENVIRONMENT.customSolution } ]; - + testCases.forEach(({ actionType, expected }) => { component.actionType = actionType; - const result = component.getTrackingEnvironmentBasedOnActionType(); expect(result).toBe(expected); }); }); - it('should return empty environment when action type is default', () => { + it('should return empty environment when action type is default', () => { const result = component.getTrackingEnvironmentBasedOnActionType(); - expect(result).toBe(''); }); }); diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.ts index 7df828211..e256b4e27 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail-version-action/product-detail-version-action.component.ts @@ -35,6 +35,8 @@ import { ROUTER } from '../../../../shared/constants/router.constant'; import { MatomoCategory, MatomoAction } from '../../../../shared/enums/matomo-tracking.enum'; import { MATOMO_TRACKING_ENVIRONMENT } from '../../../../shared/constants/matomo.constant'; import { MATOMO_DIRECTIVES } from 'ngx-matomo-client'; +import { LoadingComponentId } from '../../../../shared/enums/loading-component-id'; +import { LoadingService } from '../../../../core/services/loading/loading.service'; const showDevVersionCookieName = 'showDevVersions'; @@ -62,7 +64,7 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { protected ProductDetailActionType = ProductDetailActionType; protected MatomoCategory = MatomoCategory; protected MatomoAction = MatomoAction; - trackedEnvironmentForMatomo = '' + trackedEnvironmentForMatomo = ''; selectedVersion = model(''); versions: WritableSignal = signal([]); @@ -77,12 +79,16 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { artifacts: WritableSignal = signal([]); isDropDownDisplayed = signal(false); - isArtifactLoading = signal(false); + + protected LoadingComponentId = LoadingComponentId; + loadingContainerClasses = + 'd-flex justify-content-center position-absolute align-items-center w-100 h-100 fixed-top rounded overlay-background'; designerVersion = ''; selectedArtifact: string | undefined = ''; selectedArtifactName: string | undefined = ''; versionMap: Map = new Map(); + loadingService = inject(LoadingService); themeService = inject(ThemeService); productService = inject(ProductService); elementRef = inject(ElementRef); @@ -93,7 +99,9 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { router = inject(Router); route = inject(ActivatedRoute); - isDevVersionsDisplayed: WritableSignal = signal(this.getShowDevVersionFromCookie()); + isDevVersionsDisplayed: WritableSignal = signal( + this.getShowDevVersionFromCookie() + ); ngAfterViewInit() { const tooltipTriggerList = [].slice.call( @@ -113,7 +121,11 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { } private getShowDevVersionFromCookie() { - return CommonUtils.getCookieValue(this.cookieService, SHOW_DEV_VERSION, false); + return CommonUtils.getCookieValue( + this.cookieService, + SHOW_DEV_VERSION, + false + ); } private updateSelectedArtifact(version: string) { @@ -130,11 +142,13 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { } addVersionParamToRoute(selectedVersion: string) { - this.router.navigate([], { - relativeTo: this.route, - queryParams: { [ROUTER.VERSION]: selectedVersion }, - queryParamsHandling: 'merge' - }).then(); + this.router + .navigate([], { + relativeTo: this.route, + queryParams: { [ROUTER.VERSION]: selectedVersion }, + queryParamsHandling: 'merge' + }) + .then(); } onSelectVersionInDesigner(version: string) { @@ -149,7 +163,10 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { onShowDevVersion(event: Event) { event.preventDefault(); this.isDevVersionsDisplayed.update(oldValue => !oldValue); - this.cookieService.set(showDevVersionCookieName, this.isDevVersionsDisplayed().toString()); + this.cookieService.set( + showDevVersionCookieName, + this.isDevVersionsDisplayed().toString() + ); this.getVersionWithArtifact(true); } @@ -161,7 +178,7 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { } getVersionWithArtifact(ignoreRouteVersion = false) { - this.isArtifactLoading.set(true); + this.loadingService.showLoading(LoadingComponentId.PRODUCT_VERSION); this.sanitizeDataBeforeFetching(); this.productService .sendRequestToProductDetailVersionAPI( @@ -182,9 +199,11 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { } }); if (this.versions().length !== 0) { - this.onSelectVersion(this.getVersionFromRoute(ignoreRouteVersion) ?? this.versions()[0]); + this.onSelectVersion( + this.getVersionFromRoute(ignoreRouteVersion) ?? this.versions()[0] + ); } - this.isArtifactLoading.set(false); + this.loadingService.hideLoading(LoadingComponentId.PRODUCT_VERSION); }); } @@ -219,43 +238,35 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { } } - sanitizeDataBeforeFetching() { + sanitizeDataBeforeFetching(): void { this.versions.set([]); this.artifacts.set([]); this.selectedArtifact = ''; } - downloadArtifact() { + downloadArtifact(): void { this.onUpdateInstallationCount(); - const newTab = window.open(this.selectedArtifact, '_blank'); - if (newTab) { - newTab.blur(); - } - window.focus(); + window.open(this.selectedArtifact, '_blank'); } - onUpdateInstallationCount() { + onUpdateInstallationCount(): void { this.productService .sendRequestToUpdateInstallationCount( this.productId, - this.routingQueryParamService.getDesignerVersionFromCookie() + this.routingQueryParamService.getDesignerVersionFromSessionStorage() ) .subscribe((data: number) => this.installationCount.emit(data)); } - onUpdateInstallationCountForDesigner() { + onUpdateInstallationCountForDesigner(): void { this.onUpdateInstallationCount(); } - onNavigateToContactPage() { - const newTab = window.open( + onNavigateToContactPage(): void { + window.open( `https://www.axonivy.com/marketplace/contact/?market_solutions=${this.productId}`, '_blank' ); - if (newTab) { - newTab.blur(); - } - window.focus(); } getTrackingEnvironmentBasedOnActionType() { @@ -267,7 +278,7 @@ export class ProductDetailVersionActionComponent implements AfterViewInit { case ProductDetailActionType.CUSTOM_SOLUTION: return MATOMO_TRACKING_ENVIRONMENT.customSolution; default: - return ''; + return ''; } } } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html index 129825a0f..af2b27aac 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.html @@ -1,158 +1,178 @@ -
-
-
-
-
- < - - {{ 'common.product.detail.backToMainPage' | translate }} - -
-
-
-
-
-
- -
-

{{ - productDetail().names - | multilingualism: languageService.selectedLanguage() - }} -

+
+
+ +
+
+
+
+
+ < + + {{ 'common.product.detail.backToMainPage' | translate }} +
+
+ @if (!(productDetail() | emptyProductDetailPipe)) {
-
- -
- @if(productDetailActionType() !== ProductDetailActionType.CUSTOM_SOLUTION) { - - } + class="version-gap d-flex flex-column flex-xl-row justify-content-between">
-

- {{ 'common.product.detail.type' | translate }} -

-

- -

-

- {{ productDetail().type | productType | translate }} -

+ class="connector-title-container d-flex flex-column module-gap"> +
+
+ +
+

+ {{ + productDetail().names + | multilingualism: languageService.selectedLanguage() + }} +

+
+ +
+
+ +
+ @if ( + productDetailActionType() !== + ProductDetailActionType.CUSTOM_SOLUTION + ) { + + } +
+

+ {{ 'common.product.detail.type' | translate }} +

+

+ +

+

+ {{ productDetail().type | productType | translate }} +

+
+
+ +
-
- - + }
-
-
-
- @if (displayedTabsSignal().length > 0) { -
- -
- -
-
-
-
- - -
+
+ +
+ @if (displayedTabsSignal().length > 0) { +
+ +
+ +
+
+
+
+ +
- +
- -
- + show: isDropdownOpen() + }"> + +
-
-
+
@for (displayedTab of displayedTabsSignal(); track $index) {
[id]="displayedTab.value" role="tabpanel" [attr.aria-labelledby]="displayedTab.value + '-tab'"> - @if (displayedTab.value === 'dependency') { + @if (displayedTab.value === 'dependency' && productDetail().productModuleContent) { - + [selectedVersion]=" + selectedVersion + "> } @else { - }
} -
- } -
+
+ } +
-
- + +
+ +
-
-
-
- @if (productDetail() && productFeedbackService.totalElements() > 0) { - - } @else { -
-
- Message Star -

- - {{ productDetailService.noFeedbackLabel() | translate }} - -
- - {{ 'common.feedback.noFeedbackSecondLabel' | translate }} - -

- -
+
+ + @if (!(productDetail() | emptyProductDetailPipe)) { +
+ @if (productDetail() && productFeedbackService.totalElements() > 0) { + + } @else { +
+
+ Message Star +

+ + {{ productDetailService.noFeedbackLabel() | translate }} + +
+ + {{ 'common.feedback.noFeedbackSecondLabel' | translate }} + +

+ +
+
+ }
} -
diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.spec.ts index 1587fc146..749209234 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.spec.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.spec.ts @@ -20,7 +20,8 @@ import { MOCK_PRODUCT_DETAIL, MOCK_CRON_JOB_PRODUCT_DETAIL, MOCK_PRODUCT_MODULE_CONTENT, - MOCK_PRODUCTS + MOCK_PRODUCTS, + MOCK_FEEDBACK_API_RESPONSE } from '../../../shared/mocks/mock-data'; import { ProductService } from '../product.service'; import { ProductDetailComponent } from './product-detail.component'; @@ -31,6 +32,13 @@ import { ProductDetailActionType } from '../../../shared/enums/product-detail-ac import { LanguageService } from '../../../core/services/language/language.service'; import { Language } from '../../../shared/enums/language.enum'; import { MatomoTestingModule } from 'ngx-matomo-client/testing'; +import { AuthService } from '../../../auth/auth.service'; +import { AppModalService } from '../../../shared/services/app-modal.service'; +import { ProductFeedbackService } from './product-detail-feedback/product-feedbacks-panel/product-feedback.service'; +import { ProductStarRatingService } from './product-detail-feedback/product-star-rating-panel/product-star-rating.service'; +import { FeedbackApiResponse } from '../../../shared/models/apis/feedback-response.model'; +import { StarRatingCounting } from '../../../shared/models/star-rating-counting.model'; +import { Feedback } from '../../../shared/models/feedback.model'; const products = MOCK_PRODUCTS._embedded.products; declare const viewport: Viewport; @@ -41,16 +49,38 @@ describe('ProductDetailComponent', () => { let routingQueryParamService: jasmine.SpyObj; let languageService: jasmine.SpyObj; let titleService: Title; + let mockProductFeedbackService: jasmine.SpyObj; + let mockProductStarRatingService: jasmine.SpyObj; + let mockAuthService: jasmine.SpyObj; + let mockAppModalService: jasmine.SpyObj; beforeEach(async () => { const routingQueryParamServiceSpy = jasmine.createSpyObj( 'RoutingQueryParamService', - ['getDesignerVersionFromCookie', 'isDesignerEnv'] + ['getDesignerVersionFromSessionStorage', 'isDesignerEnv'] ); - const languageServiceSpy = jasmine.createSpyObj( - 'LanguageService', - ['selectedLanguage'] + const languageServiceSpy = jasmine.createSpyObj('LanguageService', [ + 'selectedLanguage' + ]); + + mockProductFeedbackService = jasmine.createSpyObj( + 'ProductFeedbackService', + [ + 'getInitFeedbacksObservable', + 'findProductFeedbacksByCriteria', + 'handleFeedbackApiResponse', + 'findProductFeedbackOfUser', + 'totalElements' + ] + ); + mockAuthService = jasmine.createSpyObj('AuthService', ['getToken']); + mockAppModalService = jasmine.createSpyObj('AppModalService', [ + 'openAddFeedbackDialog' + ]); + mockProductStarRatingService = jasmine.createSpyObj( + 'ProductStarRatingService', + ['getRatingObservable', 'starRatings', 'totalComments', 'reviewNumber'] ); await TestBed.configureTestingModule({ @@ -61,15 +91,24 @@ describe('ProductDetailComponent', () => { MatomoTestingModule.forRoot() ], providers: [ + ProductStarRatingService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), + { + provide: ProductStarRatingService, + useValue: mockProductStarRatingService + }, + { + provide: ProductFeedbackService, + useValue: mockProductFeedbackService + }, + { provide: AuthService, useValue: mockAuthService }, + { provide: AppModalService, useValue: mockAppModalService }, { provide: ActivatedRoute, useValue: { - snapshot: { - params: { id: products[0].id }, - queryParams: { type: TypeOption.CONNECTORS } - }, + snapshot: { params: { id: products[0].id } }, + queryParams: of({ type: TypeOption.CONNECTORS }), fragment: of('description') } }, @@ -100,6 +139,20 @@ describe('ProductDetailComponent', () => { ) as jasmine.SpyObj; titleService = TestBed.inject(Title); + mockProductFeedbackService.getInitFeedbacksObservable.and.returnValue( + of([MOCK_FEEDBACK_API_RESPONSE] as any as FeedbackApiResponse) + ); + + mockProductFeedbackService.findProductFeedbackOfUser.and.returnValue( + of({} as any as Feedback) + ); + mockAppModalService.openAddFeedbackDialog.and.returnValue( + Promise.resolve() + ); + mockAuthService.getToken.and.returnValue('token'); + mockProductStarRatingService.getRatingObservable.and.returnValue( + of([] as any as StarRatingCounting[]) + ); }); beforeEach(() => { @@ -115,9 +168,7 @@ describe('ProductDetailComponent', () => { }); it('should have title like the name DE', () => { - languageService.selectedLanguage.and.returnValue( - Language.DE - ); + languageService.selectedLanguage.and.returnValue(Language.DE); component.updateWebBrowserTitle(); fixture.detectChanges(); @@ -130,10 +181,10 @@ describe('ProductDetailComponent', () => { expect(component.selectedVersion).toEqual('Version 10.0.0'); }); - it('should get corresponding version from cookie', () => { + it('should get corresponding version from session strorage', () => { const targetVersion = '1.0'; const productId = 'Portal'; - routingQueryParamService.getDesignerVersionFromCookie.and.returnValue( + routingQueryParamService.getDesignerVersionFromSessionStorage.and.returnValue( targetVersion ); component.getProductById(productId, false).subscribe(productDetail => { @@ -193,8 +244,7 @@ describe('ProductDetailComponent', () => { fixture.detectChanges(); const description = fixture.debugElement.query(By.css('#description')); expect(description).toBeFalsy(); - } - ) + }); it('should return true for description when in EN language it is not null and not undefined and not empty', () => { const mockContent: ProductModuleContent = { @@ -204,9 +254,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('description')).toBeTrue(); @@ -220,9 +268,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.DE; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('description')).toBeTrue(); @@ -236,9 +282,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.DE; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('description')).toBeTrue(); @@ -247,14 +291,12 @@ describe('ProductDetailComponent', () => { it('should return true for description when in DE language it is undefined but in EN language it has value', () => { const mockContent: ProductModuleContent = { ...MOCK_PRODUCT_MODULE_CONTENT, - description: { en: 'Test description'} + description: { en: 'Test description' } }; const selectedLanguage = Language.DE; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('description')).toBeTrue(); @@ -286,9 +328,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('description')).toBeFalse(); @@ -297,14 +337,12 @@ describe('ProductDetailComponent', () => { it('should return false for description when in EN language it is undefined', () => { const mockContent: ProductModuleContent = { ...MOCK_PRODUCT_MODULE_CONTENT, - description: { de: "Test description" } + description: { de: 'Test description' } }; const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('description')).toBeFalse(); @@ -318,9 +356,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('description')).toBeFalse(); @@ -334,9 +370,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('description')).toBeFalse(); @@ -350,9 +384,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('setup')).toBeTrue(); @@ -366,9 +398,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.DE; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('setup')).toBeTrue(); @@ -382,9 +412,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.DE; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('setup')).toBeTrue(); @@ -393,14 +421,12 @@ describe('ProductDetailComponent', () => { it('should return true for setup when in DE language it is undefined but in EN language it has value', () => { const mockContent: ProductModuleContent = { ...MOCK_PRODUCT_MODULE_CONTENT, - setup: { en: 'Test setup'} + setup: { en: 'Test setup' } }; const selectedLanguage = Language.DE; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('setup')).toBeTrue(); @@ -416,14 +442,12 @@ describe('ProductDetailComponent', () => { it('should return false for setup when in EN language it is an empty string', () => { const mockContent: ProductModuleContent = { ...MOCK_PRODUCT_MODULE_CONTENT, - setup: { en: '', de: "Test setup" } + setup: { en: '', de: 'Test setup' } }; const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('setup')).toBeFalse(); @@ -432,14 +456,12 @@ describe('ProductDetailComponent', () => { it('should return false for setup when in EN language it is undefined', () => { const mockContent: ProductModuleContent = { ...MOCK_PRODUCT_MODULE_CONTENT, - setup: { de: "Test setup" } + setup: { de: 'Test setup' } }; const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('setup')).toBeFalse(); @@ -453,9 +475,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('setup')).toBeFalse(); @@ -469,9 +489,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('setup')).toBeFalse(); @@ -485,9 +503,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('demo')).toBeTrue(); @@ -501,9 +517,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.DE; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('demo')).toBeTrue(); @@ -517,9 +531,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.DE; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('demo')).toBeTrue(); @@ -528,14 +540,12 @@ describe('ProductDetailComponent', () => { it('should return true for demo when in DE language it is undefined but in EN language it has value', () => { const mockContent: ProductModuleContent = { ...MOCK_PRODUCT_MODULE_CONTENT, - demo: { en: 'Test demo'} + demo: { en: 'Test demo' } }; const selectedLanguage = Language.DE; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('demo')).toBeTrue(); @@ -556,9 +566,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('demo')).toBeFalse(); @@ -567,14 +575,12 @@ describe('ProductDetailComponent', () => { it('should return false for demo when in EN language it is undefined', () => { const mockContent: ProductModuleContent = { ...MOCK_PRODUCT_MODULE_CONTENT, - demo: { de: "Test demo" } + demo: { de: 'Test demo' } }; const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('demo')).toBeFalse(); @@ -588,9 +594,7 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('demo')).toBeFalse(); @@ -604,15 +608,12 @@ describe('ProductDetailComponent', () => { const selectedLanguage = Language.EN; - languageService.selectedLanguage.and.returnValue( - selectedLanguage - ); + languageService.selectedLanguage.and.returnValue(selectedLanguage); component.productModuleContent.set(mockContent); expect(component.getContent('demo')).toBeFalse(); }); - it('should display dropdown horizontally on small viewport', () => { viewport.set(540); const tabGroup = fixture.debugElement.query(By.css('.row-tab')); @@ -663,9 +664,9 @@ describe('ProductDetailComponent', () => { expect(infoTab).toBeTruthy(); }); - it('should call checkMediaSize on ngAfterViewInit', fakeAsync(() => { + it('should call checkMediaSize on ngOnInit', fakeAsync(() => { spyOn(component, 'checkMediaSize'); - component.ngAfterViewInit(); + component.ngOnInit(); tick(); expect(component.checkMediaSize).toHaveBeenCalled(); })); @@ -737,7 +738,7 @@ describe('ProductDetailComponent', () => { it('should return DESIGNER_ENV as acction type in Designer Env', () => { routingQueryParamService.isDesignerEnv.and.returnValue(true); - component.updateProductDetailActionType({ sourceUrl: 'some-url'} as any); + component.updateProductDetailActionType({ sourceUrl: 'some-url' } as any); expect(component.productDetailActionType()).toBe( ProductDetailActionType.DESIGNER_ENV ); @@ -756,7 +757,6 @@ describe('ProductDetailComponent', () => { By.css('#app-product-installation-count-action') ); expect(installationCount).toBeFalsy(); - }); it('should return STANDARD as acction type when when productDetail.sourceUrl is defined', () => { @@ -771,7 +771,7 @@ describe('ProductDetailComponent', () => { it('displayed tabs array should have size 0 if product module content description, setup, demo, dependcy are all empty', () => { const mockContent: ProductModuleContent = { - ...MOCK_PRODUCT_MODULE_CONTENT, + ...MOCK_PRODUCT_MODULE_CONTENT }; component.productModuleContent.set(mockContent); @@ -780,14 +780,20 @@ describe('ProductDetailComponent', () => { it('should hide tab and tab content when all tabs have no content', () => { const mockContent: ProductModuleContent = { - ...MOCK_PRODUCT_MODULE_CONTENT, + ...MOCK_PRODUCT_MODULE_CONTENT }; component.productModuleContent.set(mockContent); const tabGroup = fixture.debugElement.query(By.css('.tab-group')); const tabs = tabGroup.query(By.css('.row-tab d-none d-xl-block col-12')); - const dropdown = tabGroup.query(By.css('.dropdown-tab d-block d-xl-none d-flex flex-row justify-content-center align-items-center w-100')); - const tabContent = tabGroup.query(By.css('.tab-content col-12 default-cursor')); + const dropdown = tabGroup.query( + By.css( + '.dropdown-tab d-block d-xl-none d-flex flex-row justify-content-center align-items-center w-100' + ) + ); + const tabContent = tabGroup.query( + By.css('.tab-content col-12 default-cursor') + ); expect(tabs).toBeFalsy(); expect(dropdown).toBeFalsy(); @@ -795,17 +801,48 @@ describe('ProductDetailComponent', () => { }); it('should generate right text for the rate connector', () => { - const rateConnector = fixture.debugElement.query(By.css('.rate-connector-btn')); - expect(rateConnector.childNodes[0].nativeNode.textContent).toContain("common.feedback.rateFeedbackForConnectorBtnLabel"); + const rateConnector = fixture.debugElement.query( + By.css('.rate-connector-btn') + ); + expect(rateConnector.childNodes[0].nativeNode.textContent).toContain( + 'common.feedback.rateFeedbackForConnectorBtnLabel' + ); - const rateConnectorEmptyText = fixture.debugElement.query(By.css('.rate-empty-text')); - expect(rateConnectorEmptyText.childNodes[0].nativeNode.textContent).toContain("common.feedback.noFeedbackForConnectorLabel"); + const rateConnectorEmptyText = fixture.debugElement.query( + By.css('.rate-empty-text') + ); + expect( + rateConnectorEmptyText.childNodes[0].nativeNode.textContent + ).toContain('common.feedback.noFeedbackForConnectorLabel'); component.route.snapshot.params['id'] = 'cronjob'; - spyOn(component, 'getProductById').and.returnValue(of(MOCK_CRON_JOB_PRODUCT_DETAIL)); + spyOn(component, 'getProductById').and.returnValue( + of(MOCK_CRON_JOB_PRODUCT_DETAIL) + ); component.ngOnInit(); fixture.detectChanges(); - expect(rateConnector.childNodes[0].nativeNode.textContent).toContain("common.feedback.rateFeedbackForUtilityBtnLabel"); - expect(rateConnectorEmptyText.childNodes[0].nativeNode.textContent).toContain("common.feedback.noFeedbackForUtilityLabel"); + expect(rateConnector.childNodes[0].nativeNode.textContent).toContain( + 'common.feedback.rateFeedbackForUtilityBtnLabel' + ); + expect( + rateConnectorEmptyText.childNodes[0].nativeNode.textContent + ).toContain('common.feedback.noFeedbackForUtilityLabel'); + }); + + it('maven tab should not display when product module content is missing', () => { + const event = { value: 'dependency' }; + component.onTabChange(event.value); + fixture.detectChanges(); + let mavenTab = fixture.debugElement.query( + By.css('app-product-detail-maven-content') + ); + + expect(mavenTab).toBeTruthy(); + component.productModuleContent.set({} as any as ProductModuleContent); + fixture.detectChanges(); + mavenTab = fixture.debugElement.query( + By.css('app-product-detail-maven-content') + ); + expect(mavenTab).toBeFalsy(); }); }); diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts index 6daf53420..36c65f9b6 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.component.ts @@ -13,7 +13,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { MarkdownModule, MarkdownService } from 'ngx-markdown'; -import { map, Observable } from 'rxjs'; +import { forkJoin, map, Observable } from 'rxjs'; import { AuthService } from '../../../auth/auth.service'; import { LanguageService } from '../../../core/services/language/language.service'; import { ThemeService } from '../../../core/services/theme/theme.service'; @@ -22,14 +22,15 @@ import { DEFAULT_IMAGE_URL, DEFAULT_VENDOR_IMAGE, DEFAULT_VENDOR_IMAGE_BLACK, - PRODUCT_DETAIL_TABS, RATING_LABELS_BY_TYPE, SHOW_DEV_VERSION, + PRODUCT_DETAIL_TABS, + RATING_LABELS_BY_TYPE, + SHOW_DEV_VERSION, VERSION } from '../../../shared/constants/common.constant'; import { ItemDropdown } from '../../../shared/models/item-dropdown.model'; import { ProductDetail } from '../../../shared/models/product-detail.model'; import { ProductModuleContent } from '../../../shared/models/product-module-content.model'; import { ProductTypeIconPipe } from '../../../shared/pipes/icon.pipe'; -import { MissingReadmeContentPipe } from '../../../shared/pipes/missing-readme-content.pipe'; import { MultilingualismPipe } from '../../../shared/pipes/multilingualism.pipe'; import { ProductTypePipe } from '../../../shared/pipes/product-type.pipe'; import { AppModalService } from '../../../shared/services/app-modal.service'; @@ -51,6 +52,10 @@ import { CookieService } from 'ngx-cookie-service'; import { ROUTER } from '../../../shared/constants/router.constant'; import { Title } from '@angular/platform-browser'; import { API_URI } from '../../../shared/constants/api.constant'; +import { EmptyProductDetailPipe } from '../../../shared/pipes/empty-product-detail.pipe'; +import { LoadingSpinnerComponent } from '../../../shared/components/loading-spinner/loading-spinner.component'; +import { LoadingComponentId } from '../../../shared/enums/loading-component-id'; +import { LoadingService } from '../../../core/services/loading/loading.service'; export interface DetailTab { activeClass: string; @@ -78,9 +83,10 @@ const DEFAULT_ACTIVE_TAB = 'description'; ProductDetailFeedbackComponent, ProductInstallationCountActionComponent, ProductTypeIconPipe, - MissingReadmeContentPipe, CommonDropdownComponent, - NgOptimizedImage + NgOptimizedImage, + EmptyProductDetailPipe, + LoadingSpinnerComponent ], providers: [ProductService, MarkdownService], templateUrl: './product-detail.component.html', @@ -100,14 +106,16 @@ export class ProductDetailComponent { elementRef = inject(ElementRef); cookieService = inject(CookieService); routingQueryParamService = inject(RoutingQueryParamService); + loadingService = inject(LoadingService); - resizeObserver: ResizeObserver; + protected LoadingComponentId = LoadingComponentId; + protected ProductDetailActionType = ProductDetailActionType; + resizeObserver: ResizeObserver; productDetail: WritableSignal = signal({} as ProductDetail); productModuleContent: WritableSignal = signal( {} as ProductModuleContent ); - protected ProductDetailActionType = ProductDetailActionType; productDetailActionType = signal(ProductDetailActionType.STANDARD); detailTabs = PRODUCT_DETAIL_TABS; activeTab = ''; @@ -123,6 +131,7 @@ export class ProductDetailComponent { isMobileMode = signal(false); installationCount = 0; logoUrl = DEFAULT_IMAGE_URL; + @HostListener('window:popstate', ['$event']) onPopState() { this.activeTab = window.location.hash.split('#tab-')[1]; @@ -145,51 +154,86 @@ export class ProductDetailComponent { queryParamsHandling: 'merge', replaceUrl: true }); - const productId = this.route.snapshot.params[ROUTER.ID]; this.productDetailService.productId.set(productId); if (productId) { - const isShowDevVersion = CommonUtils.getCookieValue(this.cookieService, SHOW_DEV_VERSION, false); - this.getProductById(productId, isShowDevVersion).subscribe(productDetail => { - this.productDetail.set(productDetail); - this.productModuleContent.set(productDetail.productModuleContent); - this.metaProductJsonUrl = productDetail.metaProductJsonUrl; - this.productDetailService.productNames.set(productDetail.names); - this.productDetailService.productLogoUrl.set(productDetail.logoUrl); - this.installationCount = productDetail.installationCount; - this.handleProductContentVersion(); - this.updateProductDetailActionType(productDetail); - this.logoUrl = productDetail.logoUrl; - this.updateWebBrowserTitle(); - const ratingLabels = RATING_LABELS_BY_TYPE.find(button => button.type === productDetail.type); - if (ratingLabels !== undefined) { - this.productDetailService.ratingBtnLabel.set(ratingLabels.btnLabel); - this.productDetailService.noFeedbackLabel.set(ratingLabels.noFeedbackLabel); - } + this.loadingService.showLoading(LoadingComponentId.DETAIL_PAGE); + forkJoin({ + productDetail: this.getProductDetailObservable(productId), + productFeedBack: + this.productFeedbackService.getInitFeedbacksObservable(), + rating: this.productStarRatingService.getRatingObservable(productId), + userFeedback: this.productFeedbackService.findProductFeedbackOfUser() + }).subscribe(res => { + this.handleProductDetail(res.productDetail); + this.productFeedbackService.handleFeedbackApiResponse( + res.productFeedBack + ); + this.updateDropdownSelection(); + this.checkMediaSize(); + this.route.queryParams.subscribe(params => { + this.showPopup = params['showPopup'] === 'true'; + if (this.showPopup && this.authService.getToken()) { + this.appModalService + .openAddFeedbackDialog() + .then(() => this.removeQueryParam()) + .catch(() => this.removeQueryParam()); + } + }); + this.loadingService.hideLoading(LoadingComponentId.DETAIL_PAGE); }); + } + } + + getProductDetailObservable(productId: string): Observable { + const isShowDevVersion = CommonUtils.getCookieValue( + this.cookieService, + SHOW_DEV_VERSION, + false + ); + return this.getProductById(productId, isShowDevVersion); + } - this.productFeedbackService.initFeedbacks(); - this.productStarRatingService.fetchData(); + handleProductDetail(productDetail: ProductDetail): void { + this.productDetail.set(productDetail); + this.productModuleContent.set(productDetail.productModuleContent); + this.metaProductJsonUrl = productDetail.metaProductJsonUrl; + this.productDetailService.productNames.set(productDetail.names); + this.productDetailService.productLogoUrl.set(productDetail.logoUrl); + this.installationCount = productDetail.installationCount; + this.handleProductContentVersion(); + this.updateProductDetailActionType(productDetail); + this.logoUrl = productDetail.logoUrl; + this.updateWebBrowserTitle(); + const ratingLabels = RATING_LABELS_BY_TYPE.find( + button => button.type === productDetail.type + ); + if (ratingLabels !== undefined) { + this.productDetailService.ratingBtnLabel.set(ratingLabels.btnLabel); + this.productDetailService.noFeedbackLabel.set( + ratingLabels.noFeedbackLabel + ); } - this.updateDropdownSelection(); } - onClickingBackToHomepageButton() { + onClickingBackToHomepageButton(): void { this.router.navigate([API_URI.APP]); } - onLogoError() { + onLogoError(): void { this.logoUrl = DEFAULT_IMAGE_URL; } - handleProductContentVersion() { + handleProductContentVersion(): void { if (this.isEmptyProductContent()) { return; } - this.selectedVersion = VERSION.displayPrefix.concat(this.productModuleContent().version); + this.selectedVersion = VERSION.displayPrefix.concat( + this.productModuleContent().version + ); } - updateProductDetailActionType(productDetail: ProductDetail) { + updateProductDetailActionType(productDetail: ProductDetail): void { if (productDetail?.sourceUrl === undefined) { this.productDetailActionType.set(ProductDetailActionType.CUSTOM_SOLUTION); } else if (this.routingQueryParamService.isDesignerEnv()) { @@ -199,42 +243,34 @@ export class ProductDetailComponent { } } - scrollToTop() { + scrollToTop(): void { window.scrollTo({ left: 0, top: 0, behavior: 'instant' }); } - getProductById(productId: string, isShowDevVersion: boolean): Observable { - const targetVersion = this.routingQueryParamService.getDesignerVersionFromCookie(); + getProductById( + productId: string, + isShowDevVersion: boolean + ): Observable { + const targetVersion = + this.routingQueryParamService.getDesignerVersionFromSessionStorage(); let productDetail$: Observable; if (!targetVersion) { - productDetail$ = this.productService.getProductDetails(productId, isShowDevVersion); - } - else { - productDetail$ = this.productService.getBestMatchProductDetailsWithVersion( + productDetail$ = this.productService.getProductDetails( productId, - targetVersion + isShowDevVersion ); + } else { + productDetail$ = + this.productService.getBestMatchProductDetailsWithVersion( + productId, + targetVersion + ); } return productDetail$.pipe( map((response: ProductDetail) => this.setDefaultVendorImage(response)) ); } - ngAfterViewInit(): void { - this.checkMediaSize(); - this.productFeedbackService.findProductFeedbackOfUser().subscribe(() => { - this.route.queryParams.subscribe(params => { - this.showPopup = params['showPopup'] === 'true'; - if (this.showPopup && this.authService.getToken()) { - this.appModalService - .openAddFeedbackDialog() - .then(() => this.removeQueryParam()) - .catch(() => this.removeQueryParam()); - } - }); - }); - } - getContent(value: string): boolean { const content = this.productModuleContent(); @@ -263,7 +299,6 @@ export class ProductDetailComponent { ), dependency: content.isDependency }; - return conditions[value] ?? false; } @@ -272,7 +307,7 @@ export class ProductDetailComponent { return !content || Object.keys(content).length === 0; } - loadDetailTabs(selectedVersion: string) { + loadDetailTabs(selectedVersion: string): void { let version = selectedVersion || this.productDetail().newestReleaseVersion; version = version.replace(VERSION.displayPrefix, ''); this.productService @@ -284,17 +319,17 @@ export class ProductDetailComponent { }); } - onTabChange(event: string) { + onTabChange(event: string): void { this.setActiveTab(event); this.isTabDropdownShown.update(value => !value); this.onTabDropdownShown(); } - getSelectedTabLabel() { + getSelectedTabLabel(): string { return CommonUtils.getLabel(this.activeTab, PRODUCT_DETAIL_TABS); } - updateDropdownSelection() { + updateDropdownSelection(): void { const dropdown = document.getElementById( 'tab-group-dropdown' ) as HTMLSelectElement; @@ -303,7 +338,7 @@ export class ProductDetailComponent { } } - setActiveTab(tab: string) { + setActiveTab(tab: string): void { this.activeTab = tab; const hash = '#tab-' + tab; const path = window.location.pathname; @@ -322,16 +357,16 @@ export class ProductDetailComponent { localStorage.setItem(STORAGE_ITEM, JSON.stringify(savedTab)); } - onShowInfoContent() { + onShowInfoContent(): void { this.isDropdownOpen.update(value => !value); } - onTabDropdownShown() { + onTabDropdownShown(): void { this.isTabDropdownShown.set(!this.isTabDropdownShown()); } @HostListener('document:click', ['$event']) - handleClickOutside(event: MouseEvent) { + handleClickOutside(event: MouseEvent): void { const formSelect = this.elementRef.nativeElement.querySelector('.form-select'); @@ -345,11 +380,11 @@ export class ProductDetailComponent { } @HostListener('window:resize', ['$event']) - onResize() { + onResize(): void { this.checkMediaSize(); } - checkMediaSize() { + checkMediaSize(): void { const mediaQuery = window.matchMedia('(max-width: 767px)'); if (mediaQuery.matches) { this.isMobileMode.set(true); @@ -358,7 +393,7 @@ export class ProductDetailComponent { } } - onClickRateBtn() { + onClickRateBtn(): void { const productId = this.productDetailService.productId(); if (this.authService.getToken()) { this.appModalService.openAddFeedbackDialog(); @@ -367,7 +402,7 @@ export class ProductDetailComponent { } } - receiveInstallationCountData(data: number) { + receiveInstallationCountData(data: number): void { this.installationCount = data; } @@ -380,12 +415,13 @@ export class ProductDetailComponent { updateWebBrowserTitle() { if (this.productDetail().names !== undefined) { - const title = this.productDetail().names[this.languageService.selectedLanguage()]; + const title = + this.productDetail().names[this.languageService.selectedLanguage()]; this.titleService.setTitle(title); } } - getDisplayedTabsSignal() { + getDisplayedTabsSignal(): ItemDropdown[] { this.updateWebBrowserTitle(); const displayedTabs: ItemDropdown[] = []; for (const detailTab of this.detailTabs) { @@ -406,15 +442,13 @@ export class ProductDetailComponent { private setDefaultVendorImage(productDetail: ProductDetail): ProductDetail { const { vendorImage, vendorImageDarkMode } = productDetail; - if (!(productDetail.vendorImage || productDetail.vendorImageDarkMode )) { + if (!(productDetail.vendorImage || productDetail.vendorImageDarkMode)) { productDetail.vendorImage = DEFAULT_VENDOR_IMAGE_BLACK; productDetail.vendorImageDarkMode = DEFAULT_VENDOR_IMAGE; - } - else { + } else { productDetail.vendorImage = vendorImage || vendorImageDarkMode; productDetail.vendorImageDarkMode = vendorImageDarkMode || vendorImage; } - return productDetail; } } diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-detail.service.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-detail.service.spec.ts index aae29c669..0feb9578c 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-detail.service.spec.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-detail.service.spec.ts @@ -1,47 +1,80 @@ import { TestBed } from '@angular/core/testing'; -import { ProductDetailService } from './product-detail.service'; -import { DisplayValue } from '../../../shared/models/display-value.model'; -import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { environment } from '../../../../environments/environment'; +import { ProductSecurityInfo } from '../../../shared/models/product-security-info-model'; +import { SecurityMonitorService } from '../../security-monitor/security-monitor.service'; +import { SecurityMonitorComponent } from '../../security-monitor/security-monitor.component'; -describe('ProductDetailService', () => { - let service: ProductDetailService; +describe('SecurityMonitorService', () => { + let service: SecurityMonitorService; let httpMock: HttpTestingController; - let httpClient: jasmine.SpyObj; + + const mockApiUrl = environment.apiUrl + '/api/security-monitor'; beforeEach(() => { TestBed.configureTestingModule({ - providers: [ProductDetailService, + imports: [SecurityMonitorComponent], + providers: [ + SecurityMonitorService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), - { provide: HttpClient, useValue: httpClient } - ] + ], }); - service = TestBed.inject(ProductDetailService); + + service = TestBed.inject(SecurityMonitorService); httpMock = TestBed.inject(HttpTestingController); }); + afterEach(() => { + httpMock.verify(); + }); + it('should be created', () => { expect(service).toBeTruthy(); }); - it('should have a default productId signal', () => { - expect(service.productId()).toBe(''); - }); + it('should call API with token and return security details', () => { + const mockToken = 'valid-token'; + const mockResponse: ProductSecurityInfo[] = [ + { + repoName: 'repo1', + visibility: 'public', + archived: false, + dependabot: { status: 'ENABLED', alerts: {} }, + codeScanning: { status: 'ENABLED', alerts: {} }, + secretScanning: { status: 'ENABLED', numberOfAlerts: 0 }, + branchProtectionEnabled: true, + lastCommitSHA: '12345', + lastCommitDate: '', + }, + ]; - it('should update productId signal', () => { - const newProductId = '12345'; - service.productId.set(newProductId); - expect(service.productId()).toBe(newProductId); - }); + service.getSecurityDetails(mockToken).subscribe((data) => { + expect(data).toEqual(mockResponse); + }); + + const req = httpMock.expectOne(mockApiUrl); + expect(req.request.method).toBe('GET'); + expect(req.request.headers.get('Authorization')).toBe(`Bearer ${mockToken}`); - it('should have a default productNames signal', () => { - expect(service.productNames()).toEqual({} as DisplayValue); + req.flush(mockResponse); }); - it('should update productNames signal', () => { - const newProductNames: DisplayValue = { en: 'en', de: 'de' }; - service.productNames.set(newProductNames); - expect(service.productNames()).toEqual(newProductNames); + it('should handle error response gracefully', () => { + const mockToken = 'invalid-token'; + + service.getSecurityDetails(mockToken).subscribe({ + next: () => fail('Expected an error, but received data.'), + error: (error) => { + expect(error.status).toBe(401); + }, + }); + + const req = httpMock.expectOne(mockApiUrl); + expect(req.request.method).toBe('GET'); + expect(req.request.headers.get('Authorization')).toBe(`Bearer ${mockToken}`); + + req.flush({ message: 'Unauthorized' }, { status: 401, statusText: 'Unauthorized' }); }); -}); \ No newline at end of file +}); diff --git a/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.spec.ts b/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.spec.ts index ebe2f7f1a..ab494adef 100644 --- a/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.spec.ts +++ b/marketplace-ui/src/app/modules/product/product-detail/product-star-rating-number/product-star-rating-number.component.spec.ts @@ -69,9 +69,11 @@ describe('ProductStarRatingNumberComponent', () => { const reviewNumber = fixture.debugElement.query(By.css('.total-rating-number')).nativeElement; const totalComments = fixture.debugElement.query(By.css('h4.d-inline-block')).nativeElement; const starRatingComponent = fixture.debugElement.query(By.directive(StarRatingComponent)); + const reviewLabel = fixture.debugElement.query(By.css('.text-secondary.review-label-detail-page')).nativeElement; expect(reviewNumber.textContent).toContain('4.5'); expect(totalComments.textContent).toContain('(10)'); + expect(reviewLabel.textContent).toContain('common.feedback.reviewLabel'); expect(starRatingComponent).toBeTruthy(); }); }); diff --git a/marketplace-ui/src/app/modules/product/product.component.html b/marketplace-ui/src/app/modules/product/product.component.html index 17e919271..a0ea7844c 100644 --- a/marketplace-ui/src/app/modules/product/product.component.html +++ b/marketplace-ui/src/app/modules/product/product.component.html @@ -47,6 +47,6 @@

} - +
diff --git a/marketplace-ui/src/app/modules/product/product.component.spec.ts b/marketplace-ui/src/app/modules/product/product.component.spec.ts index 31d4414dd..6f5d6841f 100644 --- a/marketplace-ui/src/app/modules/product/product.component.spec.ts +++ b/marketplace-ui/src/app/modules/product/product.component.spec.ts @@ -15,7 +15,7 @@ import { ProductComponent } from './product.component'; import { ProductService } from './product.service'; import { MockProductService } from '../../shared/mocks/mock-services'; import { RoutingQueryParamService } from '../../shared/services/routing.query.param.service'; -import { DESIGNER_COOKIE_VARIABLE } from '../../shared/constants/common.constant'; +import { DESIGNER_SESSION_STORAGE_VARIABLE } from '../../shared/constants/common.constant'; import { ItemDropdown } from '../../shared/models/item-dropdown.model'; import { By } from '@angular/platform-browser'; import { Location } from '@angular/common'; @@ -59,8 +59,8 @@ describe('ProductComponent', () => { 'getNavigationStartEvent', 'isDesigner', 'isDesignerEnv', - 'checkCookieForDesignerEnv', - 'checkCookieForDesignerVersion' + 'checkSessionStorageForDesignerEnv', + 'checkSessionStorageForDesignerVersion' ] ); @@ -75,7 +75,7 @@ describe('ProductComponent', () => { provide: ActivatedRoute, useValue: { queryParams: of({ - [DESIGNER_COOKIE_VARIABLE.restClientParamName]: true + [DESIGNER_SESSION_STORAGE_VARIABLE.restClientParamName]: true }) } }, @@ -210,7 +210,7 @@ describe('ProductComponent', () => { it('should set isRESTClient true based on query params and designer environment', () => { component.route.queryParams = of({ - [DESIGNER_COOKIE_VARIABLE.restClientParamName]: 'resultsOnly', + [DESIGNER_SESSION_STORAGE_VARIABLE.restClientParamName]: 'resultsOnly', }); routingQueryParamService.isDesignerEnv.and.returnValue(true); @@ -222,8 +222,8 @@ describe('ProductComponent', () => { it('should not display marketplace introduction in designer', () => { component.route.queryParams = of({ - [DESIGNER_COOKIE_VARIABLE.restClientParamName]: 'resultsOnly', - [DESIGNER_COOKIE_VARIABLE.searchParamName]: 'search' + [DESIGNER_SESSION_STORAGE_VARIABLE.restClientParamName]: 'resultsOnly', + [DESIGNER_SESSION_STORAGE_VARIABLE.searchParamName]: 'search' }); component.isDesignerEnvironment = true; diff --git a/marketplace-ui/src/app/modules/product/product.component.ts b/marketplace-ui/src/app/modules/product/product.component.ts index 46a8eac23..a60e29440 100644 --- a/marketplace-ui/src/app/modules/product/product.component.ts +++ b/marketplace-ui/src/app/modules/product/product.component.ts @@ -31,9 +31,12 @@ import { RoutingQueryParamService } from '../../shared/services/routing.query.pa import { DEFAULT_PAGEABLE, DEFAULT_PAGEABLE_IN_REST_CLIENT, - DESIGNER_COOKIE_VARIABLE + DESIGNER_SESSION_STORAGE_VARIABLE } from '../../shared/constants/common.constant'; import { ItemDropdown } from '../../shared/models/item-dropdown.model'; +import { LoadingSpinnerComponent } from '../../shared/components/loading-spinner/loading-spinner.component'; +import { LoadingService } from '../../core/services/loading/loading.service'; +import { LoadingComponentId } from '../../shared/enums/loading-component-id'; const SEARCH_DEBOUNCE_TIME = 500; @@ -41,6 +44,7 @@ const SEARCH_DEBOUNCE_TIME = 500; selector: 'app-product', standalone: true, imports: [ + LoadingSpinnerComponent, CommonModule, FormsModule, TranslateModule, @@ -52,10 +56,12 @@ const SEARCH_DEBOUNCE_TIME = 500; styleUrl: './product.component.scss' }) export class ProductComponent implements AfterViewInit, OnDestroy { + protected LoadingComponentId = LoadingComponentId; products: WritableSignal = signal([]); productDetail!: ProductDetail; subscriptions: Subscription[] = []; searchTextChanged = new Subject(); + loadingService = inject(LoadingService); criteria: Criteria = { search: '', type: TypeOption.All_TYPES, @@ -80,12 +86,13 @@ export class ProductComponent implements AfterViewInit, OnDestroy { constructor() { this.route.queryParams.subscribe(params => { this.isRESTClient.set( - DESIGNER_COOKIE_VARIABLE.restClientParamName in params && + DESIGNER_SESSION_STORAGE_VARIABLE.restClientParamName in params && this.isDesignerEnvironment ); - if (params[DESIGNER_COOKIE_VARIABLE.searchParamName] != null) { - this.criteria.search = params[DESIGNER_COOKIE_VARIABLE.searchParamName]; + if (params[DESIGNER_SESSION_STORAGE_VARIABLE.searchParamName] != null) { + this.criteria.search = + params[DESIGNER_SESSION_STORAGE_VARIABLE.searchParamName]; } }); @@ -115,7 +122,7 @@ export class ProductComponent implements AfterViewInit, OnDestroy { } viewProductDetail(productId: string, _productTag: string) { - if(this.isRESTClient()) { + if (this.isRESTClient()) { window.location.href = `/${productId}`; } this.router.navigate([`/${productId}`]); diff --git a/marketplace-ui/src/app/modules/product/product.service.spec.ts b/marketplace-ui/src/app/modules/product/product.service.spec.ts index ab17ec697..fddf9522a 100644 --- a/marketplace-ui/src/app/modules/product/product.service.spec.ts +++ b/marketplace-ui/src/app/modules/product/product.service.spec.ts @@ -20,25 +20,19 @@ describe('ProductService', () => { let products = MOCK_PRODUCTS._embedded.products; let service: ProductService; let httpMock: HttpTestingController; - let loadingServiceSpy: jasmine.SpyObj; beforeEach(() => { - const spyLoading = jasmine.createSpyObj('LoadingService', ['show', 'hide']); - TestBed.configureTestingModule({ imports: [], providers: [ ProductService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), - { provide: LoadingService, useValue: spyLoading } + LoadingService ] }); service = TestBed.inject(ProductService); httpMock = TestBed.inject(HttpTestingController); - loadingServiceSpy = TestBed.inject( - LoadingService - ) as jasmine.SpyObj; }); it('should be created', () => { @@ -194,9 +188,6 @@ describe('ProductService', () => { expect(req.request.method).toBe('GET'); req.flush(mockResponse); - - expect(loadingServiceSpy.show).not.toHaveBeenCalled(); - expect(loadingServiceSpy.hide).not.toHaveBeenCalled(); }); it('getProductDetailsWithVersion should return a product detail', () => { diff --git a/marketplace-ui/src/app/modules/product/product.service.ts b/marketplace-ui/src/app/modules/product/product.service.ts index 22ee095b1..aaabb6183 100644 --- a/marketplace-ui/src/app/modules/product/product.service.ts +++ b/marketplace-ui/src/app/modules/product/product.service.ts @@ -7,9 +7,10 @@ import { ProductApiResponse } from '../../shared/models/apis/product-response.mo import { Criteria } from '../../shared/models/criteria.model'; import { ProductDetail } from '../../shared/models/product-detail.model'; import { VersionData } from '../../shared/models/vesion-artifact.model'; -import { SkipLoading } from '../../core/interceptors/api.interceptor'; +import { LoadingComponent } from '../../core/interceptors/api.interceptor'; import { VersionAndUrl } from '../../shared/models/version-and-url'; import { API_URI } from '../../shared/constants/api.constant'; +import { LoadingComponentId } from '../../shared/enums/loading-component-id'; @Injectable() export class ProductService { @@ -17,6 +18,7 @@ export class ProductService { loadingService = inject(LoadingService); findProductsByCriteria(criteria: Criteria): Observable { + this.loadingService.showLoading(LoadingComponentId.LANDING_PAGE); let requestParams = new HttpParams(); let requestURL = API_URI.PRODUCT; if (criteria.nextPageHref) { @@ -35,7 +37,11 @@ export class ProductService { ); } return this.httpClient.get(requestURL, { - params: requestParams + params: requestParams, + context: new HttpContext().set( + LoadingComponent, + LoadingComponentId.LANDING_PAGE + ) }); } @@ -61,9 +67,10 @@ export class ProductService { productId: string, isShowDevVersion: boolean ): Observable { - return this.httpClient.get( - `${API_URI.PRODUCT_DETAILS}/${productId}?isShowDevVersion=${isShowDevVersion}` - ); + return this.httpClient + .get( + `${API_URI.PRODUCT_DETAILS}/${productId}?isShowDevVersion=${isShowDevVersion}` + ); } sendRequestToProductDetailVersionAPI( @@ -75,13 +82,13 @@ export class ProductService { const params = new HttpParams() .append('designerVersion', designerVersion) .append('isShowDevVersion', showDevVersion); - return this.httpClient.get(url, { - params, - context: new HttpContext().set(SkipLoading, true) - }); + return this.httpClient.get(url, { params }); } - sendRequestToUpdateInstallationCount(productId: string, designerVersion: string) { + sendRequestToUpdateInstallationCount( + productId: string, + designerVersion: string + ) { const url = `${API_URI.PRODUCT_MARKETPLACE_DATA}/installation-count/${productId}`; const params = new HttpParams().append('designerVersion', designerVersion); return this.httpClient.put(url, null, { params }); diff --git a/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.html b/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.html new file mode 100644 index 000000000..9c5209a02 --- /dev/null +++ b/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.html @@ -0,0 +1,101 @@ +
+
+

GitHub Repository Security Monitor

+

Keep track of your repositories' security status at a glance.

+
+ @if (isAuthenticated) { +
+

Reload Data

+
+
+ @for (repo of repos; track $index) { +
+
+

{{ repo.repoName }}

+ {{ repo.visibility }} + @if (repo.archived) { + Archived + } +
+
+

🤖Dependabot: + @if (repo.dependabot.status == 'DISABLED') { + Disabled + } + @else if (repo.dependabot.status == 'NO_PERMISSION') { + No permission + } + @else if (hasAlerts(repo.dependabot.alerts)) { + @for (alert of alertKeys(repo.dependabot.alerts); track $index) { + + {{ repo.dependabot.alerts[alert] }} {{ alert }} + + } + } + @else { + No vulnerabilities + } +

+

🖥️Code Scanning: + @if (repo.codeScanning.status == 'DISABLED') { + Disabled + } + @else if (repo.codeScanning.status == 'NO_PERMISSION') { + No permission + } + @else if (hasAlerts(repo.codeScanning.alerts)) { + @for (alert of alertKeys(repo.codeScanning.alerts); track $index) { + + {{ repo.codeScanning.alerts[alert] }} {{ alert }} + + } + } + @else { + No vulnerabilities + } +

+

🔑Secret Scanning: + @if (repo.secretScanning.status == 'DISABLED') { + Disabled + } + @else if (repo.secretScanning.status == 'NO_PERMISSION') { + No permission + } + @else if (repo.secretScanning.numberOfAlerts) { + + {{ repo.secretScanning.numberOfAlerts }} alerts + + } + @else { + No vulnerabilities + } +

+

🚧Branch Protection: + @if (repo.branchProtectionEnabled) { + Enabled + } + @else { + Disabled + } +

+

⏱️Last Commit: {{ formatCommitDate(repo.lastCommitDate) }}

+
+
+ } +
+ } + @else { +
+

Please enter your token to access the security page.

+
+ + + @if (errorMessage) { +
{{ errorMessage }}
+ } +
+
+ } +
\ No newline at end of file diff --git a/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.scss b/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.scss new file mode 100644 index 000000000..dfae28f51 --- /dev/null +++ b/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.scss @@ -0,0 +1,220 @@ +.container { + max-width: 1200px; + margin: 20px auto; + padding: 0 15px; + cursor: default; +} + +.header { + text-align: center; + padding: 20px 0; + color: #333; + + h2 { + font-size: 4rem; + } +} + +.repo-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); + gap: 15px; +} + +.repo-card { + background-color: #fff; + border: 1px solid #ddd; + border-radius: 8px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); + padding: 15px; +} + +.repo-card:hover { + background-color: #f5f5f5; + border-color: #ccc; + box-shadow: 0 4px 10px rgba(0, 0, 0, 0.15); + cursor: default; +} + +.repo-card a:hover { + color: #0056b3; + text-decoration: underline; + cursor: pointer; +} + +.repo-header { + display: flex; + align-items: center; + margin-bottom: 10px; + gap: 5px; + + h3 { + margin: 0; + font-size: 1.6rem; + color: #007acc; + } + + h3:hover { + cursor: pointer; + text-decoration: underline; + } + + .visibility { + font-size: 1.1rem; + padding: 3px 8px; + border-radius: 20px; + border: 1px solid gray; + line-height: 12px; + } + + .archived { + font-size: 1.1rem; + padding: 3px 8px; + border-radius: 20px; + border: 1px solid orange; + line-height: 12px; + color: orange; + } +} + +.repo-info { + margin-top: 15px; + + p { + margin: 8px 0; + font-size: 1.5rem; + color: #555; + min-height: 28px; + } + + span { + font-weight: bold; + } +} + +.badge { + display: inline-block; + padding: 7px 10px; + font-size: 1.3rem; + border-radius: 5px; + color: #fff; + margin-left: 5px; + + &.critical { + background-color: #e63946; + } + + &.high { + background-color: #f4a261; + } + + &.medium, &.warning { + background-color: #f4d35e; + color: #333; + } + + &.low, &.note { + background-color: #90be6d; + } + + &.error { + background-color: #d00000; + } + + &.none, &.no-permission { + background-color: #ccc; + color: #666; + } + + &.active { + background-color: #2a9d8f; + } +} + +/* Styling for inactive or zero values */ +.inactive { + color: #bbb; + font-style: italic; +} + +.token-input-container { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + background-color: #f9f9f9; + border-radius: 8px; + padding: 20px; + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1); +} + +.token-input-container h3 { + font-size: 1.5rem; + margin-bottom: 20px; + color: #333; +} + +.token-input-container span { + margin-bottom: 20px; + font-size: 1rem; + color: #777; +} + +.token-input-container input { + padding: 10px; + font-size: 1.3rem; + margin-bottom: 10px; + width: 350px; + border: 1px solid #ccc; + border-radius: 4px; +} + +.token-input-container button { + padding: 10px 20px; + font-size: 1.3rem; + background-color: #4CAF50; + color: white; + border: none; + border-radius: 4px; + cursor: pointer; + transition: background-color 0.3s ease; + margin-left: 10px; + width: 100px; +} + +.token-input-container button:hover { + background-color: #45a049; +} + +.error-message { + color: #f44336; + font-size: 1.2rem; + width: 100%; +} + +.reload-link { + text-decoration: none; + color: #007bff; + font-weight: 600; + cursor: pointer; + margin-left: 10px; + transition: color 0.3s ease, transform 0.2s ease; +} + +.reload-link:hover { + text-decoration: underline; + color: #0056b3; + transform: scale(1.05); +} + +.reload-link:focus { + outline: 2px solid #0056b3; +} + +.repo-info .icon { + display: inline-block; + width: 2rem; + text-align: center; + margin-right: 8px; + font-size: 1.5rem; +} \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.spec.ts b/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.spec.ts new file mode 100644 index 000000000..cfb5b22d1 --- /dev/null +++ b/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.spec.ts @@ -0,0 +1,142 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { SecurityMonitorComponent } from './security-monitor.component'; +import { SecurityMonitorService } from './security-monitor.service'; +import { of, throwError } from 'rxjs'; +import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { By } from '@angular/platform-browser'; +import { ProductSecurityInfo } from '../../shared/models/product-security-info-model'; +import { HttpErrorResponse } from '@angular/common/http'; +import { TranslateService } from '@ngx-translate/core'; +import { TIME_UNITS } from '../../shared/constants/common.constant'; + +describe('SecurityMonitorComponent', () => { + let component: SecurityMonitorComponent; + let fixture: ComponentFixture; + let securityMonitorService: jasmine.SpyObj; + + beforeEach(async () => { + const spy = jasmine.createSpyObj('SecurityMonitorService', ['getSecurityDetails']); + + await TestBed.configureTestingModule({ + imports: [CommonModule, FormsModule], + providers: [ + { provide: SecurityMonitorService, useValue: spy }, + { provide: TranslateService, useValue: spy } + ], + }).compileComponents(); + + securityMonitorService = TestBed.inject(SecurityMonitorService) as jasmine.SpyObj; + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SecurityMonitorComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create the component', () => { + expect(component).toBeTruthy(); + }); + + it('should show an error message when token is empty and onSubmit is called', () => { + component.token = ''; + component.onSubmit(); + expect(component.errorMessage).toBe('Token is required'); + }); + + it('should call SecurityMonitorService and display repos when token is valid and response is successful', () => { + const mockRepos: ProductSecurityInfo[] = [ + { + repoName: 'repo1', + visibility: 'public', + archived: false, + dependabot: { status: 'ENABLED', alerts: {} }, + codeScanning: { status: 'ENABLED', alerts: {} }, + secretScanning: { status: 'ENABLED', numberOfAlerts: 0 }, + branchProtectionEnabled: true, + lastCommitSHA: '12345', + lastCommitDate: '', + }, + ]; + + securityMonitorService.getSecurityDetails.and.returnValue(of(mockRepos)); + + component.token = 'valid-token'; + component.onSubmit(); + + fixture.detectChanges(); + + expect(securityMonitorService.getSecurityDetails).toHaveBeenCalledWith('valid-token'); + expect(component.repos).toEqual(mockRepos); + expect(component.isAuthenticated).toBeTrue(); + + const repoCards = fixture.debugElement.queryAll(By.css('.repo-card')); + expect(repoCards.length).toBe(mockRepos.length); + expect(repoCards[0].nativeElement.querySelector('h3').textContent).toBe('repo1'); + }); + + it('should handle 401 Unauthorized error correctly', () => { + const mockError = new HttpErrorResponse({ status: 401 }); + + securityMonitorService.getSecurityDetails.and.returnValue(throwError(() => mockError)); + + component.token = 'invalid-token'; + component.onSubmit(); + + fixture.detectChanges(); + + expect(component.errorMessage).toBe('Unauthorized access.'); + }); + + it('should handle generic error correctly', () => { + const mockError = new HttpErrorResponse({ status: 500 }); + + securityMonitorService.getSecurityDetails.and.returnValue(throwError(() => mockError)); + + component.token = 'invalid-token'; + component.onSubmit(); + + fixture.detectChanges(); + + expect(component.errorMessage).toBe('Failed to fetch security data. Check logs for details.'); + }); + + it('should navigate to the correct URL for a repo page', () => { + spyOn(window, 'open'); + component.navigateToRepoPage('example-repo', 'secretScanning'); + expect(window.open).toHaveBeenCalledWith( + 'https://github.com/axonivy-market/example-repo/security/secret-scanning', + '_blank' + ); + + component.navigateToRepoPage('example-repo', 'lastCommit', 'abc123'); + expect(window.open).toHaveBeenCalledWith( + 'https://github.com/axonivy-market/example-repo/commit/abc123', + '_blank' + ); + }); + + it('should handle empty alerts correctly in hasAlerts', () => { + expect(component.hasAlerts({})).toBeFalse(); + expect(component.hasAlerts({ alert1: 1 })).toBeTrue(); + }); + + it('should return correct alert keys from alertKeys', () => { + const alerts = { alert1: 1, alert2: 2 }; + expect(component.alertKeys(alerts)).toEqual(['alert1', 'alert2']); + }); + + it('should return "just now" for dates less than 60 seconds ago', () => { + const recentDate = new Date(new Date().getTime() - 30 * 1000).toISOString(); + const result = component.formatCommitDate(recentDate); + expect(result).toBe('just now'); + }); + + it('should return "1 minute ago" for dates 1 minute ago', () => { + const oneMinuteAgo = new Date(new Date().getTime() - 60 * 1000).toISOString(); + TIME_UNITS[0] = { SECONDS: 60, SINGULAR: 'minute', PLURAL: 'minutes' }; + const result = component.formatCommitDate(oneMinuteAgo); + expect(result).toBe('1 minute ago'); + }); +}); \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.ts b/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.ts new file mode 100644 index 000000000..661708ca0 --- /dev/null +++ b/marketplace-ui/src/app/modules/security-monitor/security-monitor.component.ts @@ -0,0 +1,141 @@ +import { Component, inject, ViewEncapsulation } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { HttpErrorResponse } from '@angular/common/http'; + +import { SecurityMonitorService } from './security-monitor.service'; +import { ProductSecurityInfo } from '../../shared/models/product-security-info-model'; +import { GITHUB_MARKET_ORG_URL, REPO_PAGE_PATHS, SECURITY_MONITOR_MESSAGES, SECURITY_MONITOR_SESSION_KEYS, TIME_UNITS, UNAUTHORIZED } from '../../shared/constants/common.constant'; + +@Component({ + selector: 'app-security-monitor', + standalone: true, + imports: [CommonModule, FormsModule], + templateUrl: './security-monitor.component.html', + styleUrls: ['./security-monitor.component.scss'], + encapsulation: ViewEncapsulation.Emulated, +}) +export class SecurityMonitorComponent { + isAuthenticated = false; + token = ''; + errorMessage = ''; + repos: ProductSecurityInfo[] = []; + + private readonly securityMonitorService = inject(SecurityMonitorService); + + ngOnInit(): void { + this.loadSessionData(); + } + + onSubmit(): void { + this.token = this.token ?? sessionStorage.getItem(SECURITY_MONITOR_SESSION_KEYS.TOKEN) ?? ''; + if (!this.token) { + this.handleMissingToken(); + return; + } + + this.errorMessage = ''; + this.fetchSecurityDetails(); + } + + private loadSessionData(): void { + try { + const sessionData = sessionStorage.getItem(SECURITY_MONITOR_SESSION_KEYS.DATA); + if (sessionData) { + this.repos = JSON.parse(sessionData) as ProductSecurityInfo[]; + this.isAuthenticated = true; + } + } + catch (error) { + this.clearSessionData(); + } + } + + private handleMissingToken(): void { + this.errorMessage = SECURITY_MONITOR_MESSAGES.TOKEN_REQUIRED; + this.isAuthenticated = false; + this.clearSessionData(); + } + + private fetchSecurityDetails(): void { + this.securityMonitorService.getSecurityDetails(this.token).subscribe({ + next: data => this.handleSuccess(data), + error: (err: HttpErrorResponse) => this.handleError(err), + }); + } + + private handleSuccess(data: ProductSecurityInfo[]): void { + this.repos = data; + this.isAuthenticated = true; + sessionStorage.setItem(SECURITY_MONITOR_SESSION_KEYS.TOKEN, this.token); + sessionStorage.setItem(SECURITY_MONITOR_SESSION_KEYS.DATA, JSON.stringify(data)); + } + + private handleError(err: HttpErrorResponse): void { + if (err.status === UNAUTHORIZED) { + this.errorMessage = SECURITY_MONITOR_MESSAGES.UNAUTHORIZED_ACCESS; + } else { + this.errorMessage = SECURITY_MONITOR_MESSAGES.FETCH_FAILURE; + } + + this.isAuthenticated = false; + this.clearSessionData(); + } + + private clearSessionData(): void { + sessionStorage.removeItem(SECURITY_MONITOR_SESSION_KEYS.TOKEN); + sessionStorage.removeItem(SECURITY_MONITOR_SESSION_KEYS.DATA); + } + + hasAlerts(alerts: Record): boolean { + return Object.keys(alerts).length > 0; + } + + alertKeys(alerts: Record): string[] { + return Object.keys(alerts); + } + + navigateToPage(repoName: string, path: string, additionalPath = ''): void { + const url = `${GITHUB_MARKET_ORG_URL}/${repoName}${path}${additionalPath}`; + window.open(url, '_blank'); + } + + navigateToRepoPage(repoName: string, page: keyof typeof REPO_PAGE_PATHS, lastCommitSHA?: string): void { + const path = REPO_PAGE_PATHS[page]; + let additionalPath = ''; + if (page === 'lastCommit') { + additionalPath = lastCommitSHA ?? ''; + } + if (path) { + this.navigateToPage(repoName, path, additionalPath); + } + } + + formatCommitDate(date: string): string { + const now = new Date().getTime(); + const targetDate = new Date(date).getTime(); + const diffInSeconds = Math.floor((now - targetDate) / 1000); + + if (diffInSeconds < 60) { + return 'just now'; + } + + for (const [index, { SECONDS, SINGULAR, PLURAL }] of TIME_UNITS.entries()) { + if (index < TIME_UNITS.length - 1 && diffInSeconds < TIME_UNITS[index + 1].SECONDS) { + const value = Math.floor(diffInSeconds / SECONDS); + if (value === 1) { + return `${value} ${SINGULAR} ago`; + } else { + return `${value} ${PLURAL} ago`; + } + } + } + + const years = Math.floor(diffInSeconds / TIME_UNITS[TIME_UNITS.length - 1].SECONDS); + if (years === 1) { + return `${years} year ago`; + } else { + return `${years} years ago`; + } + } +} diff --git a/marketplace-ui/src/app/modules/security-monitor/security-monitor.service.spec.ts b/marketplace-ui/src/app/modules/security-monitor/security-monitor.service.spec.ts new file mode 100644 index 000000000..ba5e26786 --- /dev/null +++ b/marketplace-ui/src/app/modules/security-monitor/security-monitor.service.spec.ts @@ -0,0 +1,77 @@ +import { TestBed } from '@angular/core/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import { SecurityMonitorService } from './security-monitor.service'; +import { environment } from '../../../environments/environment'; +import { ProductSecurityInfo } from '../../shared/models/product-security-info-model'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; + +describe('SecurityMonitorService', () => { + let service: SecurityMonitorService; + let httpMock: HttpTestingController; + + const mockApiUrl = environment.apiUrl + '/api/security-monitor'; + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + SecurityMonitorService, + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting() + ] + }); + service = TestBed.inject(SecurityMonitorService); + httpMock = TestBed.inject(HttpTestingController); + }); + + afterEach(() => { + httpMock.verify(); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should call API with token and return security details', () => { + const mockToken = 'valid-token'; + const mockResponse: ProductSecurityInfo[] = [ + { + repoName: 'repo1', + visibility: 'public', + archived: false, + dependabot: { status: 'ENABLED', alerts: {} }, + codeScanning: { status: 'ENABLED', alerts: {} }, + secretScanning: { status: 'ENABLED', numberOfAlerts: 0 }, + branchProtectionEnabled: true, + lastCommitSHA: '12345', + lastCommitDate: '', + }, + ]; + + service.getSecurityDetails(mockToken).subscribe((data) => { + expect(data).toEqual(mockResponse); + }); + + const req = httpMock.expectOne(mockApiUrl); + expect(req.request.method).toBe('GET'); + expect(req.request.headers.get('Authorization')).toBe(`Bearer ${mockToken}`); + + req.flush(mockResponse); + }); + + it('should handle error response gracefully', () => { + const mockToken = 'invalid-token'; + + service.getSecurityDetails(mockToken).subscribe({ + next: () => fail('Expected an error, but received data.'), + error: (error) => { + expect(error.status).toBe(401); + }, + }); + + const req = httpMock.expectOne(mockApiUrl); + expect(req.request.method).toBe('GET'); + expect(req.request.headers.get('Authorization')).toBe(`Bearer ${mockToken}`); + + req.flush({ message: 'Unauthorized' }, { status: 401, statusText: 'Unauthorized' }); + }); +}); \ No newline at end of file diff --git a/marketplace-ui/src/app/modules/security-monitor/security-monitor.service.ts b/marketplace-ui/src/app/modules/security-monitor/security-monitor.service.ts new file mode 100644 index 000000000..b2b15ffb5 --- /dev/null +++ b/marketplace-ui/src/app/modules/security-monitor/security-monitor.service.ts @@ -0,0 +1,19 @@ +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { inject, Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { environment } from '../../../environments/environment'; +import { ProductSecurityInfo } from '../../shared/models/product-security-info-model'; + +@Injectable({ + providedIn: 'root' +}) +export class SecurityMonitorService { + + private readonly apiUrl = environment.apiUrl + '/api/security-monitor'; + private readonly http = inject(HttpClient); + + getSecurityDetails(token: string): Observable { + const headers = new HttpHeaders().set('Authorization', `Bearer ${token}`); + return this.http.get(this.apiUrl, { headers }); + } +} diff --git a/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.html b/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.html index bd8f64d01..993ceab34 100644 --- a/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.html +++ b/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.html @@ -1,3 +1,9 @@ - \ No newline at end of file +@if (isLoading()) { +
+
+
+
+
+
+
+} diff --git a/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.scss b/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.scss index ea8350003..4298d17dc 100644 --- a/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.scss +++ b/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.scss @@ -1,16 +1,78 @@ -.spinner-container { - height: 100%; - width: 100%; - display: flex; - justify-content: center; - align-items: center; +.dot-stretching { + position: relative; + width: 10px; + height: 10px; + border-radius: 5px; + background-color: var(--ivy-primary-bg); + color: var(--ivy-primary-bg); + transform: scale(1.25, 1.25); + animation: dot-stretching 1s infinite ease-in; +} + +.dot-stretching, +.dot-stretching::before, +.dot-stretching::after{ + width: 10px; + height: 10px; + border-radius: 5px; + background-color: var(--ivy-primary-bg); + color: var(--ivy-primary-bg); +} + +.dot-stretching::before, +.dot-stretching::after { + content: ''; + display: inline-block; + position: absolute; top: 0; - left: 0; - background: rgba(0, 0, 0, 0.32); - z-index: 2000; } -.spinner-border { - width: 4rem; - height: 4rem; + +.dot-stretching::before { + animation: dot-stretching-before 1s infinite ease-in; +} + +.dot-stretching::after { + animation: dot-stretching-after 1s infinite ease-in; +} + +.stage { + width: 0px; +} + +@keyframes dot-stretching { + 0% { + transform: scale(1.25, 1.25); + } + 50%, + 60% { + transform: scale(0.8, 0.8); + } + 100% { + transform: scale(1.25, 1.25); + } +} +@keyframes dot-stretching-before { + 0% { + transform: translate(0) scale(0.7, 0.7); + } + 50%, + 60% { + transform: translate(-20px) scale(1, 1); + } + 100% { + transform: translate(0) scale(0.7, 0.7); + } +} +@keyframes dot-stretching-after { + 0% { + transform: translate(0) scale(0.7, 0.7); + } + 50%, + 60% { + transform: translate(20px) scale(1, 1); + } + 100% { + transform: translate(0) scale(0.7, 0.7); + } } diff --git a/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.spec.ts b/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.spec.ts index 3578b8ac9..4a7fde2c6 100644 --- a/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.spec.ts +++ b/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { LoadingSpinnerComponent } from './loading-spinner.component'; +import { LoadingComponentId } from '../../enums/loading-component-id'; describe('LoadingSpinnerComponent', () => { let component: LoadingSpinnerComponent; @@ -16,30 +17,30 @@ describe('LoadingSpinnerComponent', () => { fixture.detectChanges(); }); - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should have isFixPosition set to true by default', () => { - expect(component.isFixPosition).toBe(true); - }); + it('should create', () => expect(component).toBeTruthy()); - it('should apply position-fixed class when isFixPosition is true', () => { - const containerElement = fixture.debugElement.query(By.css('.spinner-container')); - expect(containerElement.nativeElement.classList.contains('position-fixed')).toBe(true); - expect(containerElement.nativeElement.classList.contains('position-absolute')).toBe(false); + it('should display when isLoading state is true', () => { + component.key = LoadingComponentId.LANDING_PAGE; + component.loadingService.showLoading(LoadingComponentId.LANDING_PAGE); + fixture.detectChanges(); + expect(component.isLoading()).toBeTrue(); }); - it('should apply position-absolute class when isFixPosition is false', () => { - component.isFixPosition = false; + it('should display when isLoading state is false', () => { + component.key = LoadingComponentId.LANDING_PAGE; + component.loadingService.hideLoading(LoadingComponentId.LANDING_PAGE); fixture.detectChanges(); - const containerElement = fixture.debugElement.query(By.css('.spinner-container')); - expect(containerElement.nativeElement.classList.contains('position-absolute')).toBe(true); - expect(containerElement.nativeElement.classList.contains('position-fixed')).toBe(false); + expect(component.isLoading()).toBeFalse(); }); - it('should contain a spinner-border element', () => { - const spinnerElement = fixture.debugElement.query(By.css('.spinner-border')); - expect(spinnerElement).toBeTruthy(); + it('container class should come from input', () => { + component.key = LoadingComponentId.LANDING_PAGE; + component.containerClasses = 'spinner-container'; + component.loadingService.showLoading(LoadingComponentId.LANDING_PAGE); + fixture.detectChanges(); + const containerElement = fixture.debugElement.query( + By.css('.spinner-container') + ); + expect(containerElement.nativeElement).toBeTruthy(); }); }); diff --git a/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.ts b/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.ts index 182731f23..cd3cc6d8b 100644 --- a/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.ts +++ b/marketplace-ui/src/app/shared/components/loading-spinner/loading-spinner.component.ts @@ -1,16 +1,15 @@ -import { Component, Input } from '@angular/core'; -import { NgClass } from '@angular/common'; +import { Component, computed, inject, Input } from '@angular/core'; +import { LoadingService } from '../../../core/services/loading/loading.service'; @Component({ selector: 'app-loading-spinner', standalone: true, - imports: [ - NgClass - ], templateUrl: './loading-spinner.component.html', styleUrl: './loading-spinner.component.scss' }) export class LoadingSpinnerComponent { - @Input() - isFixPosition = true; + @Input() key = ''; + @Input() containerClasses = ''; + loadingService = inject(LoadingService); + isLoading = computed(() => this.loadingService.loadingStates()[this.key]); } diff --git a/marketplace-ui/src/app/shared/constants/common.constant.ts b/marketplace-ui/src/app/shared/constants/common.constant.ts index 7631e713b..e4f769869 100644 --- a/marketplace-ui/src/app/shared/constants/common.constant.ts +++ b/marketplace-ui/src/app/shared/constants/common.constant.ts @@ -182,7 +182,7 @@ export const FEEDBACK_SORT_TYPES: ItemDropdown[] = [ } ]; -export const DESIGNER_COOKIE_VARIABLE = { +export const DESIGNER_SESSION_STORAGE_VARIABLE = { ivyViewerParamName: 'ivy-viewer', ivyVersionParamName: 'ivy-version', defaultDesignerViewer: 'designer-market', @@ -236,6 +236,7 @@ export const TOKEN_KEY = 'token'; export const DEFAULT_IMAGE_URL = '/assets/images/misc/axonivy-logo-round.png'; export const DOWNLOAD_URL = 'https://developer.axonivy.com/download'; export const SEARCH_URL = 'https://developer.axonivy.com/search'; +export const GITHUB_MARKET_ORG_URL = 'https://github.com/axonivy-market'; export const SHOW_DEV_VERSION = "showDevVersions"; export const DEFAULT_VENDOR_IMAGE = '/assets/images/misc/axonivy-logo.svg'; export const DEFAULT_VENDOR_IMAGE_BLACK = '/assets/images/misc/axonivy-logo-black.svg'; @@ -247,4 +248,33 @@ export const DAYS_IN_A_WEEK = 7; export const DAYS_IN_A_MONTH = 30; export const DAYS_IN_A_YEAR = 365; -export const MAX_FEEDBACK_LENGTH =250; \ No newline at end of file +export const MAX_FEEDBACK_LENGTH =250; + +export const SECURITY_MONITOR_SESSION_KEYS = { + DATA: 'security-monitor-data', + TOKEN: 'security-monitor-token', +}; + +export const SECURITY_MONITOR_MESSAGES = { + TOKEN_REQUIRED: 'Token is required', + UNAUTHORIZED_ACCESS: 'Unauthorized access.', + FETCH_FAILURE: 'Failed to fetch security data. Check logs for details.', +}; + +export const TIME_UNITS = [ + { SECONDS: 60, SINGULAR: 'minute', PLURAL: 'minutes' }, + { SECONDS: 3600, SINGULAR: 'hour', PLURAL: 'hours' }, + { SECONDS: 86400, SINGULAR: 'day', PLURAL: 'days' }, + { SECONDS: 604800, SINGULAR: 'week', PLURAL: 'weeks' }, + { SECONDS: 2592000, SINGULAR: 'month', PLURAL: 'months' }, + { SECONDS: 31536000, SINGULAR: 'year', PLURAL: 'years' }, +]; + +export const REPO_PAGE_PATHS: Record = { + security: '/security', + dependabot: '/security/dependabot', + codeScanning: '/security/code-scanning', + secretScanning: '/security/secret-scanning', + branches: '/settings/branches', + lastCommit: '/commit/', +}; diff --git a/marketplace-ui/src/app/shared/enums/loading-component-id.ts b/marketplace-ui/src/app/shared/enums/loading-component-id.ts new file mode 100644 index 000000000..dedca8eb2 --- /dev/null +++ b/marketplace-ui/src/app/shared/enums/loading-component-id.ts @@ -0,0 +1,6 @@ +export enum LoadingComponentId { + LANDING_PAGE = 'landing-page', + PRODUCT_DETAIL_INFORMATION = 'product-detail-information', + PRODUCT_VERSION = 'product-version', + DETAIL_PAGE = 'detail-page' +} diff --git a/marketplace-ui/src/app/shared/mocks/mock-data.ts b/marketplace-ui/src/app/shared/mocks/mock-data.ts index cf319dc7e..e58cec921 100644 --- a/marketplace-ui/src/app/shared/mocks/mock-data.ts +++ b/marketplace-ui/src/app/shared/mocks/mock-data.ts @@ -1,7 +1,9 @@ +import { FeedbackApiResponse } from '../models/apis/feedback-response.model'; import { ProductApiResponse } from '../models/apis/product-response.model'; import { ExternalDocument } from '../models/external-document.model'; import { ProductDetail } from '../models/product-detail.model'; import { ProductModuleContent } from '../models/product-module-content.model'; +import { StarRatingCounting } from '../models/star-rating-counting.model'; export const MOCK_PRODUCTS = { _embedded: { @@ -226,7 +228,8 @@ export const MOCK_CRON_JOB_PRODUCT_DETAIL: ProductDetail = { de: 'Das Cron-Job-Utility übernimmt die automatische Verwaltung deiner zeitgesteuerten Aufgaben.', en: 'Cron Job Utility handles your scheduled jobs autonomously.' }, - logoUrl: 'https://raw.githubusercontent.com/axonivy-market/market/feature/MARP-463-Multilingualism-for-Website/market/utils/cronjob/logo.png', + logoUrl: + 'https://raw.githubusercontent.com/axonivy-market/market/feature/MARP-463-Multilingualism-for-Website/market/utils/cronjob/logo.png', type: 'util', tags: ['utils'], vendor: 'Axon Ivy AG', @@ -234,7 +237,8 @@ export const MOCK_CRON_JOB_PRODUCT_DETAIL: ProductDetail = { newestReleaseVersion: 'v10.0.4', cost: 'Free', sourceUrl: 'https://github.com/axonivy-market/cronjob', - statusBadgeUrl: 'https://github.com/axonivy-market/cronjob/actions/workflows/ci.yml/badge.svg', + statusBadgeUrl: + 'https://github.com/axonivy-market/cronjob/actions/workflows/ci.yml/badge.svg', language: 'English', industry: 'Cross-Industry', compatibility: '10.0+', @@ -246,10 +250,10 @@ export const MOCK_CRON_JOB_PRODUCT_DETAIL: ProductDetail = { en: '**Cron Job** is a job-firing schedule that recurs based on calendar-like notions.\n\nThe [Quartz framework](http://www.quartz-scheduler.org/) is used as underlying scheduler framework.\n\nWith Cron Job, you can specify firing-schedules such as “every Friday at noon”, or “every weekday and 9:30 am”, or even “every 5 minutes between 9:00 am and 10:00 am on every Monday, Wednesday and Friday during January”.\n\nFor more details about Cron Expressions please refer to [Lesson 6: CronTrigger](http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/tutorial-lesson-06.html)' }, setup: { - en: 'No special setup is needed for this demo. Only start the Engine and watch out the logging which will be updated every 5 seconds with the following logging entry:\n\n```\n\nCron Job ist started at: 2023-01-27 10:43:20.\n\n```', + en: 'No special setup is needed for this demo. Only start the Engine and watch out the logging which will be updated every 5 seconds with the following logging entry:\n\n```\n\nCron Job ist started at: 2023-01-27 10:43:20.\n\n```' }, demo: { - en: 'In this demo, the CronByGlobalVariableTriggerStartEventBean is defined as the Java class to be executed in the Ivy Program Start element.\n\n![Program Start Element screenshot](https://raw.githubusercontent.com/axonivy-market/cronjob/v10.0.4/cronjob-product/ProgramStartElement.png)\n\nThis bean gets a cron expression via the variable defined as Cron expression and it will schedule by using the expression.\n\n![custom editor UI screenshot](https://raw.githubusercontent.com/axonivy-market/cronjob/v10.0.4/cronjob-product/customEditorUI.png)\n\nFor this demo, the Cron expression is defining the time to start the cron that simply fires every 5 seconds.\n\n```\n\n demoStartCronPattern: 0/5 * * * * ?\n\n```', + en: 'In this demo, the CronByGlobalVariableTriggerStartEventBean is defined as the Java class to be executed in the Ivy Program Start element.\n\n![Program Start Element screenshot](https://raw.githubusercontent.com/axonivy-market/cronjob/v10.0.4/cronjob-product/ProgramStartElement.png)\n\nThis bean gets a cron expression via the variable defined as Cron expression and it will schedule by using the expression.\n\n![custom editor UI screenshot](https://raw.githubusercontent.com/axonivy-market/cronjob/v10.0.4/cronjob-product/customEditorUI.png)\n\nFor this demo, the Cron expression is defining the time to start the cron that simply fires every 5 seconds.\n\n```\n\n demoStartCronPattern: 0/5 * * * * ?\n\n```' }, isDependency: true, name: 'cron job', @@ -280,7 +284,8 @@ export const MOCK_PRODUCT_DETAIL: ProductDetail = { de: "TODO Atlassian's Jira connector lets you track issues directly from the Axon Ivy platform." }, installationCount: 1, - logoUrl: 'https://raw.githubusercontent.com/axonivy-market/market/master/market/connector/jira/logo.png', + logoUrl: + 'https://raw.githubusercontent.com/axonivy-market/market/master/market/connector/jira/logo.png', type: 'connector', tags: ['helper'], vendor: 'FROX AG', @@ -289,7 +294,8 @@ export const MOCK_PRODUCT_DETAIL: ProductDetail = { newestReleaseVersion: 'v10.0.0', cost: 'Free', sourceUrl: 'https://github.com/axonivy-market/jira-connector', - statusBadgeUrl: 'https://github.com/axonivy-market/jira-connector/actions/workflows/ci.yml/badge.svg', + statusBadgeUrl: + 'https://github.com/axonivy-market/jira-connector/actions/workflows/ci.yml/badge.svg', language: 'English', industry: 'Cross-Industry', compatibility: '9.2+', @@ -300,17 +306,17 @@ export const MOCK_PRODUCT_DETAIL: ProductDetail = { en: "Axon Ivy's [Atlassian Jira Connector ](https://www.atlassian.com/software/jira) gives you full power to track issues within your process work. The connector:\n\n- Features three main functionalities (create comment, create issue, and get issue).\n- Provides access to the core API of Atlassian Jira.\n- Supports you with an easy-to-copy demo implementation to reduce your integration effort.\n- Enables low code citizen developers to integrate issue tracking tools without writing a single line of code." }, setup: { - en: 'Open the `Config/variables.yaml` in your Axon Ivy Designer and paste the\ncode below and adjust the values to your environment.\n\n```\nVariables:\n\n jira-connector:\n \n # Url to the Jira server\n Url: "https://localhost"\n\n # Username to connect to the Jira server\n Username: "admin"\n\n # Password to connect to the Jira server\n Password: "1234"\n```', + en: 'Open the `Config/variables.yaml` in your Axon Ivy Designer and paste the\ncode below and adjust the values to your environment.\n\n```\nVariables:\n\n jira-connector:\n \n # Url to the Jira server\n Url: "https://localhost"\n\n # Username to connect to the Jira server\n Username: "admin"\n\n # Password to connect to the Jira server\n Password: "1234"\n```' }, demo: { - en: '![jira-connector Demo 1](https://raw.githubusercontent.com/axonivy-market/jira-connector/v10.0.0/jira-connector-product/images/create-issue.png "Create Jira issue")\n![jira-connector Demo 2](https://raw.githubusercontent.com/axonivy-market/jira-connector/v10.0.0/jira-connector-product/images/create-comment.png "Craete Jira comment")', + en: '![jira-connector Demo 1](https://raw.githubusercontent.com/axonivy-market/jira-connector/v10.0.0/jira-connector-product/images/create-issue.png "Create Jira issue")\n![jira-connector Demo 2](https://raw.githubusercontent.com/axonivy-market/jira-connector/v10.0.0/jira-connector-product/images/create-comment.png "Craete Jira comment")' }, isDependency: true, name: 'Jira Connector', groupId: 'com.axonivy.connector.jira', artifactId: 'jira-connector', type: 'iar', - productId: 'jira-connector', + productId: 'jira-connector' }, mavenDropins: false, _links: { @@ -329,3 +335,24 @@ export const MOCK_EXTERNAL_DOCUMENT: ExternalDocument = { artifactName: 'Portal Guide', relativeLink: '/market-cache/portal/portal-guide/10.0.0/doc/index.html' }; + +export const MOCK_FEEDBACK_API_RESPONSE: FeedbackApiResponse = { + _embedded: { + feedbacks: [ + { + content: 'cool stuff', + rating: 5, + productId: 'portal' + } + ] + }, + _links: { + self: { href: '/feedbacks' } + }, + page: { + size: 10, + totalElements: 1, + totalPages: 1, + number: 0 + } +}; \ No newline at end of file diff --git a/marketplace-ui/src/app/shared/models/product-security-info-model.ts b/marketplace-ui/src/app/shared/models/product-security-info-model.ts new file mode 100644 index 000000000..f3b6d0ce4 --- /dev/null +++ b/marketplace-ui/src/app/shared/models/product-security-info-model.ts @@ -0,0 +1,20 @@ +export interface ProductSecurityInfo { + repoName: string; + visibility: string; + archived: boolean; + dependabot: { + status: string; + alerts: Record; + }; + codeScanning: { + status: string; + alerts: Record; + }; + secretScanning: { + status: string; + numberOfAlerts: number; + }; + branchProtectionEnabled: boolean; + lastCommitSHA: string; + lastCommitDate: string; +} \ No newline at end of file diff --git a/marketplace-ui/src/app/shared/pipes/empty-product-detail.pipe.ts b/marketplace-ui/src/app/shared/pipes/empty-product-detail.pipe.ts new file mode 100644 index 000000000..d83f056b7 --- /dev/null +++ b/marketplace-ui/src/app/shared/pipes/empty-product-detail.pipe.ts @@ -0,0 +1,14 @@ +import { Pipe, PipeTransform } from "@angular/core"; +import { ProductDetail } from "../models/product-detail.model"; + +@Pipe({ + standalone: true, + name: 'emptyProductDetailPipe' +}) +export class EmptyProductDetailPipe + implements PipeTransform +{ + transform(productDetail: ProductDetail): boolean { + return !productDetail || Object.keys(productDetail).length === 0; + } +} \ No newline at end of file diff --git a/marketplace-ui/src/app/shared/pipes/missing-readme-content.pipe.ts b/marketplace-ui/src/app/shared/pipes/missing-readme-content.pipe.ts deleted file mode 100644 index 72f8d166d..000000000 --- a/marketplace-ui/src/app/shared/pipes/missing-readme-content.pipe.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Pipe, PipeTransform } from "@angular/core"; -import { ProductModuleContent } from "../models/product-module-content.model"; - -@Pipe({ - standalone: true, - name: 'missingReadmeContent' -}) -export class MissingReadmeContentPipe implements PipeTransform { - transform(productModuleContent: ProductModuleContent): boolean { - return ( - !productModuleContent || Object.keys(productModuleContent).length === 0 - ); - } -} \ No newline at end of file diff --git a/marketplace-ui/src/app/shared/pipes/product-type.pipe.ts b/marketplace-ui/src/app/shared/pipes/product-type.pipe.ts index 7c922ba25..bdba94750 100644 --- a/marketplace-ui/src/app/shared/pipes/product-type.pipe.ts +++ b/marketplace-ui/src/app/shared/pipes/product-type.pipe.ts @@ -6,6 +6,10 @@ import { Pipe, PipeTransform } from '@angular/core'; }) export class ProductTypePipe implements PipeTransform { transform(type: string, _args?: []): string { - return `common.filter.value.${type}`; + let i18nKey = ''; + if (type) { + i18nKey = `common.filter.value.${type}`; + } + return i18nKey; } } diff --git a/marketplace-ui/src/app/shared/services/app-modal.service.ts b/marketplace-ui/src/app/shared/services/app-modal.service.ts index 999b2d5f7..12677724f 100644 --- a/marketplace-ui/src/app/shared/services/app-modal.service.ts +++ b/marketplace-ui/src/app/shared/services/app-modal.service.ts @@ -10,7 +10,7 @@ import { SuccessDialogComponent } from '../../modules/product/product-detail/pro export class AppModalService { private readonly modalService = inject(NgbModal); - openShowFeedbacksDialog() { + openShowFeedbacksDialog(): void { this.modalService.open(ShowFeedbacksDialogComponent, { centered: true, modalDialogClass: 'show-feedbacks-modal-dialog', @@ -30,7 +30,7 @@ export class AppModalService { return addFeedbackDialog.result; } - openSuccessDialog() { + openSuccessDialog(): void { this.modalService.open(SuccessDialogComponent, { fullscreen: 'md', centered: true, diff --git a/marketplace-ui/src/app/shared/services/routing.query.param.service.spec.ts b/marketplace-ui/src/app/shared/services/routing.query.param.service.spec.ts index 2bd01ae23..34ba79e3e 100644 --- a/marketplace-ui/src/app/shared/services/routing.query.param.service.spec.ts +++ b/marketplace-ui/src/app/shared/services/routing.query.param.service.spec.ts @@ -1,20 +1,15 @@ import { TestBed } from '@angular/core/testing'; import { Router, NavigationStart } from '@angular/router'; -import { CookieService } from 'ngx-cookie-service'; import { RoutingQueryParamService } from './routing.query.param.service'; import { Subject } from 'rxjs'; -import { DESIGNER_COOKIE_VARIABLE } from '../constants/common.constant'; +import { DESIGNER_SESSION_STORAGE_VARIABLE } from '../constants/common.constant'; describe('RoutingQueryParamService', () => { let service: RoutingQueryParamService; - let cookieService: jasmine.SpyObj; let eventsSubject: Subject; + let mockStorage: { [key: string]: string }; beforeEach(() => { - const cookieServiceSpy = jasmine.createSpyObj('CookieService', [ - 'get', - 'set' - ]); eventsSubject = new Subject(); const routerSpy = jasmine.createSpyObj('Router', [], { events: eventsSubject.asObservable() @@ -23,59 +18,61 @@ describe('RoutingQueryParamService', () => { TestBed.configureTestingModule({ providers: [ RoutingQueryParamService, - { provide: CookieService, useValue: cookieServiceSpy }, { provide: Router, useValue: routerSpy } ] }); service = TestBed.inject(RoutingQueryParamService); - cookieService = TestBed.inject( - CookieService - ) as jasmine.SpyObj; + mockStorage = { + 'ivy-viewer': 'designer-market', + 'ivy-version': '1.0' + }; + spyOn(sessionStorage, 'getItem').and.callFake((key: string) => { + return mockStorage[key] || null; + }); + + spyOn(sessionStorage, 'setItem').and.callFake((key: string, value: string) => { + mockStorage[key] = value; + }); }); it('should be created', () => { expect(service).toBeTruthy(); }); - it('should check cookie for designer version', () => { - const params = { [DESIGNER_COOKIE_VARIABLE.ivyVersionParamName]: '1.0' }; - service.checkCookieForDesignerVersion(params); - expect(cookieService.set).toHaveBeenCalledWith( - DESIGNER_COOKIE_VARIABLE.ivyVersionParamName, + it('should check session storage for designer version', () => { + const params = { + [DESIGNER_SESSION_STORAGE_VARIABLE.ivyVersionParamName]: '1.0' + }; + service.checkSessionStorageForDesignerVersion(params); + expect(sessionStorage.setItem).toHaveBeenCalledWith( + DESIGNER_SESSION_STORAGE_VARIABLE.ivyVersionParamName, '1.0' ); - expect(service.getDesignerVersionFromCookie()).toBe('1.0'); + expect(service.getDesignerVersionFromSessionStorage()).toBe('1.0'); }); - it('should check cookie for designer env', () => { + it('should check session storage for designer env', () => { const params = { - [DESIGNER_COOKIE_VARIABLE.ivyViewerParamName]: - DESIGNER_COOKIE_VARIABLE.defaultDesignerViewer + [DESIGNER_SESSION_STORAGE_VARIABLE.ivyViewerParamName]: + DESIGNER_SESSION_STORAGE_VARIABLE.defaultDesignerViewer }; - service.checkCookieForDesignerEnv(params); - expect(cookieService.set).toHaveBeenCalledWith( - DESIGNER_COOKIE_VARIABLE.ivyViewerParamName, - DESIGNER_COOKIE_VARIABLE.defaultDesignerViewer + service.checkSessionStorageForDesignerEnv(params); + expect(sessionStorage.setItem).toHaveBeenCalledWith( + DESIGNER_SESSION_STORAGE_VARIABLE.ivyViewerParamName, + DESIGNER_SESSION_STORAGE_VARIABLE.defaultDesignerViewer ); expect(service.isDesignerViewer()).toBeTrue(); }); - it('should get designer version from cookie if not set', () => { - cookieService.get.and.returnValue('1.0'); - expect(service.getDesignerVersionFromCookie()).toBe('1.0'); + it('should get designer version from session storage if not set', () => { + expect(service.getDesignerVersionFromSessionStorage()).toBe('1.0'); }); - it('should set isDesigner to true if cookie matches default designer viewer', () => { - cookieService.get.and.returnValue( - DESIGNER_COOKIE_VARIABLE.defaultDesignerViewer - ); + it('should set isDesigner to true if session storage matches default designer viewer', () => { expect(service.isDesignerViewer()).toBeTrue(); }); it('should listen to navigation start events', () => { - cookieService.get.and.returnValue( - DESIGNER_COOKIE_VARIABLE.defaultDesignerViewer - ); eventsSubject.next(new NavigationStart(1, 'testUrl')); expect(service.isDesignerViewer()).toBeTrue(); }); diff --git a/marketplace-ui/src/app/shared/services/routing.query.param.service.ts b/marketplace-ui/src/app/shared/services/routing.query.param.service.ts index 21568d314..c07d08dae 100644 --- a/marketplace-ui/src/app/shared/services/routing.query.param.service.ts +++ b/marketplace-ui/src/app/shared/services/routing.query.param.service.ts @@ -1,6 +1,5 @@ import { computed, Injectable, signal } from '@angular/core'; -import { CookieService } from 'ngx-cookie-service'; -import { DESIGNER_COOKIE_VARIABLE } from '../constants/common.constant'; +import { DESIGNER_SESSION_STORAGE_VARIABLE } from '../constants/common.constant'; import { Router, Params, NavigationStart } from '@angular/router'; import { Observable } from 'rxjs'; import { filter } from 'rxjs/operators'; @@ -12,63 +11,67 @@ export class RoutingQueryParamService { isDesignerEnv = computed(() => this.isDesigner()); designerVersion = signal(''); - constructor( - private readonly cookieService: CookieService, - private readonly router: Router - ) { + constructor(private readonly router: Router) { this.getNavigationStartEvent().subscribe(() => { if (!this.isDesigner()) { this.isDesigner.set( - this.cookieService.get( - DESIGNER_COOKIE_VARIABLE.ivyViewerParamName - ) === DESIGNER_COOKIE_VARIABLE.defaultDesignerViewer + sessionStorage.getItem( + DESIGNER_SESSION_STORAGE_VARIABLE.ivyViewerParamName + ) === DESIGNER_SESSION_STORAGE_VARIABLE.defaultDesignerViewer ); } }); } - checkCookieForDesignerVersion(params: Params) { - const versionParam = params[DESIGNER_COOKIE_VARIABLE.ivyVersionParamName]; + checkSessionStorageForDesignerVersion(params: Params): void { + const versionParam = + params[DESIGNER_SESSION_STORAGE_VARIABLE.ivyVersionParamName]; if (versionParam !== undefined) { - this.cookieService.set( - DESIGNER_COOKIE_VARIABLE.ivyVersionParamName, + sessionStorage.setItem( + DESIGNER_SESSION_STORAGE_VARIABLE.ivyVersionParamName, versionParam ); this.designerVersion.set(versionParam); } } - checkCookieForDesignerEnv(params: Params) { - const ivyViewerParam = params[DESIGNER_COOKIE_VARIABLE.ivyViewerParamName]; - if (ivyViewerParam === DESIGNER_COOKIE_VARIABLE.defaultDesignerViewer) { - this.cookieService.set( - DESIGNER_COOKIE_VARIABLE.ivyViewerParamName, + checkSessionStorageForDesignerEnv(params: Params): void { + const ivyViewerParam = + params[DESIGNER_SESSION_STORAGE_VARIABLE.ivyViewerParamName]; + if ( + ivyViewerParam === DESIGNER_SESSION_STORAGE_VARIABLE.defaultDesignerViewer + ) { + sessionStorage.setItem( + DESIGNER_SESSION_STORAGE_VARIABLE.ivyViewerParamName, ivyViewerParam ); this.isDesigner.set(true); } } - getDesignerVersionFromCookie() { + getDesignerVersionFromSessionStorage(): string { if (this.designerVersion() === '') { this.designerVersion.set( - this.cookieService.get(DESIGNER_COOKIE_VARIABLE.ivyVersionParamName) + sessionStorage.getItem( + DESIGNER_SESSION_STORAGE_VARIABLE.ivyVersionParamName + ) ?? '' ); } return this.designerVersion(); } - isDesignerViewer() { + isDesignerViewer(): boolean { if (!this.isDesigner()) { this.isDesigner.set( - this.cookieService.get(DESIGNER_COOKIE_VARIABLE.ivyViewerParamName) === - DESIGNER_COOKIE_VARIABLE.defaultDesignerViewer + sessionStorage.getItem( + DESIGNER_SESSION_STORAGE_VARIABLE.ivyViewerParamName + ) === DESIGNER_SESSION_STORAGE_VARIABLE.defaultDesignerViewer ); } return this.isDesigner(); } - getNavigationStartEvent(): Observable { + getNavigationStartEvent() { return this.router.events.pipe( filter(event => event instanceof NavigationStart) ) as Observable; diff --git a/marketplace-ui/src/assets/i18n/de.yaml b/marketplace-ui/src/assets/i18n/de.yaml index 4722815bc..760fd4679 100644 --- a/marketplace-ui/src/assets/i18n/de.yaml +++ b/marketplace-ui/src/assets/i18n/de.yaml @@ -26,7 +26,7 @@ common: error: code: 'ERROR CODE' oops: 'Oops!' - fullMessage: "{{ errorMessage }} Du tust uns einen großen Gefallen, wenn Du es hier meldest: support@axonivy.com" + fullMessage: "{{ errorMessage }} Du tust uns einen großen Gefallen, wenn Du es hier meldest: support@axonivy.com" description: 400: 'Bad Request: Der Server konnte die Anfrage aufgrund fehlerhafter Syntax nicht verstehen.' 401: 'Unauthorized: Eine Authentifizierung ist erforderlich und ist fehlgeschlagen oder wurde nicht bereitgestellt.' @@ -112,7 +112,7 @@ common: commentLabel: Einen Kommentar abgeben submitBtnLabel: Bewertung abgeben loggedGithubAsLabel: Eingeloggt bei Github als - reviewLabel: Überprüfung + reviewLabel: Bewertung detailedReviews: Ausführliche Bewertungen showMoreBtnLabel: Mehr anzeigen noFeedbackForConnectorLabel: Zu diesem Konnektor gibt's noch kein Feedback. diff --git a/marketplace-ui/src/assets/i18n/en.yaml b/marketplace-ui/src/assets/i18n/en.yaml index f31b6a195..e15587891 100644 --- a/marketplace-ui/src/assets/i18n/en.yaml +++ b/marketplace-ui/src/assets/i18n/en.yaml @@ -30,7 +30,7 @@ common: error: code: 'ERROR CODE' oops: 'Oops!' - fullMessage: "{{ errorMessage }} You would be doing us a great favor by reporting it here: support@axonivy.com" + fullMessage: "{{ errorMessage }} You would be doing us a great favor by reporting it here: support@axonivy.com" description: 400: 'Bad Request: The server could not understand the request due to invalid syntax.' 401: 'Unauthorized: Authentication is required and has failed or has not been provided.' diff --git a/marketplace-ui/src/assets/scss/custom-style.scss b/marketplace-ui/src/assets/scss/custom-style.scss index 40979b3b6..c1b98a88f 100644 --- a/marketplace-ui/src/assets/scss/custom-style.scss +++ b/marketplace-ui/src/assets/scss/custom-style.scss @@ -56,6 +56,10 @@ p { font-size: 14px; } +.overlay-background{ + background: rgba(0, 0, 0, 0.32); +} + [data-bs-theme='light'] { --ivy-primary-bg: #{$ivyPrimaryColorLight}; --ivy-secondary-bg: #{$ivySecondaryColorLight}; @@ -69,6 +73,7 @@ p { --header-border-color: #ebebeb; --footer-border-color: #e7e7e7; --ivy-secondary-border-color: #e7e7e7; + --ivy-secondary-border-color-up-arrow: #0000001a; --ivy-custom-select-indicator: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 11 8 5 14 11'/%3e%3c/svg%3e") !important; --active-tab-indicator-color: #{$ivyPrimaryTextColorLight}; --info-dropdown-bg: #ffffff; @@ -177,6 +182,7 @@ p { --header-border-color: #{$ivySecondaryTextLight}; --footer-border-color: #4f4e4e; --ivy-secondary-border-color: #4f4e4e; + --ivy-secondary-border-color-up-arrow: #4f4e4e; --ivy-custom-select-indicator: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23dee2e6' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 11 8 5 14 11'/%3e%3c/svg%3e") !important; --active-tab-indicator-color: #{$white}; --info-dropdown-bg: #{$ivyBodyBackgroundDark}; diff --git a/marketplace-ui/src/main.ts b/marketplace-ui/src/main.ts index 3997d76eb..5086f383d 100644 --- a/marketplace-ui/src/main.ts +++ b/marketplace-ui/src/main.ts @@ -6,4 +6,4 @@ import { AppComponent } from './app/app.component'; bootstrapApplication(AppComponent, appConfig).catch(err => { throw err; -}); +}); \ No newline at end of file