Extended feature-flags.json and fixed PR comments

kamu-data · Dec 4, 2024 · 64575e4 · 64575e4
1 parent 18728d1
commit 64575e4
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 46 deletions.
diff --git a/src/app/account/account.component.html b/src/app/account/account.component.html
@@ -37,7 +37,8 @@
                     {{ isLoggedUser(user) ? "Edit profile" : "Follow" }}
                 </button>
             </div>
-            <div class="border-top mt-5 me-4">
+            <mat-divider class="w-90"></mat-divider>
+            <div appFeatureFlag="profile.companies" class="mt-2 me-4">
                 <h3 class="text-start pt-3 px-3 organization">Organizations</h3>
                 <div class="d-flex flex-row gap-2 text-start px-3">
                     <img

diff --git a/src/app/account/account.component.scss b/src/app/account/account.component.scss
@@ -34,3 +34,7 @@
         color: $app-dark;
     }
 }
+
+.w-90 {
+    width: 90%;
+}
diff --git a/...ess-panel/data-access-modal/tabs/data-access-link-tab/data-access-link-tab.component.html b/...ess-panel/data-access-modal/tabs/data-access-link-tab/data-access-link-tab.component.html
@@ -34,39 +34,42 @@
         </div>
     </div>
 
-    <div class="input-group mt-1">
-        <mat-checkbox color="primary" disabled="true">
-            <span class="fs-12">Stable</span>
-        </mat-checkbox>
-        <mat-icon
-            class="text-muted fs-5 help-icon"
-            matTooltip="Include the unique identifier of the dataset. This guarantees that link will point to the same dataset even if its name and owner changes over time."
-            [matTooltipPosition]="'right'"
-            >help_outline</mat-icon
-        >
-    </div>
-    <div class="input-group mt-1">
-        <mat-checkbox color="primary" disabled="true">
-            <span class="fs-12">Frozen</span>
-        </mat-checkbox>
-        <mat-icon
-            class="text-muted fs-5 help-icon"
-            matTooltip="Link to the state of a dataset at this specific point in time, for reproducibility. No matter how much time passes, everyone using this link will the the exact same data."
-            [matTooltipPosition]="'right'"
-            >help_outline</mat-icon
-        >
-    </div>
-    <div class="input-group mt-1 mb-3">
-        <mat-checkbox color="primary" disabled="true">
-            <span class="fs-12">DOI</span>
-        </mat-checkbox>
-        <mat-icon
-            class="text-muted fs-5 help-icon"
-            matTooltip="Produce a DOI.org identifier used for scientific publications."
-            [matTooltipPosition]="'right'"
-            >help_outline</mat-icon
-        >
+    <div appFeatureFlag="dataset.getData.link.checkboxes">
+        <div class="input-group mt-1">
+            <mat-checkbox color="primary" disabled="true">
+                <span class="fs-12">Stable</span>
+            </mat-checkbox>
+            <mat-icon
+                class="text-muted fs-5 help-icon"
+                matTooltip="Include the unique identifier of the dataset. This guarantees that link will point to the same dataset even if its name and owner changes over time."
+                [matTooltipPosition]="'right'"
+                >help_outline</mat-icon
+            >
+        </div>
+        <div class="input-group mt-1">
+            <mat-checkbox color="primary" disabled="true">
+                <span class="fs-12">Frozen</span>
+            </mat-checkbox>
+            <mat-icon
+                class="text-muted fs-5 help-icon"
+                matTooltip="Link to the state of a dataset at this specific point in time, for reproducibility. No matter how much time passes, everyone using this link will the the exact same data."
+                [matTooltipPosition]="'right'"
+                >help_outline</mat-icon
+            >
+        </div>
+        <div class="input-group mt-1 mb-3">
+            <mat-checkbox color="primary" disabled="true">
+                <span class="fs-12">DOI</span>
+            </mat-checkbox>
+            <mat-icon
+                class="text-muted fs-5 help-icon"
+                matTooltip="Produce a DOI.org identifier used for scientific publications."
+                [matTooltipPosition]="'right'"
+                >help_outline</mat-icon
+            >
+        </div>
     </div>
