@gravitee/ui-particles-angular 9.5.2 → 9.6.0

package/fesm2020/gravitee-ui-particles-angular.mjs

@@ -4819,22 +4819,27 @@ class GioLicenseService {
         return this.loadLicense$;
     }
     isMissingFeature$(licenseOptions) {
-        if (licenseOptions?.deployed === false) {
-            return of(true);
-        }
-        if (licenseOptions?.feature == null || licenseOptions?.deployed === true) {
+        if (licenseOptions?.feature == null || !licenseOptions?.feature) {
             return of(false);
         }
-        return this.getLicense$().pipe(map(license => license == null || license.features.find(feat => feat === licenseOptions.feature) == null));
+        return this.isExpired$().pipe(switchMap(isExpired => {
+            if (isExpired) {
+                return of(isExpired);
+            }
+            return this.getLicense$().pipe(map(license => license == null || !license.features.some(feat => feat === licenseOptions.feature)));
+        }));
     }
     hasAllFeatures$(licenseOptions) {
-        if (!licenseOptions) {
+        if (!licenseOptions || isEmpty(licenseOptions)) {
             return of(true);
         }
-        if (licenseOptions?.find(o => o.feature != null && o.deployed === false) != null) {
-            return of(false);
-        }
-        return this.getLicense$().pipe(map(license => license != null && licenseOptions?.every(o => license.features.find(feat => feat === o.feature) != null)));
+        return this.isExpired$().pipe(switchMap(isExpired => {
+            const featuresDefined = licenseOptions.some(o => !!o.feature);
+            if (isExpired && featuresDefined) {
+                return of(false);
+            }
+            return this.getLicense$().pipe(map(license => license != null && licenseOptions.every(o => license.features.some(feat => feat === o.feature))));
+        }));
     }
     getFeatureInfo(licenseOptions) {
         if (!licenseOptions.feature) {
@@ -4879,6 +4884,9 @@ class GioLicenseService {
     getExpiresAt$() {
         return this.getLicense$().pipe(map(license => (license.expiresAt ? new Date(license.expiresAt) : undefined)));
     }
+    isExpired$() {
+        return this.getExpiresAt$().pipe(map(expiresAt => !!expiresAt && expiresAt.valueOf() < Date.now()));
+    }
 }
 GioLicenseService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: GioLicenseService, deps: [{ token: i4.HttpClient }, { token: 'LicenseConfiguration' }, { token: i1$3.MatDialog }], target: i0.ɵɵFactoryTarget.Injectable });
 GioLicenseService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: GioLicenseService, providedIn: 'root' });