Updated field name, admin page and handling.

Author: isoos

app/lib/frontend/templates/views/pkg/admin_page.dart

@@ -33,19 +33,27 @@ d.Node packageAdminPageNode({
         ],
       ),
       TocNode(
-        'Automated publishing',
-        href: '#automated-publishing',
+        'Publishing',
+        href: '#publishing',
         children: [
-          TocNode('GitHub Actions', href: '#github-actions'),
+          if (requestContext
+              .experimentalFlags
+              .isManualPublishingConfigAvailable)
+            TocNode('Manual publishing', href: '#manual-publishing'),
           TocNode(
-            'Google Cloud Service account',
-            href: '#google-cloud-service-account',
+            'Automated publishing',
+            href: '#automated-publishing',
+            children: [
+              TocNode('GitHub Actions', href: '#github-actions'),
+              TocNode(
+                'Google Cloud Service account',
+                href: '#google-cloud-service-account',
+              ),
+            ],
           ),
+          TocNode('Version retraction', href: '#version-retraction'),
         ],
       ),
-      if (requestContext.experimentalFlags.isManualPublishingConfigAvailable)
-        TocNode('Manual publishing', href: '#manual-publishing'),
-      TocNode('Version retraction', href: '#version-retraction'),
     ]),
     d.a(name: 'ownership'),
     d.h2(text: 'Package ownership'),
@@ -229,9 +237,11 @@ d.Node packageAdminPageNode({
         ),
       ),
     ],
-    _automatedPublishing(package),
+    d.a(name: 'publishing'),
+    d.h2(text: 'Publishing'),
     if (requestContext.experimentalFlags.isManualPublishingConfigAvailable)
       _manualPublishing(package),