+
     <div class="w-100">
         <mat-divider class="my-2" />
         <div class="d-flex align-items-center">

diff --git a/src/app/components/dataset-list-item/dataset-list-item.component.html b/src/app/components/dataset-list-item/dataset-list-item.component.html
@@ -79,11 +79,11 @@
             </mat-chip-set>
         </div>
         <div class="dataset-list-container__additional-block mt-1">
-            <p class="text-small color-text-secondary mr-3">
+            <p class="text-small mr-3">
                 Updated
                 <app-display-time
                     [data]="row.lastUpdatedAt"
-                    class="text-small color-text-secondary no-wrap"
+                    class="text-small no-wrap"
                     [dataTestId]="'time-dataset-list-item'"
                 />
             </p>
@@ -94,11 +94,11 @@
                     </ng-template>
                 </ngb-rating>
             </p>
-            <p class="text-small color-text-secondary mr-3">
+            <p class="text-small mr-3">
                 {{ row.metadata.currentDownstreamDependencies.length }}
                 Downstream
             </p>
-            <p class="text-small color-text-secondary mr-3" *ngIf="row.metadata.currentLicense">
+            <p class="text-small mr-3" *ngIf="row.metadata.currentLicense">
                 {{ row.metadata.currentLicense.shortName }}
             </p>
         </div>

diff --git a/src/app/components/dataset-list-item/dataset-list-item.component.scss b/src/app/components/dataset-list-item/dataset-list-item.component.scss
@@ -45,3 +45,7 @@
         font-size: 14px;
     }
 }
+
+.disabled {
+    opacity: 0.4 !important;
+}
diff --git a/src/app/dataset-flow/dataset-flow-details/dataset-flow-details.component.html b/src/app/dataset-flow/dataset-flow-details/dataset-flow-details.component.html
@@ -51,6 +51,7 @@
             <div class="sidebar my-4">
                 <ul class="action-list">
                     <li
+                        appFeatureFlag="flowDetails.summary"
                         class="action-list-item"
                         [ngClass]="{
                             'action-list-item__nav-active': activeTab === FlowDetailsTabs.SUMMARY
@@ -65,6 +66,7 @@
                         >
                     </li>
                     <li
+                        appFeatureFlag="flowDetails.history"
                         class="action-list-item"
                         [ngClass]="{
                             'action-list-item__nav-active': activeTab === FlowDetailsTabs.HISTORY
@@ -77,6 +79,7 @@
                         >
                     </li>
                     <li
+                        appFeatureFlag="flowDetails.logs"
                         class="action-list-item"
                         [ngClass]="{
                             'action-list-item__nav-active': activeTab === FlowDetailsTabs.LOGS
@@ -90,6 +93,7 @@
                         >
                     </li>
                     <li
+                        appFeatureFlag="flowDetails.usage"
                         class="action-list-item"
                         [ngClass]="{
                             'action-list-item__nav-active': activeTab === FlowDetailsTabs.USAGE
@@ -102,6 +106,7 @@
                         >
                     </li>
                     <li
+                        appFeatureFlag="flowDetails.admin"
                         class="action-list-item"
                         [ngClass]="{
                             'action-list-item__nav-active': activeTab === FlowDetailsTabs.ADMIN

diff --git a/src/app/dataset-view/additional-components/metadata-component/metadata.component.html b/src/app/dataset-view/additional-components/metadata-component/metadata.component.html
@@ -14,7 +14,7 @@
         <div class="d-flex justify-content-end" *ngIf="canEditSetPollingSource">
             <button
                 appFeatureFlag="dataset.panel.metadata.editPollingSource"
-                class="border-1 bg-light border rounded-2 me-3 btn btn-sm justify-content-between align-items-center"
+                class="border-1 bg-light border edit-polling-source-btn rounded-2 me-3 btn btn-sm justify-content-between align-items-center"
                 data-test-id="'edit-source-link'"
                 (click)="navigateToEditPollingSource()"
             >
@@ -23,7 +23,7 @@
             </button>
             <button
                 appFeatureFlag="dataset.panel.metadata.deletePollingSource"
-                class="border-1 bg-light border rounded-2 px-2 btn btn-sm d-flex justify-content-between align-items-center"
+                class="border-1 bg-light border delete-polling-source-btn rounded-2 px-2 btn btn-sm justify-content-between align-items-center"
                 data-test-id="'edit-source-link'"
                 (click)="onDeletePollingSource()"
             >
@@ -72,7 +72,7 @@
                         <div class="d-flex justify-content-end" *ngIf="canEditAddPushSource">
                             <button
                                 appFeatureFlag="dataset.panel.metadata.editPushSource"
-                                class="border-1 bg-light border rounded-2 me-3 btn btn-sm justify-content-between align-items-center"
+                                class="edit-push-source-btn border-1 bg-light border rounded-2 me-3 btn btn-sm justify-content-between align-items-center"
                                 data-test-id="'edit-source-link'"
                                 (click)="navigateToEditAddPushSource(source.sourceName!)"
                             >
@@ -81,7 +81,7 @@
                             </button>
                             <button
                                 appFeatureFlag="dataset.panel.metadata.deletePushSource"
-                                class="border-1 bg-light border rounded-2 px-2 btn btn-sm justify-content-between align-items-center"
+                                class="delete-push-source-btn border-1 bg-light border rounded-2 px-2 btn btn-sm justify-content-between align-items-center"
                                 data-test-id="'edit-source-link'"
                                 (click)="onDeletePushSource()"
                             >

diff --git a/src/app/dataset-view/additional-components/metadata-component/metadata.component.scss b/src/app/dataset-view/additional-components/metadata-component/metadata.component.scss
@@ -2,6 +2,10 @@ a {
     color: #0969da;
 }
 
-.new-push-source-btn {
+.new-push-source-btn,
+.edit-push-source-btn,
+.delete-push-source-btn,
+.edit-polling-source-btn,
+.delete-polling-source-btn {
     display: flex;
 }
diff --git a/src/assets/feature-flags.json b/src/assets/feature-flags.json
@@ -41,7 +41,13 @@
           },
           {
             "id": "link",
-            "developmentState": "stable"
+            "developmentState": "stable",
+            "subfeatures": [
+              {
+                "id": "checkboxes",
+                "developmentState": "mockup"
+              }
+            ]
           },
           {
             "id": "odata",
@@ -129,15 +135,15 @@
             "subfeatures": [
               {
                 "id": "deletePollingSource",
-                "developmentState": "stable"
+                "developmentState": "mockup"
               },
               {
                 "id": "deletePushSource",
                 "developmentState": "mockup"
               },
               {
                 "id": "editPollingSource",
-                "developmentState": "mockup"
+                "developmentState": "stable"
               },
               {
                 "id": "editPushSource",
@@ -250,6 +256,32 @@
       }
     ]
   },
+  {
+    "id": "flowDetails",
+    "developmentState": "stable",
+    "subfeatures": [
+      {
+        "id": "admin",
+        "developmentState": "mockup"
+      },
+      {
+        "id": "history",
+        "developmentState": "stable"
+      },
+      {
+        "id": "logs",
+        "developmentState": "stable"
+      },
+      {
+        "id": "summary",
+        "developmentState": "stable"
+      },
+      {
+        "id": "usage",
+        "developmentState": "mockup"
+      }
+    ]
+  },
   {
     "id": "help",
     "developmentState": "reserved"
@@ -272,6 +304,10 @@
     "id": "profile",
     "developmentState": "stable",
     "subfeatures": [
+      {
+        "id": "companies",
+        "developmentState": "mockup"
+      },
       {
         "id": "datasets",
         "developmentState": "stable"

diff --git a/src/styles.scss b/src/styles.scss
@@ -1609,7 +1609,7 @@ pre.language-sql {
 
 .disabled {
     pointer-events: none; /* Prevent interaction */
-    opacity: 0.5; /* Reduce visibility */
+    opacity: 0.65; /* Reduce visibility */
     filter: grayscale(100%); /* Grayscale effect */
     cursor: not-allowed; /* Show "not allowed" cursor */
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,3 +34,7 @@ @@
             color: $app-dark;
         }
     }
+    .w-90 {
+        width: 90%;
+    }