+    _automatedPublishing(package),
     d.a(name: 'version-retraction'),
     d.h2(text: 'Version retraction'),
     d.div(
@@ -309,7 +319,7 @@ d.Node _automatedPublishing(Package package) {
   final isGitHubEnabled = github?.isEnabled ?? false;
   return d.fragment([
     d.a(name: 'automated-publishing'),
-    d.h2(text: 'Automated publishing'),
+    d.h3(text: 'Automated publishing'),
     d.markdown(
       'You can automate publishing from the supported automated deployment environments. '
       'Instead of creating long-lived secrets, you may use temporary OpenID-Connect tokens '
@@ -462,7 +472,7 @@ d.Node _manualPublishing(Package package) {
   final manual = package.automatedPublishing?.manualConfig;
   return d.fragment([
     d.a(name: 'manual-publishing'),
-    d.h2(text: 'Manual publishing'),
+    d.h3(text: 'Manual publishing'),
     d.markdown(
       'The manual publishing of new versions using the `pub` tool is enabled by default in all packages. '
       'Disabling it may protect the package from accidental publishing events when the package is otherwise using '
@@ -471,9 +481,9 @@ d.Node _manualPublishing(Package package) {
     d.div(
       classes: ['-pub-form-checkbox-row'],
       child: material.checkbox(
-        id: '-admin-is-manual-publishing-disabled',
-        label: 'Disable manual publishing',
-        checked: manual?.isDisabled ?? false,
+        id: '-pkg-admin-manual-publishing-enabled',
+        label: 'Enable manual publishing',
+        checked: manual?.isEnabled ?? true,
       ),
     ),
   ]);

app/lib/package/backend.dart

@@ -1616,9 +1616,9 @@ class PackageBackend {
     }
     if (agent is AuthenticatedUser &&
         await packageBackend.isPackageAdmin(package, agent.user.userId)) {
-      final isDisabled =
-          package.automatedPublishing?.manualConfig?.isDisabled ?? false;
-      if (isDisabled) {
+      final isEnabled =
+          package.automatedPublishing?.manualConfig?.isEnabled ?? true;
+      if (!isEnabled) {
         throw AuthorizationException.manualPublishingDisabled();
       }
       return;

app/test/package/automated_publishing_test.dart

@@ -182,7 +182,7 @@ void main() {
             'oxygen',
             AutomatedPublishingConfig(
               github: GitHubPublishingConfig(
-                isEnabled: false,
+                isEnabled: true,
                 repository: 'abcd/efgh',
                 tagPattern: pattern,
               ),
@@ -331,9 +331,9 @@ void main() {
         }
 
         await update(
-          manual: ManualPublishingConfig(isDisabled: false),
+          manual: ManualPublishingConfig(isEnabled: true),
           expected: {
-            'manual': {'isDisabled': false},
+            'manual': {'isEnabled': true},
           },
         );
 
@@ -346,20 +346,20 @@ void main() {
               'isPushEventEnabled': true,
               'isWorkflowDispatchEventEnabled': false,
             },
-            'manual': {'isDisabled': false},
+            'manual': {'isEnabled': true},
           },
         );
 
         await update(
-          manual: ManualPublishingConfig(isDisabled: true),
+          manual: ManualPublishingConfig(isEnabled: false),
           expected: {
             'github': {
               'isEnabled': false,
               'requireEnvironment': false,
               'isPushEventEnabled': true,
               'isWorkflowDispatchEventEnabled': false,
             },
-            'manual': {'isDisabled': true},
+            'manual': {'isEnabled': false},
           },
         );
 
@@ -378,7 +378,7 @@ void main() {
               'isPushEventEnabled': true,
               'isWorkflowDispatchEventEnabled': false,
             },
-            'manual': {'isDisabled': true},
+            'manual': {'isEnabled': false},
           },
         );
       },

app/test/package/upload_test.dart

@@ -291,7 +291,7 @@ void main() {
             await client.setAutomatedPublishing(
               'oxygen',
               AutomatedPublishingConfig(
-                manual: ManualPublishingConfig(isDisabled: true),
+                manual: ManualPublishingConfig(isEnabled: false),
               ),
             );
           });

pkg/_pub_shared/lib/data/package_api.dart

@@ -123,9 +123,9 @@ class GcpPublishingConfig {
 
 @JsonSerializable(includeIfNull: false, explicitToJson: true)
 class ManualPublishingConfig {
-  bool isDisabled;
+  bool isEnabled;
 
-  ManualPublishingConfig({this.isDisabled = false});
+  ManualPublishingConfig({this.isEnabled = true});
 
   factory ManualPublishingConfig.fromJson(Map<String, dynamic> json) =>
       _$ManualPublishingConfigFromJson(json);

pkg/_pub_shared/lib/data/package_api.g.dart

@@ -84,15 +84,19 @@ void main() {
         await page.gotoOrigin('/experimental?manual-publishing=1');
         await page.gotoOrigin('/packages/test_pkg/admin');
 
-        await page.waitAndClick('#-admin-is-manual-publishing-disabled');
-        await page.waitAndClickOnDialogOk(waitForOneResponse: true);
+        await page.waitAndClick('#-pkg-admin-manual-publishing-enabled');
+        await page.waitAndClick(
+          '#-pkg-admin-automated-button',
+          waitForOneResponse: true,
+        );
+        await page.waitAndClickOnDialogOk();
         await page.reload();
 
         final value = await page.propertyValue(
-          '#-admin-is-manual-publishing-disabled',
+          '#-pkg-admin-manual-publishing-enabled',
           'checked',
         );
-        expect(value, true);
+        expect(value, false);
       });
 
       // visit activity log page

pkg/pub_integration/test/pkg_admin_page_test.dart

@@ -85,7 +85,6 @@ class _PkgAdminWidget {
   InputElement? _replacedByInput;
   Element? _replacedByButton;
   InputElement? _unlistedCheckbox;
-  InputElement? _disableManualPublishingCheckbox;
   Element? _inviteUploaderButton;
   Element? _inviteUploaderContent;
   InputElement? _inviteUploaderInput;
@@ -113,12 +112,6 @@ class _PkgAdminWidget {
     _unlistedCheckbox =
         document.getElementById('-admin-is-unlisted-checkbox') as InputElement?;
     _unlistedCheckbox?.onChange.listen((_) => _toggleUnlisted());
-    _disableManualPublishingCheckbox =
-        document.getElementById('-admin-is-manual-publishing-disabled')
-            as InputElement?;
-    _disableManualPublishingCheckbox?.onChange.listen(
-      (_) => _toggleManualPublishingDisabled(),
-    );
     _inviteUploaderButton = document.getElementById(
       '-pkg-admin-invite-uploader-button',
     );
@@ -156,6 +149,9 @@ class _PkgAdminWidget {
   }
 
   void _setupAutomatedPublishing() {
+    final manualPublishingEnabledCheckbox =
+        document.getElementById('-pkg-admin-manual-publishing-enabled')
+            as InputElement?;
     final githubEnabledCheckbox =
         document.getElementById('-pkg-admin-automated-github-enabled')
             as InputElement?;
@@ -194,7 +190,7 @@ class _PkgAdminWidget {
     updateButton.onClick.listen((event) async {
       await api_client.rpc<void>(
         confirmQuestion: await markdown(
-          'Are you sure you want to update the automated publishing config?',
+          'Are you sure you want to update the publishing config?',
         ),
         fn: () async {
           await api_client.client.setAutomatedPublishing(
@@ -216,6 +212,9 @@ class _PkgAdminWidget {
                 isEnabled: gcpEnabledCheckbox!.checked ?? false,
                 serviceAccountEmail: gcpServiceAccountEmailInput!.value,
               ),
+              manual: ManualPublishingConfig(
+                isEnabled: manualPublishingEnabledCheckbox?.checked ?? true,
+              ),
             ),
           );
         },
@@ -345,32 +344,6 @@ class _PkgAdminWidget {
     }
   }
 
-  Future<void> _toggleManualPublishingDisabled() async {
-    final oldValue = _disableManualPublishingCheckbox!.defaultChecked ?? false;
-    final newValue = await api_client.rpc(
-      confirmQuestion: text(
-        'Are you sure you want change the manual publishing status of the package?',
-      ),
-      fn: () async {
-        final rs = await api_client.client.setAutomatedPublishing(
-          pageData.pkgData!.package,
-          AutomatedPublishingConfig(
-            manual: ManualPublishingConfig(isDisabled: !oldValue),
-          ),
-        );
-        return rs.manual?.isDisabled;
-      },
-      successMessage: text('Manual publishing status changed.'),
-      onError: (err) => null,
-    );
-    if (newValue == null) {
-      _disableManualPublishingCheckbox!.checked = oldValue;
-    } else {
-      _disableManualPublishingCheckbox!.defaultChecked = newValue;
-      _disableManualPublishingCheckbox!.checked = newValue;
-    }
-  }
-
   Future<void> _setRetracted() async {
     final version =
         materialDropdownSelected(_retractPackageVersionInput)?.trim() ?? '';